diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 88 |
1 files changed, 44 insertions, 44 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for shotwell 0.26.2. +# Generated by GNU Autoconf 2.69 for shotwell 0.26.3. # # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell>. # @@ -650,8 +650,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='shotwell' PACKAGE_TARNAME='shotwell' -PACKAGE_VERSION='0.26.2' -PACKAGE_STRING='shotwell 0.26.2' +PACKAGE_VERSION='0.26.3' +PACKAGE_STRING='shotwell 0.26.3' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell' PACKAGE_URL='' @@ -698,8 +698,8 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS GLIB_COMPILE_RESOURCES -APPDATA_XML_RULES -appdataxmldir +APPSTREAM_XML_RULES +appstreamxmldir APPSTREAM_UTIL YELP_HELP_RULES XMLLINT @@ -919,7 +919,7 @@ with_aix_soname with_sysroot enable_libtool_lock with_help_dir -enable_appdata_validate +enable_appstream_util ' ac_precious_vars='build_alias host_alias @@ -1502,7 +1502,7 @@ 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 shotwell 0.26.2 to adapt to many kinds of systems. +\`configure' configures shotwell 0.26.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1573,7 +1573,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of shotwell 0.26.2:";; + short | recursive ) echo "Configuration of shotwell 0.26.3:";; esac cat <<\_ACEOF @@ -1607,7 +1607,7 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --disable-appdata-validate + --disable-appstream-util Disable validating AppData XML files during check phase @@ -1746,7 +1746,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -shotwell configure 0.26.2 +shotwell configure 0.26.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2024,7 +2024,7 @@ 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 shotwell $as_me 0.26.2, which was +It was created by shotwell $as_me 0.26.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2485,12 +2485,12 @@ MAJOR_VERSION=0 MINOR_VERSION=26 -MICRO_VERSION=2 +MICRO_VERSION=3 API_VERSION=0 -GITVER=4f0174c855ca28b2b1f51e51120333de89edf994 +GITVER=c2d999c39385c7889b191b2b3b15a6b3d334e579 if test "x$GITVER" != "x"; then @@ -2988,7 +2988,7 @@ fi # Define the identity of the package. PACKAGE='shotwell' - VERSION='0.26.2' + VERSION='0.26.3' cat >>confdefs.h <<_ACEOF @@ -17079,13 +17079,13 @@ uninstall-help: - # Check whether --enable-appdata-validate was given. -if test "${enable_appdata_validate+set}" = set; then : - enableval=$enable_appdata_validate; + # Check whether --enable-appstream-util was given. +if test "${enable_appstream_util+set}" = set; then : + enableval=$enable_appstream_util; fi - if test "x$enable_appdata_validate" != "xno"; then : + if test "x$enable_appstream_validate" != "xno"; then : # Extract the first word of "appstream-util", so it can be a program name with args. set dummy appstream-util; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -17127,31 +17127,31 @@ fi if test "x$APPSTREAM_UTIL" = "x"; then : - have_appdata_validate=no + have_appstream_validate=no else - have_appdata_validate=yes + have_appstream_validate=yes fi else - have_appdata_validate=no + have_appstream_validate=no fi - if test "x$have_appdata_validate" != "xno"; then : - appdata_validate=yes + if test "x$have_appstream_validate" != "xno"; then : + appstream_validate=yes else - appdata_validate=no - if test "x$enable_appdata_validate" = "xyes"; then : + appstream_validate=no + if test "x$enable_appstream_validate" = "xyes"; then : as_fn_error $? "AppData validation was requested but appstream-util was not found" "$LINENO" 5 fi fi - appdataxmldir=${datadir}/appdata + appstreamxmldir=${datadir}/appdata - APPDATA_XML_RULES=' -.PHONY : uninstall-appdata-xml install-appdata-xml clean-appdata-xml + APPSTREAM_XML_RULES=' +.PHONY : uninstall-appstream-xml install-appstream-xml clean-appstream-xml -mostlyclean-am: clean-appdata-xml +mostlyclean-am: clean-appstream-xml %.appdata.valid: %.appdata.xml $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \ @@ -17159,29 +17159,29 @@ mostlyclean-am: clean-appdata-xml then $(APPSTREAM_UTIL) --nonet validate $${d}$<; fi \ && touch $@ -check-am: $(appdata_XML:.appdata.xml=.appdata.valid) -uninstall-am: uninstall-appdata-xml -install-data-am: install-appdata-xml +check-am: $(appstream_XML:.appdata.xml=.appdata.valid) +uninstall-am: uninstall-appstream-xml +install-data-am: install-appstream-xml -.SECONDARY: $(appdata_XML) +.SECONDARY: $(appstream_XML) -install-appdata-xml: $(appdata_XML) +install-appstream-xml: $(appstream_XML) @$(NORMAL_INSTALL) if test -n "$^"; then \ - test -z "$(appdataxmldir)" || $(MKDIR_P) "$(DESTDIR)$(appdataxmldir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(appdataxmldir)"; \ + test -z "$(appstreamxmldir)" || $(MKDIR_P) "$(DESTDIR)$(appstreamxmldir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(appstreamxmldir)"; \ fi -uninstall-appdata-xml: +uninstall-appstream-xml: @$(NORMAL_UNINSTALL) - @list='\''$(appdata_XML)'\''; test -n "$(appdataxmldir)" || list=; \ + @list='\''$(appstream_XML)'\''; test -n "$(appstreamxmldir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(appdataxmldir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appdataxmldir)" && rm -f $$files + echo " ( cd '\''$(DESTDIR)$(appstreamxmldir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(appstreamxmldir)" && rm -f $$files -clean-appdata-xml: - rm -f $(appdata_XML:.appdata.xml=.appdata.valid) +clean-appstream-xml: + rm -f $(appstream_XML:.appdata.xml=.appdata.valid) ' @@ -17761,7 +17761,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by shotwell $as_me 0.26.2, which was +This file was extended by shotwell $as_me 0.26.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17827,7 +17827,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -shotwell config.status 0.26.2 +shotwell config.status 0.26.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" |