From: Kaj-Michael Lang Date: Mon, 16 Jul 2007 13:35:44 +0000 (+0300) Subject: misc X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1eb16457f1b994a77933dc7128432649a146f54;p=mapper misc --- diff --git a/Makefile.in b/Makefile.in index 9bb9e49..86b1e0d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -91,11 +91,15 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +EXPAT_CFLAGS = @EXPAT_CFLAGS@ +EXPAT_LIBS = @EXPAT_LIBS@ F77 = @F77@ FFLAGS = @FFLAGS@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_LIBS = @GCONF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@ @@ -259,9 +263,10 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/configure Makefile.am \ - aclocal.m4 compile config.guess config.sub configure \ - configure.ac depcomp install-sh ltmain.sh missing mkinstalldirs +DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \ + Makefile.am aclocal.m4 compile config.guess config.sub \ + configure configure.ac depcomp install-sh ltmain.sh missing \ + mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) all: all-recursive diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0 index 9a42184..2d469f9 100644 --- a/autom4te.cache/output.0 +++ b/autom4te.cache/output.0 @@ -463,7 +463,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG GTK_CFLAGS GTK_LIBS HILDON_CFLAGS HILDON_LIBS WITH_HILDON_TRUE WITH_HILDON_FALSE OSSO_CFLAGS OSSO_LIBS BLUEZ_CFLAGS BLUEZ_LIBS GNOME_VFS_CFLAGS GNOME_VFS_LIBS GCONF_CFLAGS GCONF_LIBS LIBXML2_CFLAGS LIBXML2_LIBS DBUS_GLIB_CFLAGS DBUS_GLIB_LIBS LIBCURL_CFLAGS LIBCURL_LIBS SQLITE_CFLAGS SQLITE_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS DATADIRNAME GETTEXT_PACKAGE USE_NLS MSGFMT MSGFMT_OPTS GMSGFMT XGETTEXT CATALOGS CATOBJEXT GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS helpfile_enusdir helpfile_engbdir desktopentrydir serviceentrydir localedir pixmapdir icon_26x26dir icon_34x34dir icon_40x40dir icon_50x50dir icon_scalabledir pluginlibdir plugindesktopentrydir LIB@&t@OBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS HILDON_CFLAGS HILDON_LIBS WITH_HILDON_TRUE WITH_HILDON_FALSE OSSO_CFLAGS OSSO_LIBS BLUEZ_CFLAGS BLUEZ_LIBS GNOME_VFS_CFLAGS GNOME_VFS_LIBS GCONF_CFLAGS GCONF_LIBS LIBXML2_CFLAGS LIBXML2_LIBS DBUS_GLIB_CFLAGS DBUS_GLIB_LIBS LIBCURL_CFLAGS LIBCURL_LIBS SQLITE_CFLAGS SQLITE_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS EXPAT_CFLAGS EXPAT_LIBS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS DATADIRNAME GETTEXT_PACKAGE USE_NLS MSGFMT MSGFMT_OPTS GMSGFMT XGETTEXT CATALOGS CATOBJEXT GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS helpfile_enusdir helpfile_engbdir desktopentrydir serviceentrydir localedir pixmapdir icon_26x26dir icon_34x34dir icon_40x40dir icon_50x50dir icon_scalabledir pluginlibdir plugindesktopentrydir LIB@&t@OBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -956,6 +956,14 @@ ac_env_GTK_LIBS_set=${GTK_LIBS+set} ac_env_GTK_LIBS_value=$GTK_LIBS ac_cv_env_GTK_LIBS_set=${GTK_LIBS+set} ac_cv_env_GTK_LIBS_value=$GTK_LIBS +ac_env_GLIB_CFLAGS_set=${GLIB_CFLAGS+set} +ac_env_GLIB_CFLAGS_value=$GLIB_CFLAGS +ac_cv_env_GLIB_CFLAGS_set=${GLIB_CFLAGS+set} +ac_cv_env_GLIB_CFLAGS_value=$GLIB_CFLAGS +ac_env_GLIB_LIBS_set=${GLIB_LIBS+set} +ac_env_GLIB_LIBS_value=$GLIB_LIBS +ac_cv_env_GLIB_LIBS_set=${GLIB_LIBS+set} +ac_cv_env_GLIB_LIBS_value=$GLIB_LIBS ac_env_HILDON_CFLAGS_set=${HILDON_CFLAGS+set} ac_env_HILDON_CFLAGS_value=$HILDON_CFLAGS ac_cv_env_HILDON_CFLAGS_set=${HILDON_CFLAGS+set} @@ -1151,6 +1159,8 @@ Some influential environment variables: PKG_CONFIG path to pkg-config utility GTK_CFLAGS C compiler flags for GTK, overriding pkg-config GTK_LIBS linker flags for GTK, overriding pkg-config + GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config + GLIB_LIBS linker flags for GLIB, overriding pkg-config HILDON_CFLAGS C compiler flags for HILDON, overriding pkg-config HILDON_LIBS linker flags for HILDON, overriding pkg-config @@ -18909,6 +18919,120 @@ fi +pkg_failed=no +echo "$as_me:$LINENO: checking for GLIB" >&5 +echo $ECHO_N "checking for GLIB... $ECHO_C" >&6 + +if test -n "$PKG_CONFIG"; then + if test -n "$GLIB_CFLAGS"; then + pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GLIB_LIBS"; then + pkg_cv_GLIB_LIBS="$GLIB_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +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 + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0"` + else + GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GLIB_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0) were not met: + +$GLIB_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GLIB_CFLAGS +and GLIB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements (glib-2.0) were not met: + +$GLIB_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GLIB_CFLAGS +and GLIB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GLIB_CFLAGS +and GLIB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&5 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GLIB_CFLAGS +and GLIB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS + GLIB_LIBS=$pkg_cv_GLIB_LIBS + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + : +fi + + + + pkg_failed=no echo "$as_me:$LINENO: checking for HILDON" >&5 echo $ECHO_N "checking for HILDON... $ECHO_C" >&6 @@ -20147,6 +20271,151 @@ fi +# XXX: Check for expat +if test "${ac_cv_header_expat_h+set}" = set; then + echo "$as_me:$LINENO: checking for expat.h" >&5 +echo $ECHO_N "checking for expat.h... $ECHO_C" >&6 +if test "${ac_cv_header_expat_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 +echo "${ECHO_T}$ac_cv_header_expat_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking expat.h usability" >&5 +echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +@%:@include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking expat.h presence" >&5 +echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +@%:@include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +@%:@@%:@ ------------------------------------------ @%:@@%:@ +@%:@@%:@ Report this to the AC_PACKAGE_NAME lists. @%:@@%:@ +@%:@@%:@ ------------------------------------------ @%:@@%:@ +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for expat.h" >&5 +echo $ECHO_N "checking for expat.h... $ECHO_C" >&6 +if test "${ac_cv_header_expat_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_expat_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 +echo "${ECHO_T}$ac_cv_header_expat_h" >&6 + +fi + + +EXPAT_LIBS="-lexpat" +EXPAT_CFLAGS="-I/usr/include" + + + # Localisation if test "x$HAVE_HILDON" = "xyes"; then localedir=`$PKG_CONFIG osso-af-settings --variable=localedir` @@ -23021,6 +23290,8 @@ s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t s,@GTK_LIBS@,$GTK_LIBS,;t t +s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t +s,@GLIB_LIBS@,$GLIB_LIBS,;t t s,@HILDON_CFLAGS@,$HILDON_CFLAGS,;t t s,@HILDON_LIBS@,$HILDON_LIBS,;t t s,@WITH_HILDON_TRUE@,$WITH_HILDON_TRUE,;t t @@ -23043,6 +23314,8 @@ s,@SQLITE_CFLAGS@,$SQLITE_CFLAGS,;t t s,@SQLITE_LIBS@,$SQLITE_LIBS,;t t s,@GSTREAMER_CFLAGS@,$GSTREAMER_CFLAGS,;t t s,@GSTREAMER_LIBS@,$GSTREAMER_LIBS,;t t +s,@EXPAT_CFLAGS@,$EXPAT_CFLAGS,;t t +s,@EXPAT_LIBS@,$EXPAT_LIBS,;t t s,@INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t s,@INTLTOOL_DIRECTORY_RULE@,$INTLTOOL_DIRECTORY_RULE,;t t s,@INTLTOOL_KEYS_RULE@,$INTLTOOL_KEYS_RULE,;t t diff --git a/autom4te.cache/requests b/autom4te.cache/requests index 5e5245f..196ea82 100644 --- a/autom4te.cache/requests +++ b/autom4te.cache/requests @@ -17,19 +17,19 @@ { 'm4_pattern_forbid' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AC_C_VOLATILE' => 1, 'AC_TYPE_OFF_T' => 1, + 'AC_C_VOLATILE' => 1, 'AC_FUNC_CLOSEDIR_VOID' => 1, 'AC_REPLACE_FNMATCH' => 1, 'AC_PROG_LIBTOOL' => 1, 'AC_FUNC_STAT' => 1, - 'AC_FUNC_WAIT3' => 1, 'AC_HEADER_TIME' => 1, - 'AC_FUNC_LSTAT' => 1, - 'AC_STRUCT_TM' => 1, + 'AC_FUNC_WAIT3' => 1, 'AM_AUTOMAKE_VERSION' => 1, - 'AC_FUNC_GETMNTENT' => 1, + 'AC_STRUCT_TM' => 1, + 'AC_FUNC_LSTAT' => 1, 'AC_TYPE_MODE_T' => 1, + 'AC_FUNC_GETMNTENT' => 1, 'AC_FUNC_STRTOD' => 1, 'AC_CHECK_HEADERS' => 1, 'AC_FUNC_STRNLEN' => 1, @@ -48,17 +48,17 @@ 'AC_STRUCT_ST_BLOCKS' => 1, 'AC_TYPE_SIGNAL' => 1, 'AC_TYPE_UID_T' => 1, - 'AC_PROG_MAKE_SET' => 1, 'AC_CONFIG_AUX_DIR' => 1, - 'm4_pattern_allow' => 1, + 'AC_PROG_MAKE_SET' => 1, 'sinclude' => 1, + 'm4_pattern_allow' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, 'AC_FUNC_STRERROR_R' => 1, 'AC_PROG_CC' => 1, - 'AC_DECL_SYS_SIGLIST' => 1, 'AC_FUNC_FORK' => 1, - 'AC_FUNC_STRCOLL' => 1, + 'AC_DECL_SYS_SIGLIST' => 1, 'AC_FUNC_VPRINTF' => 1, + 'AC_FUNC_STRCOLL' => 1, 'AC_PROG_YACC' => 1, 'AC_INIT' => 1, 'AC_STRUCT_TIMEZONE' => 1, @@ -80,34 +80,34 @@ 'AM_MAINTAINER_MODE' => 1, 'AC_FUNC_UTIME_NULL' => 1, 'AC_FUNC_SELECT_ARGTYPES' => 1, - 'AC_HEADER_STAT' => 1, 'AC_FUNC_STRFTIME' => 1, - 'AC_PROG_CPP' => 1, + 'AC_HEADER_STAT' => 1, 'AC_C_INLINE' => 1, - 'AC_PROG_LEX' => 1, - 'AC_C_CONST' => 1, - 'AC_TYPE_PID_T' => 1, + 'AC_PROG_CPP' => 1, 'AM_ENABLE_MULTILIB' => 1, + 'AC_TYPE_PID_T' => 1, + 'AC_C_CONST' => 1, + 'AC_PROG_LEX' => 1, 'AC_CONFIG_FILES' => 1, 'include' => 1, 'AC_FUNC_SETVBUF_REVERSED' => 1, 'AC_PROG_INSTALL' => 1, 'AM_GNU_GETTEXT' => 1, - 'AC_CHECK_LIB' => 1, 'AC_FUNC_OBSTACK' => 1, + 'AC_CHECK_LIB' => 1, 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_GETGROUPS' => 1, 'AC_FUNC_GETLOADAVG' => 1, 'AH_OUTPUT' => 1, 'AC_FUNC_FSEEKO' => 1, 'AM_PROG_CC_C_O' => 1, - 'AC_FUNC_MKTIME' => 1, - 'AC_CANONICAL_SYSTEM' => 1, 'AM_CONDITIONAL' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AC_FUNC_MKTIME' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_HEADER_SYS_WAIT' => 1, - 'AC_PROG_LN_S' => 1, 'AC_FUNC_MEMCMP' => 1, + 'AC_PROG_LN_S' => 1, 'm4_include' => 1, 'AC_HEADER_DIRENT' => 1, 'AC_CHECK_FUNCS' => 1 diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0 index 2256459..24957c0 100644 --- a/autom4te.cache/traces.0 +++ b/autom4te.cache/traces.0 @@ -390,112 +390,118 @@ m4trace:configure.ac:41: -1- AC_SUBST([GTK_CFLAGS]) m4trace:configure.ac:41: -1- AC_SUBST([GTK_LIBS]) m4trace:configure.ac:42: -1- AC_SUBST([GTK_LIBS]) m4trace:configure.ac:43: -1- AC_SUBST([GTK_CFLAGS]) -m4trace:configure.ac:46: -1- AC_SUBST([HILDON_CFLAGS]) -m4trace:configure.ac:46: -1- AC_SUBST([HILDON_LIBS]) -m4trace:configure.ac:49: -1- AC_DEFINE_TRACE_LITERAL([WITH_HILDON]) -m4trace:configure.ac:49: -1- AH_OUTPUT([WITH_HILDON], [/* build with Maemo/Hildon user interface */ +m4trace:configure.ac:45: -1- AC_SUBST([GLIB_CFLAGS]) +m4trace:configure.ac:45: -1- AC_SUBST([GLIB_LIBS]) +m4trace:configure.ac:46: -1- AC_SUBST([GLIB_LIBS]) +m4trace:configure.ac:47: -1- AC_SUBST([GLIB_CFLAGS]) +m4trace:configure.ac:50: -1- AC_SUBST([HILDON_CFLAGS]) +m4trace:configure.ac:50: -1- AC_SUBST([HILDON_LIBS]) +m4trace:configure.ac:53: -1- AC_DEFINE_TRACE_LITERAL([WITH_HILDON]) +m4trace:configure.ac:53: -1- AH_OUTPUT([WITH_HILDON], [/* build with Maemo/Hildon user interface */ #undef WITH_HILDON]) -m4trace:configure.ac:54: -1- AM_CONDITIONAL([WITH_HILDON], [test "x$HAVE_HILDON" = "xyes"]) -m4trace:configure.ac:54: -1- AC_SUBST([WITH_HILDON_TRUE]) -m4trace:configure.ac:54: -1- AC_SUBST([WITH_HILDON_FALSE]) -m4trace:configure.ac:58: -1- AC_SUBST([HILDON_CFLAGS]) -m4trace:configure.ac:59: -1- AC_SUBST([HILDON_LIBS]) -m4trace:configure.ac:61: -1- AC_SUBST([OSSO_CFLAGS]) -m4trace:configure.ac:61: -1- AC_SUBST([OSSO_LIBS]) -m4trace:configure.ac:62: -1- AC_SUBST([OSSO_LIBS]) -m4trace:configure.ac:63: -1- AC_SUBST([OSSO_CFLAGS]) -m4trace:configure.ac:65: -1- AC_SUBST([HILDON_CFLAGS]) -m4trace:configure.ac:65: -1- AC_SUBST([HILDON_LIBS]) -m4trace:configure.ac:66: -1- AC_SUBST([HILDON_LIBS]) -m4trace:configure.ac:67: -1- AC_SUBST([HILDON_CFLAGS]) -m4trace:configure.ac:69: -1- AC_SUBST([BLUEZ_CFLAGS]) -m4trace:configure.ac:69: -1- AC_SUBST([BLUEZ_LIBS]) -m4trace:configure.ac:70: -1- AC_SUBST([BLUEZ_LIBS]) -m4trace:configure.ac:71: -1- AC_SUBST([BLUEZ_CFLAGS]) -m4trace:configure.ac:74: -1- AC_SUBST([GNOME_VFS_CFLAGS]) -m4trace:configure.ac:74: -1- AC_SUBST([GNOME_VFS_LIBS]) -m4trace:configure.ac:75: -1- AC_SUBST([GNOME_VFS_LIBS]) -m4trace:configure.ac:76: -1- AC_SUBST([GNOME_VFS_CFLAGS]) -m4trace:configure.ac:78: -1- AC_SUBST([GCONF_CFLAGS]) -m4trace:configure.ac:78: -1- AC_SUBST([GCONF_LIBS]) -m4trace:configure.ac:79: -1- AC_SUBST([GCONF_LIBS]) -m4trace:configure.ac:80: -1- AC_SUBST([GCONF_CFLAGS]) -m4trace:configure.ac:82: -1- AC_SUBST([LIBXML2_CFLAGS]) -m4trace:configure.ac:82: -1- AC_SUBST([LIBXML2_LIBS]) -m4trace:configure.ac:83: -1- AC_SUBST([LIBXML2_LIBS]) -m4trace:configure.ac:84: -1- AC_SUBST([LIBXML2_CFLAGS]) -m4trace:configure.ac:86: -1- AC_SUBST([DBUS_GLIB_CFLAGS]) -m4trace:configure.ac:86: -1- AC_SUBST([DBUS_GLIB_LIBS]) -m4trace:configure.ac:87: -1- AC_SUBST([DBUS_GLIB_LIBS]) -m4trace:configure.ac:88: -1- AC_SUBST([DBUS_GLIB_CFLAGS]) -m4trace:configure.ac:90: -1- AC_SUBST([LIBCURL_CFLAGS]) -m4trace:configure.ac:90: -1- AC_SUBST([LIBCURL_LIBS]) -m4trace:configure.ac:91: -1- AC_SUBST([LIBCURL_LIBS]) -m4trace:configure.ac:92: -1- AC_SUBST([LIBCURL_CFLAGS]) -m4trace:configure.ac:94: -1- AC_SUBST([SQLITE_CFLAGS]) -m4trace:configure.ac:94: -1- AC_SUBST([SQLITE_LIBS]) -m4trace:configure.ac:95: -1- AC_SUBST([SQLITE_LIBS]) -m4trace:configure.ac:96: -1- AC_SUBST([SQLITE_CFLAGS]) -m4trace:configure.ac:98: -1- AC_SUBST([GSTREAMER_CFLAGS]) -m4trace:configure.ac:98: -1- AC_SUBST([GSTREAMER_LIBS]) -m4trace:configure.ac:99: -1- AC_SUBST([GSTREAMER_LIBS]) -m4trace:configure.ac:100: -1- AC_SUBST([GSTREAMER_CFLAGS]) -m4trace:configure.ac:108: -1- _m4_warn([obsolete], [The macro `AC_PROG_INTLTOOL' is obsolete. +m4trace:configure.ac:58: -1- AM_CONDITIONAL([WITH_HILDON], [test "x$HAVE_HILDON" = "xyes"]) +m4trace:configure.ac:58: -1- AC_SUBST([WITH_HILDON_TRUE]) +m4trace:configure.ac:58: -1- AC_SUBST([WITH_HILDON_FALSE]) +m4trace:configure.ac:62: -1- AC_SUBST([HILDON_CFLAGS]) +m4trace:configure.ac:63: -1- AC_SUBST([HILDON_LIBS]) +m4trace:configure.ac:65: -1- AC_SUBST([OSSO_CFLAGS]) +m4trace:configure.ac:65: -1- AC_SUBST([OSSO_LIBS]) +m4trace:configure.ac:66: -1- AC_SUBST([OSSO_LIBS]) +m4trace:configure.ac:67: -1- AC_SUBST([OSSO_CFLAGS]) +m4trace:configure.ac:69: -1- AC_SUBST([HILDON_CFLAGS]) +m4trace:configure.ac:69: -1- AC_SUBST([HILDON_LIBS]) +m4trace:configure.ac:70: -1- AC_SUBST([HILDON_LIBS]) +m4trace:configure.ac:71: -1- AC_SUBST([HILDON_CFLAGS]) +m4trace:configure.ac:73: -1- AC_SUBST([BLUEZ_CFLAGS]) +m4trace:configure.ac:73: -1- AC_SUBST([BLUEZ_LIBS]) +m4trace:configure.ac:74: -1- AC_SUBST([BLUEZ_LIBS]) +m4trace:configure.ac:75: -1- AC_SUBST([BLUEZ_CFLAGS]) +m4trace:configure.ac:78: -1- AC_SUBST([GNOME_VFS_CFLAGS]) +m4trace:configure.ac:78: -1- AC_SUBST([GNOME_VFS_LIBS]) +m4trace:configure.ac:79: -1- AC_SUBST([GNOME_VFS_LIBS]) +m4trace:configure.ac:80: -1- AC_SUBST([GNOME_VFS_CFLAGS]) +m4trace:configure.ac:82: -1- AC_SUBST([GCONF_CFLAGS]) +m4trace:configure.ac:82: -1- AC_SUBST([GCONF_LIBS]) +m4trace:configure.ac:83: -1- AC_SUBST([GCONF_LIBS]) +m4trace:configure.ac:84: -1- AC_SUBST([GCONF_CFLAGS]) +m4trace:configure.ac:86: -1- AC_SUBST([LIBXML2_CFLAGS]) +m4trace:configure.ac:86: -1- AC_SUBST([LIBXML2_LIBS]) +m4trace:configure.ac:87: -1- AC_SUBST([LIBXML2_LIBS]) +m4trace:configure.ac:88: -1- AC_SUBST([LIBXML2_CFLAGS]) +m4trace:configure.ac:90: -1- AC_SUBST([DBUS_GLIB_CFLAGS]) +m4trace:configure.ac:90: -1- AC_SUBST([DBUS_GLIB_LIBS]) +m4trace:configure.ac:91: -1- AC_SUBST([DBUS_GLIB_LIBS]) +m4trace:configure.ac:92: -1- AC_SUBST([DBUS_GLIB_CFLAGS]) +m4trace:configure.ac:94: -1- AC_SUBST([LIBCURL_CFLAGS]) +m4trace:configure.ac:94: -1- AC_SUBST([LIBCURL_LIBS]) +m4trace:configure.ac:95: -1- AC_SUBST([LIBCURL_LIBS]) +m4trace:configure.ac:96: -1- AC_SUBST([LIBCURL_CFLAGS]) +m4trace:configure.ac:98: -1- AC_SUBST([SQLITE_CFLAGS]) +m4trace:configure.ac:98: -1- AC_SUBST([SQLITE_LIBS]) +m4trace:configure.ac:99: -1- AC_SUBST([SQLITE_LIBS]) +m4trace:configure.ac:100: -1- AC_SUBST([SQLITE_CFLAGS]) +m4trace:configure.ac:102: -1- AC_SUBST([GSTREAMER_CFLAGS]) +m4trace:configure.ac:102: -1- AC_SUBST([GSTREAMER_LIBS]) +m4trace:configure.ac:103: -1- AC_SUBST([GSTREAMER_LIBS]) +m4trace:configure.ac:104: -1- AC_SUBST([GSTREAMER_CFLAGS]) +m4trace:configure.ac:110: -1- AC_SUBST([EXPAT_CFLAGS]) +m4trace:configure.ac:111: -1- AC_SUBST([EXPAT_LIBS]) +m4trace:configure.ac:119: -1- _m4_warn([obsolete], [The macro `AC_PROG_INTLTOOL' is obsolete. You should run autoupdate.], [aclocal.m4:7574: AC_PROG_INTLTOOL is expanded from... -configure.ac:108: the top level]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_DESKTOP_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_DIRECTORY_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_KEYS_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_PROP_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_OAF_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_PONG_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_SERVER_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_SHEET_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_SOUNDLIST_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_UI_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_XAM_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_KBD_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_XML_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_XML_NOMERGE_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_CAVES_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_SCHEMAS_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_THEME_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_SERVICE_RULE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_EXTRACT], ['$(top_builddir)/intltool-extract']) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_MERGE], ['$(top_builddir)/intltool-merge']) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_UPDATE], ['$(top_builddir)/intltool-update']) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_PERL], [$ac_cv_path_INTLTOOL_PERL]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_ICONV], [$ac_cv_path_INTLTOOL_ICONV]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_MSGFMT], [$ac_cv_path_INTLTOOL_MSGFMT]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_MSGMERGE], [$ac_cv_path_INTLTOOL_MSGMERGE]) -m4trace:configure.ac:108: -1- AC_SUBST([INTLTOOL_XGETTEXT], [$ac_cv_path_INTLTOOL_XGETTEXT]) -m4trace:configure.ac:108: -1- AC_SUBST([ALL_LINGUAS]) -m4trace:configure.ac:108: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. +configure.ac:119: the top level]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_DESKTOP_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_DIRECTORY_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_KEYS_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_PROP_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_OAF_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_PONG_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_SERVER_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_SHEET_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_SOUNDLIST_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_UI_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_XAM_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_KBD_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_XML_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_XML_NOMERGE_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_CAVES_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_SCHEMAS_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_THEME_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_SERVICE_RULE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_EXTRACT], ['$(top_builddir)/intltool-extract']) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_MERGE], ['$(top_builddir)/intltool-merge']) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_UPDATE], ['$(top_builddir)/intltool-update']) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_PERL], [$ac_cv_path_INTLTOOL_PERL]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_ICONV], [$ac_cv_path_INTLTOOL_ICONV]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_MSGFMT], [$ac_cv_path_INTLTOOL_MSGFMT]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_MSGMERGE], [$ac_cv_path_INTLTOOL_MSGMERGE]) +m4trace:configure.ac:119: -1- AC_SUBST([INTLTOOL_XGETTEXT], [$ac_cv_path_INTLTOOL_XGETTEXT]) +m4trace:configure.ac:119: -1- AC_SUBST([ALL_LINGUAS]) +m4trace:configure.ac:119: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... aclocal.m4:7377: IT_PROG_INTLTOOL is expanded from... aclocal.m4:7574: AC_PROG_INTLTOOL is expanded from... -configure.ac:108: the top level]) -m4trace:configure.ac:108: -1- AC_SUBST([DATADIRNAME]) -m4trace:configure.ac:110: -1- AC_SUBST([GETTEXT_PACKAGE]) -m4trace:configure.ac:111: -1- AC_DEFINE_TRACE_LITERAL([GETTEXT_PACKAGE]) -m4trace:configure.ac:111: -1- AH_OUTPUT([GETTEXT_PACKAGE], [/* Name of gettext package */ +configure.ac:119: the top level]) +m4trace:configure.ac:119: -1- AC_SUBST([DATADIRNAME]) +m4trace:configure.ac:121: -1- AC_SUBST([GETTEXT_PACKAGE]) +m4trace:configure.ac:122: -1- AC_DEFINE_TRACE_LITERAL([GETTEXT_PACKAGE]) +m4trace:configure.ac:122: -1- AH_OUTPUT([GETTEXT_PACKAGE], [/* Name of gettext package */ #undef GETTEXT_PACKAGE]) -m4trace:configure.ac:113: -1- AC_CHECK_HEADERS([locale.h]) -m4trace:configure.ac:113: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.ac:124: -1- AC_CHECK_HEADERS([locale.h]) +m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H]) -m4trace:configure.ac:113: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. +m4trace:configure.ac:124: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... aclocal.m4:7626: GLIB_LC_MESSAGES is expanded from... aclocal.m4:7891: GLIB_GNU_GETTEXT is expanded from... aclocal.m4:7991: AM_GLIB_GNU_GETTEXT is expanded from... -configure.ac:113: the top level]) -m4trace:configure.ac:113: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LC_MESSAGES]) -m4trace:configure.ac:113: -1- AH_OUTPUT([HAVE_LC_MESSAGES], [/* Define if your file defines LC_MESSAGES. */ +configure.ac:124: the top level]) +m4trace:configure.ac:124: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LC_MESSAGES]) +m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_LC_MESSAGES], [/* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES]) -m4trace:configure.ac:113: -1- AC_SUBST([USE_NLS]) -m4trace:configure.ac:113: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. +m4trace:configure.ac:124: -1- AC_SUBST([USE_NLS]) +m4trace:configure.ac:124: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... @@ -503,8 +509,8 @@ autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from... aclocal.m4:7680: GLIB_WITH_NLS is expanded from... aclocal.m4:7891: GLIB_GNU_GETTEXT is expanded from... aclocal.m4:7991: AM_GLIB_GNU_GETTEXT is expanded from... -configure.ac:113: the top level]) -m4trace:configure.ac:113: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. +configure.ac:124: the top level]) +m4trace:configure.ac:124: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... @@ -512,96 +518,96 @@ autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from... aclocal.m4:7680: GLIB_WITH_NLS is expanded from... aclocal.m4:7891: GLIB_GNU_GETTEXT is expanded from... aclocal.m4:7991: AM_GLIB_GNU_GETTEXT is expanded from... -configure.ac:113: the top level]) -m4trace:configure.ac:113: -1- AC_CHECK_FUNCS([bind_textdomain_codeset]) -m4trace:configure.ac:113: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */ +configure.ac:124: the top level]) +m4trace:configure.ac:124: -1- AC_CHECK_FUNCS([bind_textdomain_codeset]) +m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */ #undef HAVE_BIND_TEXTDOMAIN_CODESET]) -m4trace:configure.ac:113: -1- AC_CHECK_LIB([intl], [bindtextdomain], [AC_CHECK_LIB(intl, ngettext, +m4trace:configure.ac:124: -1- AC_CHECK_LIB([intl], [bindtextdomain], [AC_CHECK_LIB(intl, ngettext, [AC_CHECK_LIB(intl, dgettext, gt_cv_func_dgettext_libintl=yes)])]) -m4trace:configure.ac:113: -1- AC_CHECK_LIB([intl], [ngettext], [AC_CHECK_LIB(intl, dgettext, +m4trace:configure.ac:124: -1- AC_CHECK_LIB([intl], [ngettext], [AC_CHECK_LIB(intl, dgettext, gt_cv_func_dgettext_libintl=yes)]) -m4trace:configure.ac:113: -1- AC_CHECK_LIB([intl], [dgettext], [gt_cv_func_dgettext_libintl=yes]) -m4trace:configure.ac:113: -1- AC_CHECK_LIB([intl], [ngettext], [AC_CHECK_LIB(intl, dcgettext, +m4trace:configure.ac:124: -1- AC_CHECK_LIB([intl], [dgettext], [gt_cv_func_dgettext_libintl=yes]) +m4trace:configure.ac:124: -1- AC_CHECK_LIB([intl], [ngettext], [AC_CHECK_LIB(intl, dcgettext, [gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv], :,-liconv)], [:], [-liconv]) -m4trace:configure.ac:113: -1- AC_CHECK_LIB([intl], [dcgettext], [gt_cv_func_dgettext_libintl=yes +m4trace:configure.ac:124: -1- AC_CHECK_LIB([intl], [dcgettext], [gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv], [:], [-liconv]) -m4trace:configure.ac:113: -1- AC_CHECK_FUNCS([bind_textdomain_codeset]) -m4trace:configure.ac:113: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */ +m4trace:configure.ac:124: -1- AC_CHECK_FUNCS([bind_textdomain_codeset]) +m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */ #undef HAVE_BIND_TEXTDOMAIN_CODESET]) -m4trace:configure.ac:113: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETTEXT]) -m4trace:configure.ac:113: -1- AH_OUTPUT([HAVE_GETTEXT], [/* Define if the GNU gettext() function is already present or preinstalled. */ +m4trace:configure.ac:124: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETTEXT]) +m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_GETTEXT], [/* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT]) -m4trace:configure.ac:113: -1- AC_SUBST([MSGFMT]) -m4trace:configure.ac:113: -1- AC_CHECK_FUNCS([dcgettext]) -m4trace:configure.ac:113: -1- AH_OUTPUT([HAVE_DCGETTEXT], [/* Define to 1 if you have the `dcgettext\' function. */ +m4trace:configure.ac:124: -1- AC_SUBST([MSGFMT]) +m4trace:configure.ac:124: -1- AC_CHECK_FUNCS([dcgettext]) +m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_DCGETTEXT], [/* Define to 1 if you have the `dcgettext\' function. */ #undef HAVE_DCGETTEXT]) -m4trace:configure.ac:113: -1- AC_SUBST([MSGFMT_OPTS]) -m4trace:configure.ac:113: -1- AC_SUBST([GMSGFMT], [$ac_cv_path_GMSGFMT]) -m4trace:configure.ac:113: -1- AC_SUBST([XGETTEXT]) -m4trace:configure.ac:113: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. +m4trace:configure.ac:124: -1- AC_SUBST([MSGFMT_OPTS]) +m4trace:configure.ac:124: -1- AC_SUBST([GMSGFMT], [$ac_cv_path_GMSGFMT]) +m4trace:configure.ac:124: -1- AC_SUBST([XGETTEXT]) +m4trace:configure.ac:124: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from... aclocal.m4:7680: GLIB_WITH_NLS is expanded from... aclocal.m4:7891: GLIB_GNU_GETTEXT is expanded from... aclocal.m4:7991: AM_GLIB_GNU_GETTEXT is expanded from... -configure.ac:113: the top level]) -m4trace:configure.ac:113: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS]) -m4trace:configure.ac:113: -1- AH_OUTPUT([ENABLE_NLS], [/* always defined to indicate that i18n is enabled */ +configure.ac:124: the top level]) +m4trace:configure.ac:124: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS]) +m4trace:configure.ac:124: -1- AH_OUTPUT([ENABLE_NLS], [/* always defined to indicate that i18n is enabled */ #undef ENABLE_NLS]) -m4trace:configure.ac:113: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. +m4trace:configure.ac:124: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. You should run autoupdate.], [autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from... aclocal.m4:7680: GLIB_WITH_NLS is expanded from... aclocal.m4:7891: GLIB_GNU_GETTEXT is expanded from... aclocal.m4:7991: AM_GLIB_GNU_GETTEXT is expanded from... -configure.ac:113: the top level]) -m4trace:configure.ac:113: -3- _m4_warn([obsolete], [The macro `_AC_OUTPUT_COMMANDS_CNT' is obsolete. +configure.ac:124: the top level]) +m4trace:configure.ac:124: -3- _m4_warn([obsolete], [The macro `_AC_OUTPUT_COMMANDS_CNT' is obsolete. You should run autoupdate.], [autoconf/status.m4:321: _AC_OUTPUT_COMMANDS_CNT is expanded from... autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from... aclocal.m4:7680: GLIB_WITH_NLS is expanded from... aclocal.m4:7891: GLIB_GNU_GETTEXT is expanded from... aclocal.m4:7991: AM_GLIB_GNU_GETTEXT is expanded from... -configure.ac:113: the top level]) -m4trace:configure.ac:113: -1- AC_SUBST([CATALOGS]) -m4trace:configure.ac:113: -1- AC_SUBST([CATOBJEXT]) -m4trace:configure.ac:113: -1- AC_SUBST([DATADIRNAME]) -m4trace:configure.ac:113: -1- AC_SUBST([GMOFILES]) -m4trace:configure.ac:113: -1- AC_SUBST([INSTOBJEXT]) -m4trace:configure.ac:113: -1- AC_SUBST([INTLLIBS]) -m4trace:configure.ac:113: -1- AC_SUBST([PO_IN_DATADIR_TRUE]) -m4trace:configure.ac:113: -1- AC_SUBST([PO_IN_DATADIR_FALSE]) -m4trace:configure.ac:113: -1- AC_SUBST([POFILES]) -m4trace:configure.ac:113: -1- AC_SUBST([POSUB]) -m4trace:configure.ac:113: -1- AC_SUBST([MKINSTALLDIRS]) -m4trace:configure.ac:151: -1- AC_SUBST([helpfile_enusdir]) -m4trace:configure.ac:153: -1- AC_SUBST([helpfile_engbdir]) -m4trace:configure.ac:156: -1- AC_SUBST([desktopentrydir]) -m4trace:configure.ac:157: -1- AC_SUBST([serviceentrydir]) -m4trace:configure.ac:158: -1- AC_SUBST([localedir]) -m4trace:configure.ac:159: -1- AC_SUBST([pixmapdir]) -m4trace:configure.ac:160: -1- AC_SUBST([icon_26x26dir]) -m4trace:configure.ac:161: -1- AC_SUBST([icon_34x34dir]) -m4trace:configure.ac:162: -1- AC_SUBST([icon_40x40dir]) -m4trace:configure.ac:163: -1- AC_SUBST([icon_50x50dir]) -m4trace:configure.ac:164: -1- AC_SUBST([icon_scalabledir]) -m4trace:configure.ac:165: -1- AC_SUBST([pluginlibdir]) -m4trace:configure.ac:166: -1- AC_SUBST([plugindesktopentrydir]) -m4trace:configure.ac:168: -1- AC_DEFINE_TRACE_LITERAL([LOCALEDIR]) -m4trace:configure.ac:168: -1- AH_OUTPUT([LOCALEDIR], [/* Runtime locale catalog files path */ +configure.ac:124: the top level]) +m4trace:configure.ac:124: -1- AC_SUBST([CATALOGS]) +m4trace:configure.ac:124: -1- AC_SUBST([CATOBJEXT]) +m4trace:configure.ac:124: -1- AC_SUBST([DATADIRNAME]) +m4trace:configure.ac:124: -1- AC_SUBST([GMOFILES]) +m4trace:configure.ac:124: -1- AC_SUBST([INSTOBJEXT]) +m4trace:configure.ac:124: -1- AC_SUBST([INTLLIBS]) +m4trace:configure.ac:124: -1- AC_SUBST([PO_IN_DATADIR_TRUE]) +m4trace:configure.ac:124: -1- AC_SUBST([PO_IN_DATADIR_FALSE]) +m4trace:configure.ac:124: -1- AC_SUBST([POFILES]) +m4trace:configure.ac:124: -1- AC_SUBST([POSUB]) +m4trace:configure.ac:124: -1- AC_SUBST([MKINSTALLDIRS]) +m4trace:configure.ac:162: -1- AC_SUBST([helpfile_enusdir]) +m4trace:configure.ac:164: -1- AC_SUBST([helpfile_engbdir]) +m4trace:configure.ac:167: -1- AC_SUBST([desktopentrydir]) +m4trace:configure.ac:168: -1- AC_SUBST([serviceentrydir]) +m4trace:configure.ac:169: -1- AC_SUBST([localedir]) +m4trace:configure.ac:170: -1- AC_SUBST([pixmapdir]) +m4trace:configure.ac:171: -1- AC_SUBST([icon_26x26dir]) +m4trace:configure.ac:172: -1- AC_SUBST([icon_34x34dir]) +m4trace:configure.ac:173: -1- AC_SUBST([icon_40x40dir]) +m4trace:configure.ac:174: -1- AC_SUBST([icon_50x50dir]) +m4trace:configure.ac:175: -1- AC_SUBST([icon_scalabledir]) +m4trace:configure.ac:176: -1- AC_SUBST([pluginlibdir]) +m4trace:configure.ac:177: -1- AC_SUBST([plugindesktopentrydir]) +m4trace:configure.ac:179: -1- AC_DEFINE_TRACE_LITERAL([LOCALEDIR]) +m4trace:configure.ac:179: -1- AH_OUTPUT([LOCALEDIR], [/* Runtime locale catalog files path */ #undef LOCALEDIR]) -m4trace:configure.ac:169: -1- AC_DEFINE_TRACE_LITERAL([PIXMAPDIR]) -m4trace:configure.ac:169: -1- AH_OUTPUT([PIXMAPDIR], [/* Runtime pixmap files path */ +m4trace:configure.ac:180: -1- AC_DEFINE_TRACE_LITERAL([PIXMAPDIR]) +m4trace:configure.ac:180: -1- AH_OUTPUT([PIXMAPDIR], [/* Runtime pixmap files path */ #undef PIXMAPDIR]) -m4trace:configure.ac:172: -1- AC_CONFIG_FILES([Makefile \ +m4trace:configure.ac:183: -1- AC_CONFIG_FILES([Makefile \ src/Makefile \ data/Makefile \ data/help/Makefile \ po/Makefile.in \ po/Makefile ]) -m4trace:configure.ac:172: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments. +m4trace:configure.ac:183: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments. You should run autoupdate.], []) -m4trace:configure.ac:172: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) -m4trace:configure.ac:172: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) +m4trace:configure.ac:183: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) +m4trace:configure.ac:183: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) diff --git a/configure b/configure index 6ab220f..2086801 100755 --- a/configure +++ b/configure @@ -463,7 +463,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG GTK_CFLAGS GTK_LIBS HILDON_CFLAGS HILDON_LIBS WITH_HILDON_TRUE WITH_HILDON_FALSE OSSO_CFLAGS OSSO_LIBS BLUEZ_CFLAGS BLUEZ_LIBS GNOME_VFS_CFLAGS GNOME_VFS_LIBS GCONF_CFLAGS GCONF_LIBS LIBXML2_CFLAGS LIBXML2_LIBS DBUS_GLIB_CFLAGS DBUS_GLIB_LIBS LIBCURL_CFLAGS LIBCURL_LIBS SQLITE_CFLAGS SQLITE_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS DATADIRNAME GETTEXT_PACKAGE USE_NLS MSGFMT MSGFMT_OPTS GMSGFMT XGETTEXT CATALOGS CATOBJEXT GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS helpfile_enusdir helpfile_engbdir desktopentrydir serviceentrydir localedir pixmapdir icon_26x26dir icon_34x34dir icon_40x40dir icon_50x50dir icon_scalabledir pluginlibdir plugindesktopentrydir LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS HILDON_CFLAGS HILDON_LIBS WITH_HILDON_TRUE WITH_HILDON_FALSE OSSO_CFLAGS OSSO_LIBS BLUEZ_CFLAGS BLUEZ_LIBS GNOME_VFS_CFLAGS GNOME_VFS_LIBS GCONF_CFLAGS GCONF_LIBS LIBXML2_CFLAGS LIBXML2_LIBS DBUS_GLIB_CFLAGS DBUS_GLIB_LIBS LIBCURL_CFLAGS LIBCURL_LIBS SQLITE_CFLAGS SQLITE_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS EXPAT_CFLAGS EXPAT_LIBS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS DATADIRNAME GETTEXT_PACKAGE USE_NLS MSGFMT MSGFMT_OPTS GMSGFMT XGETTEXT CATALOGS CATOBJEXT GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS helpfile_enusdir helpfile_engbdir desktopentrydir serviceentrydir localedir pixmapdir icon_26x26dir icon_34x34dir icon_40x40dir icon_50x50dir icon_scalabledir pluginlibdir plugindesktopentrydir LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -956,6 +956,14 @@ ac_env_GTK_LIBS_set=${GTK_LIBS+set} ac_env_GTK_LIBS_value=$GTK_LIBS ac_cv_env_GTK_LIBS_set=${GTK_LIBS+set} ac_cv_env_GTK_LIBS_value=$GTK_LIBS +ac_env_GLIB_CFLAGS_set=${GLIB_CFLAGS+set} +ac_env_GLIB_CFLAGS_value=$GLIB_CFLAGS +ac_cv_env_GLIB_CFLAGS_set=${GLIB_CFLAGS+set} +ac_cv_env_GLIB_CFLAGS_value=$GLIB_CFLAGS +ac_env_GLIB_LIBS_set=${GLIB_LIBS+set} +ac_env_GLIB_LIBS_value=$GLIB_LIBS +ac_cv_env_GLIB_LIBS_set=${GLIB_LIBS+set} +ac_cv_env_GLIB_LIBS_value=$GLIB_LIBS ac_env_HILDON_CFLAGS_set=${HILDON_CFLAGS+set} ac_env_HILDON_CFLAGS_value=$HILDON_CFLAGS ac_cv_env_HILDON_CFLAGS_set=${HILDON_CFLAGS+set} @@ -1151,6 +1159,8 @@ Some influential environment variables: PKG_CONFIG path to pkg-config utility GTK_CFLAGS C compiler flags for GTK, overriding pkg-config GTK_LIBS linker flags for GTK, overriding pkg-config + GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config + GLIB_LIBS linker flags for GLIB, overriding pkg-config HILDON_CFLAGS C compiler flags for HILDON, overriding pkg-config HILDON_LIBS linker flags for HILDON, overriding pkg-config @@ -4058,7 +4068,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4061 "configure"' > conftest.$ac_ext + echo '#line 4071 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5416,7 +5426,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5419:" \ +echo "$as_me:5429:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6479,11 +6489,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6482: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6492: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6486: \$? = $ac_status" >&5 + echo "$as_me:6496: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6747,11 +6757,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6750: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6760: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6754: \$? = $ac_status" >&5 + echo "$as_me:6764: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6851,11 +6861,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6854: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6864: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6858: \$? = $ac_status" >&5 + echo "$as_me:6868: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9196,7 +9206,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11652: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11646: \$? = $ac_status" >&5 + echo "$as_me:11656: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11743,11 +11753,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11746: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11756: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11750: \$? = $ac_status" >&5 + echo "$as_me:11760: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13316,11 +13326,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13319: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13329: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13323: \$? = $ac_status" >&5 + echo "$as_me:13333: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13420,11 +13430,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13423: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13433: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13427: \$? = $ac_status" >&5 + echo "$as_me:13437: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15626,11 +15636,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15629: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15639: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15633: \$? = $ac_status" >&5 + echo "$as_me:15643: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15894,11 +15904,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15897: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15907: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15901: \$? = $ac_status" >&5 + echo "$as_me:15911: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15998,11 +16008,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16001: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16011: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16005: \$? = $ac_status" >&5 + echo "$as_me:16015: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18909,6 +18919,120 @@ fi +pkg_failed=no +echo "$as_me:$LINENO: checking for GLIB" >&5 +echo $ECHO_N "checking for GLIB... $ECHO_C" >&6 + +if test -n "$PKG_CONFIG"; then + if test -n "$GLIB_CFLAGS"; then + pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GLIB_LIBS"; then + pkg_cv_GLIB_LIBS="$GLIB_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +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 + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0"` + else + GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GLIB_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0) were not met: + +$GLIB_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GLIB_CFLAGS +and GLIB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements (glib-2.0) were not met: + +$GLIB_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GLIB_CFLAGS +and GLIB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GLIB_CFLAGS +and GLIB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&5 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GLIB_CFLAGS +and GLIB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS + GLIB_LIBS=$pkg_cv_GLIB_LIBS + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + : +fi + + + + pkg_failed=no echo "$as_me:$LINENO: checking for HILDON" >&5 echo $ECHO_N "checking for HILDON... $ECHO_C" >&6 @@ -20147,6 +20271,151 @@ fi +# XXX: Check for expat +if test "${ac_cv_header_expat_h+set}" = set; then + echo "$as_me:$LINENO: checking for expat.h" >&5 +echo $ECHO_N "checking for expat.h... $ECHO_C" >&6 +if test "${ac_cv_header_expat_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 +echo "${ECHO_T}$ac_cv_header_expat_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking expat.h usability" >&5 +echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking expat.h presence" >&5 +echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for expat.h" >&5 +echo $ECHO_N "checking for expat.h... $ECHO_C" >&6 +if test "${ac_cv_header_expat_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_expat_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 +echo "${ECHO_T}$ac_cv_header_expat_h" >&6 + +fi + + +EXPAT_LIBS="-lexpat" +EXPAT_CFLAGS="-I/usr/include" + + + # Localisation if test "x$HAVE_HILDON" = "xyes"; then localedir=`$PKG_CONFIG osso-af-settings --variable=localedir` @@ -23021,6 +23290,8 @@ s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t s,@GTK_LIBS@,$GTK_LIBS,;t t +s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t +s,@GLIB_LIBS@,$GLIB_LIBS,;t t s,@HILDON_CFLAGS@,$HILDON_CFLAGS,;t t s,@HILDON_LIBS@,$HILDON_LIBS,;t t s,@WITH_HILDON_TRUE@,$WITH_HILDON_TRUE,;t t @@ -23043,6 +23314,8 @@ s,@SQLITE_CFLAGS@,$SQLITE_CFLAGS,;t t s,@SQLITE_LIBS@,$SQLITE_LIBS,;t t s,@GSTREAMER_CFLAGS@,$GSTREAMER_CFLAGS,;t t s,@GSTREAMER_LIBS@,$GSTREAMER_LIBS,;t t +s,@EXPAT_CFLAGS@,$EXPAT_CFLAGS,;t t +s,@EXPAT_LIBS@,$EXPAT_LIBS,;t t s,@INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t s,@INTLTOOL_DIRECTORY_RULE@,$INTLTOOL_DIRECTORY_RULE,;t t s,@INTLTOOL_KEYS_RULE@,$INTLTOOL_KEYS_RULE,;t t diff --git a/data/Makefile.in b/data/Makefile.in index e16dee1..1c78299 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -91,11 +91,15 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +EXPAT_CFLAGS = @EXPAT_CFLAGS@ +EXPAT_LIBS = @EXPAT_LIBS@ F77 = @F77@ FFLAGS = @FFLAGS@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_LIBS = @GCONF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@ diff --git a/data/help/Makefile.in b/data/help/Makefile.in index 6037d80..51d39e6 100644 --- a/data/help/Makefile.in +++ b/data/help/Makefile.in @@ -91,11 +91,15 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +EXPAT_CFLAGS = @EXPAT_CFLAGS@ +EXPAT_LIBS = @EXPAT_LIBS@ F77 = @F77@ FFLAGS = @FFLAGS@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_LIBS = @GCONF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@ diff --git a/intltool-update b/intltool-update index b80bdd6..43a83d0 100755 --- a/intltool-update +++ b/intltool-update @@ -565,7 +565,7 @@ sub Console_WriteError_InvalidOption sub GenerateHeaders { - my $EXTRACT = "/home/milang/devel/git/mapper/intltool-extract"; + my $EXTRACT = "/home/milang/devel/mapper/intltool-extract"; chomp $EXTRACT; $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"}; diff --git a/src/Makefile.in b/src/Makefile.in index a7e619f..a443784 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -91,11 +91,15 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +EXPAT_CFLAGS = @EXPAT_CFLAGS@ +EXPAT_LIBS = @EXPAT_LIBS@ F77 = @F77@ FFLAGS = @FFLAGS@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_LIBS = @GCONF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_LIBS = @GLIB_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@ @@ -233,7 +237,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -bin_PROGRAMS = mapper +bin_PROGRAMS = mapper osm2db mapper_CFLAGS = $(GTK_CFLAGS) $(OSSO_CFLAGS) $(HILDON_CFLAGS) \ $(GNOME_VFS_CFLAGS) $(GCONF_CFLAGS) $(LIBXML2_CFLAGS) $(GSTREAMER_CFLAGS) \ @@ -242,7 +246,7 @@ mapper_CFLAGS = $(GTK_CFLAGS) $(OSSO_CFLAGS) $(HILDON_CFLAGS) \ mapper_LDADD = $(GTK_LIBS) $(OSSO_LIBS) $(HILDON_LIBS) \ $(GNOME_VFS_LIBS) $(GCONF_LIBS) $(LIBXML2_LIBS) $(GSTREAMER_LIBS) \ - $(SQLITE_LIBS) $(LIBCURL_LIBS) $(DBUS_GLIB_LIBS) $(BLUEZ_LIBS) + $(SQLITE_LIBS) $(LIBCURL_LIBS) $(DBUS_GLIB_LIBS) $(BLUEZ_LIBS) -lm mapper_SOURCES = utils.c \ @@ -250,6 +254,7 @@ mapper_SOURCES = utils.c \ gpx.c \ bt-bluez.c \ bt-maemo.c \ + latlon.c \ gps-browse.c \ gps-nmea-parse.c \ gps-panels.c \ @@ -270,20 +275,26 @@ mapper_SOURCES = utils.c \ config.c \ mapper.c + +osm2db_CFLAGS = $(EXPAT_CFLAGS) $(SQLITE_CFLAGS) $(GLIB_CFLAGS) + +osm2db_LDADD = $(EXPAT_LIBS) $(SQLITE_LIBS) $(GLIB_LIBS) -lm + +osm2db_SOURCES = latlon.c osm.c subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = -bin_PROGRAMS = mapper$(EXEEXT) +bin_PROGRAMS = mapper$(EXEEXT) osm2db$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) am_mapper_OBJECTS = mapper-utils.$(OBJEXT) mapper-db.$(OBJEXT) \ mapper-file.$(OBJEXT) mapper-gpx.$(OBJEXT) \ mapper-bt-bluez.$(OBJEXT) mapper-bt-maemo.$(OBJEXT) \ - mapper-gps-browse.$(OBJEXT) mapper-gps-nmea-parse.$(OBJEXT) \ - mapper-gps-panels.$(OBJEXT) mapper-cb.$(OBJEXT) \ - mapper-iap.$(OBJEXT) mapper-route.$(OBJEXT) \ + mapper-latlon.$(OBJEXT) mapper-gps-browse.$(OBJEXT) \ + mapper-gps-nmea-parse.$(OBJEXT) mapper-gps-panels.$(OBJEXT) \ + mapper-cb.$(OBJEXT) mapper-iap.$(OBJEXT) mapper-route.$(OBJEXT) \ mapper-track.$(OBJEXT) mapper-maemo-osso.$(OBJEXT) \ mapper-map-repo.$(OBJEXT) mapper-map.$(OBJEXT) \ mapper-poi.$(OBJEXT) mapper-poi-gui.$(OBJEXT) \ @@ -294,6 +305,10 @@ am_mapper_OBJECTS = mapper-utils.$(OBJEXT) mapper-db.$(OBJEXT) \ mapper_OBJECTS = $(am_mapper_OBJECTS) mapper_DEPENDENCIES = mapper_LDFLAGS = +am_osm2db_OBJECTS = osm2db-latlon.$(OBJEXT) osm2db-osm.$(OBJEXT) +osm2db_OBJECTS = $(am_osm2db_OBJECTS) +osm2db_DEPENDENCIES = +osm2db_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -309,6 +324,7 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ ./$(DEPDIR)/mapper-gpx.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/mapper-hildon-wrappers.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/mapper-iap.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/mapper-latlon.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/mapper-maemo-osso.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/mapper-map-poi.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/mapper-map-repo.Po \ @@ -321,7 +337,9 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ ./$(DEPDIR)/mapper-speed-display.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/mapper-track.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/mapper-ui-common.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mapper-utils.Po +@AMDEP_TRUE@ ./$(DEPDIR)/mapper-utils.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/osm2db-latlon.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/osm2db-osm.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@ -329,9 +347,9 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(mapper_SOURCES) +DIST_SOURCES = $(mapper_SOURCES) $(osm2db_SOURCES) DIST_COMMON = $(srcdir)/Makefile.in Makefile.am config.h.in -SOURCES = $(mapper_SOURCES) +SOURCES = $(mapper_SOURCES) $(osm2db_SOURCES) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -392,6 +410,9 @@ clean-binPROGRAMS: mapper$(EXEEXT): $(mapper_OBJECTS) $(mapper_DEPENDENCIES) @rm -f mapper$(EXEEXT) $(LINK) $(mapper_LDFLAGS) $(mapper_OBJECTS) $(mapper_LDADD) $(LIBS) +osm2db$(EXEEXT): $(osm2db_OBJECTS) $(osm2db_DEPENDENCIES) + @rm -f osm2db$(EXEEXT) + $(LINK) $(osm2db_LDFLAGS) $(osm2db_OBJECTS) $(osm2db_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) core *.core @@ -411,6 +432,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapper-gpx.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapper-hildon-wrappers.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapper-iap.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapper-latlon.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapper-maemo-osso.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapper-map-poi.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapper-map-repo.Po@am__quote@ @@ -424,6 +446,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapper-track.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapper-ui-common.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapper-utils.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osm2db-latlon.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osm2db-osm.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @@ -656,6 +680,39 @@ mapper-bt-maemo.lo: bt-maemo.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapper_CFLAGS) $(CFLAGS) -c -o mapper-bt-maemo.lo `test -f 'bt-maemo.c' || echo '$(srcdir)/'`bt-maemo.c +mapper-latlon.o: latlon.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapper_CFLAGS) $(CFLAGS) -MT mapper-latlon.o -MD -MP -MF "$(DEPDIR)/mapper-latlon.Tpo" \ +@am__fastdepCC_TRUE@ -c -o mapper-latlon.o `test -f 'latlon.c' || echo '$(srcdir)/'`latlon.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mapper-latlon.Tpo" "$(DEPDIR)/mapper-latlon.Po"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/mapper-latlon.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='latlon.c' object='mapper-latlon.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/mapper-latlon.Po' tmpdepfile='$(DEPDIR)/mapper-latlon.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapper_CFLAGS) $(CFLAGS) -c -o mapper-latlon.o `test -f 'latlon.c' || echo '$(srcdir)/'`latlon.c + +mapper-latlon.obj: latlon.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapper_CFLAGS) $(CFLAGS) -MT mapper-latlon.obj -MD -MP -MF "$(DEPDIR)/mapper-latlon.Tpo" \ +@am__fastdepCC_TRUE@ -c -o mapper-latlon.obj `if test -f 'latlon.c'; then $(CYGPATH_W) 'latlon.c'; else $(CYGPATH_W) '$(srcdir)/latlon.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mapper-latlon.Tpo" "$(DEPDIR)/mapper-latlon.Po"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/mapper-latlon.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='latlon.c' object='mapper-latlon.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/mapper-latlon.Po' tmpdepfile='$(DEPDIR)/mapper-latlon.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapper_CFLAGS) $(CFLAGS) -c -o mapper-latlon.obj `if test -f 'latlon.c'; then $(CYGPATH_W) 'latlon.c'; else $(CYGPATH_W) '$(srcdir)/latlon.c'; fi` + +mapper-latlon.lo: latlon.c +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapper_CFLAGS) $(CFLAGS) -MT mapper-latlon.lo -MD -MP -MF "$(DEPDIR)/mapper-latlon.Tpo" \ +@am__fastdepCC_TRUE@ -c -o mapper-latlon.lo `test -f 'latlon.c' || echo '$(srcdir)/'`latlon.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mapper-latlon.Tpo" "$(DEPDIR)/mapper-latlon.Plo"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/mapper-latlon.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='latlon.c' object='mapper-latlon.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/mapper-latlon.Plo' tmpdepfile='$(DEPDIR)/mapper-latlon.TPlo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapper_CFLAGS) $(CFLAGS) -c -o mapper-latlon.lo `test -f 'latlon.c' || echo '$(srcdir)/'`latlon.c + mapper-gps-browse.o: gps-browse.c @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapper_CFLAGS) $(CFLAGS) -MT mapper-gps-browse.o -MD -MP -MF "$(DEPDIR)/mapper-gps-browse.Tpo" \ @am__fastdepCC_TRUE@ -c -o mapper-gps-browse.o `test -f 'gps-browse.c' || echo '$(srcdir)/'`gps-browse.c; \ @@ -1283,6 +1340,72 @@ mapper-mapper.lo: mapper.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mapper_CFLAGS) $(CFLAGS) -c -o mapper-mapper.lo `test -f 'mapper.c' || echo '$(srcdir)/'`mapper.c +osm2db-latlon.o: latlon.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(osm2db_CFLAGS) $(CFLAGS) -MT osm2db-latlon.o -MD -MP -MF "$(DEPDIR)/osm2db-latlon.Tpo" \ +@am__fastdepCC_TRUE@ -c -o osm2db-latlon.o `test -f 'latlon.c' || echo '$(srcdir)/'`latlon.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/osm2db-latlon.Tpo" "$(DEPDIR)/osm2db-latlon.Po"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/osm2db-latlon.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='latlon.c' object='osm2db-latlon.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/osm2db-latlon.Po' tmpdepfile='$(DEPDIR)/osm2db-latlon.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(osm2db_CFLAGS) $(CFLAGS) -c -o osm2db-latlon.o `test -f 'latlon.c' || echo '$(srcdir)/'`latlon.c + +osm2db-latlon.obj: latlon.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(osm2db_CFLAGS) $(CFLAGS) -MT osm2db-latlon.obj -MD -MP -MF "$(DEPDIR)/osm2db-latlon.Tpo" \ +@am__fastdepCC_TRUE@ -c -o osm2db-latlon.obj `if test -f 'latlon.c'; then $(CYGPATH_W) 'latlon.c'; else $(CYGPATH_W) '$(srcdir)/latlon.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/osm2db-latlon.Tpo" "$(DEPDIR)/osm2db-latlon.Po"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/osm2db-latlon.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='latlon.c' object='osm2db-latlon.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/osm2db-latlon.Po' tmpdepfile='$(DEPDIR)/osm2db-latlon.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(osm2db_CFLAGS) $(CFLAGS) -c -o osm2db-latlon.obj `if test -f 'latlon.c'; then $(CYGPATH_W) 'latlon.c'; else $(CYGPATH_W) '$(srcdir)/latlon.c'; fi` + +osm2db-latlon.lo: latlon.c +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(osm2db_CFLAGS) $(CFLAGS) -MT osm2db-latlon.lo -MD -MP -MF "$(DEPDIR)/osm2db-latlon.Tpo" \ +@am__fastdepCC_TRUE@ -c -o osm2db-latlon.lo `test -f 'latlon.c' || echo '$(srcdir)/'`latlon.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/osm2db-latlon.Tpo" "$(DEPDIR)/osm2db-latlon.Plo"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/osm2db-latlon.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='latlon.c' object='osm2db-latlon.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/osm2db-latlon.Plo' tmpdepfile='$(DEPDIR)/osm2db-latlon.TPlo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(osm2db_CFLAGS) $(CFLAGS) -c -o osm2db-latlon.lo `test -f 'latlon.c' || echo '$(srcdir)/'`latlon.c + +osm2db-osm.o: osm.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(osm2db_CFLAGS) $(CFLAGS) -MT osm2db-osm.o -MD -MP -MF "$(DEPDIR)/osm2db-osm.Tpo" \ +@am__fastdepCC_TRUE@ -c -o osm2db-osm.o `test -f 'osm.c' || echo '$(srcdir)/'`osm.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/osm2db-osm.Tpo" "$(DEPDIR)/osm2db-osm.Po"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/osm2db-osm.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='osm.c' object='osm2db-osm.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/osm2db-osm.Po' tmpdepfile='$(DEPDIR)/osm2db-osm.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(osm2db_CFLAGS) $(CFLAGS) -c -o osm2db-osm.o `test -f 'osm.c' || echo '$(srcdir)/'`osm.c + +osm2db-osm.obj: osm.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(osm2db_CFLAGS) $(CFLAGS) -MT osm2db-osm.obj -MD -MP -MF "$(DEPDIR)/osm2db-osm.Tpo" \ +@am__fastdepCC_TRUE@ -c -o osm2db-osm.obj `if test -f 'osm.c'; then $(CYGPATH_W) 'osm.c'; else $(CYGPATH_W) '$(srcdir)/osm.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/osm2db-osm.Tpo" "$(DEPDIR)/osm2db-osm.Po"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/osm2db-osm.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='osm.c' object='osm2db-osm.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/osm2db-osm.Po' tmpdepfile='$(DEPDIR)/osm2db-osm.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(osm2db_CFLAGS) $(CFLAGS) -c -o osm2db-osm.obj `if test -f 'osm.c'; then $(CYGPATH_W) 'osm.c'; else $(CYGPATH_W) '$(srcdir)/osm.c'; fi` + +osm2db-osm.lo: osm.c +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(osm2db_CFLAGS) $(CFLAGS) -MT osm2db-osm.lo -MD -MP -MF "$(DEPDIR)/osm2db-osm.Tpo" \ +@am__fastdepCC_TRUE@ -c -o osm2db-osm.lo `test -f 'osm.c' || echo '$(srcdir)/'`osm.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/osm2db-osm.Tpo" "$(DEPDIR)/osm2db-osm.Plo"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/osm2db-osm.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='osm.c' object='osm2db-osm.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/osm2db-osm.Plo' tmpdepfile='$(DEPDIR)/osm2db-osm.TPlo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(osm2db_CFLAGS) $(CFLAGS) -c -o osm2db-osm.lo `test -f 'osm.c' || echo '$(srcdir)/'`osm.c + mostlyclean-libtool: -rm -f *.lo