Imported Upstream version 3.13.4.2upstream/3.13.4.2

1 files changed, 39 insertions, 22 deletions

diff --git a/configure b/configure
index 30c81e2..1838a67 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for simple-scan 3.12.0.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.13.4.2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -637,8 +637,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='simple-scan'
 PACKAGE_TARNAME='simple-scan'
-PACKAGE_VERSION='3.12.0'
-PACKAGE_STRING='simple-scan 3.12.0'
+PACKAGE_VERSION='3.13.4.2'
+PACKAGE_STRING='simple-scan 3.13.4.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -723,6 +723,8 @@ YELP_HELP_RULES
 XMLLINT
 ITSTOOL
 HELP_DIR
+YELP_LC_DIST
+YELP_LC_MEDIA_LINKS
 LN_S
 EGREP
 GREP
@@ -1396,7 +1398,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 simple-scan 3.12.0 to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.13.4.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1462,7 +1464,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of simple-scan 3.12.0:";;
+     short | recursive ) echo "Configuration of simple-scan 3.13.4.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1578,7 +1580,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-simple-scan configure 3.12.0
+simple-scan configure 3.13.4.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1943,7 +1945,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 simple-scan $as_me 3.12.0, which was
+It was created by simple-scan $as_me 3.13.4.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2806,7 +2808,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='simple-scan'
- VERSION='3.12.0'
+ VERSION='3.13.4.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3015,11 +3017,11 @@ $as_echo "no" >&6; }
 fi
 
 
-   if test "$VALAC" != valac && test -n "0.16.0"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $VALAC is at least version 0.16.0" >&5
-$as_echo_n "checking whether $VALAC is at least version 0.16.0... " >&6; }
+   if test "$VALAC" != valac && test -n "0.22.0"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $VALAC is at least version 0.22.0" >&5
+$as_echo_n "checking whether $VALAC is at least version 0.22.0... " >&6; }
        am__vala_version=`$VALAC --version | sed 's/Vala  *//'`
-       as_arg_v1=0.16.0
+       as_arg_v1=0.22.0
 as_arg_v2="$am__vala_version"
 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
 case $? in #(
@@ -3038,10 +3040,7 @@ $as_echo "no" >&6; }
 esac
 fi
     if test "$VALAC" = valac; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no proper vala compiler found" >&5
-$as_echo "$as_me: WARNING: no proper vala compiler found" >&2;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: you will not be able to compile vala source files" >&5
-$as_echo "$as_me: WARNING: you will not be able to compile vala source files" >&2;}
+      as_fn_error $? "Vala compiler not found" "$LINENO" 5
     else
       :
     fi
@@ -5075,6 +5074,22 @@ fi
 
 
 
+YELP_LC_MEDIA_LINKS=true
+YELP_LC_DIST=true
+
+for yelpopt in ; do
+  case $yelpopt in
+    lc-media-links)    YELP_LC_MEDIA_LINKS=true ;;
+    no-lc-media-links) YELP_LC_MEDIA_LINKS= ;;
+    lc-dist)           YELP_LC_DIST=true ;;
+    no-lc-dist)        YELP_LC_DIST= ;;
+    *) as_fn_error $? "Unrecognized YELP_HELP_INIT option $yelpopt\"" "$LINENO" 5 ;;
+  esac
+done;
+
+
+
+
 # Check whether --with-help-dir was given.
 if test "${with_help_dir+set}" = set; then :
   withval=$with_help_dir;
@@ -5244,13 +5259,13 @@ clean-help:
 
 EXTRA_DIST ?=
 EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
-EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp)
+EXTRA_DIST += $(if $(YELP_LC_DIST),$(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp))
 EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po)
 EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
 
 distdir: distdir-help-files
 distdir-help-files:
-	@for lc in C $(HELP_LINGUAS); do \
+	@for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \
 	  $(MKDIR_P) "$(distdir)/$$lc"; \
 	  for file in $(HELP_FILES); do \
 	    if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \
@@ -5308,8 +5323,10 @@ install-help:
 	      echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \
 	      $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \
 	    elif test "x$$lc" != "xC"; then \
-	      echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
-	      $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
+	      if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \
+	        echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
+	        $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
+	      fi; \
 	    fi; \
 	  done; \
 	done
@@ -6504,7 +6521,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 simple-scan $as_me 3.12.0, which was
+This file was extended by simple-scan $as_me 3.13.4.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6561,7 +6578,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="\\
-simple-scan config.status 3.12.0
+simple-scan config.status 3.13.4.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"