Fixed PACKAGE_VERSION breakage. PACKAGE_VERSION was redefined by autoconf 2.5

with a different meaning. Use PACKAGE_STRING instead.

ChangeLog

@@ -1,3 +1,12 @@
+2002-11-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
+
+	* configure configure.in backend/canon630u.c backend/dll.c backend/gt68xx.c
+	  backend/mustek_usb.c backend/net.c backend/pnm.c backend/test.c
+	  backend/umax1220u.c backend/v4l.c doc/Makefile.in include/sane/config.h.in
+	  tools/sane-desc.c: Fixed PACKAGE_VERSION breakage. PACKAGE_VERSION was
+	  redefined by autoconf 2.5 with a different meaning. Use PACKAGE_STRING
+	  instead.
+
 2002-11-29 Oliver Rauch <Oliver.Rauch@Rauch-Domain.DE>
 
 	* frontend/stiff.c: added fclose(icc_file)

backend/canon630u.c

@@ -626,7 +626,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
   DBG (2, "sane_init: version_code %s 0, authorize %s 0\n",
        version_code == 0 ? "=" : "!=", authorize == 0 ? "=" : "!=");
   DBG (1, "sane_init: SANE Canon630u backend version %d.%d.%d from %s\n",
-       V_MAJOR, V_MINOR, BUILD, PACKAGE_VERSION);
+       V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
 
   if (version_code)
     *version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);

backend/dll.c

@@ -534,7 +534,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
   auth_callback = authorize;
 
   DBG(1, "sane_init: SANE dll backend version %s from %s\n", DLL_VERSION,
-      PACKAGE_VERSION);
+      PACKAGE_STRING);
 
   /* chain preloaded backends together: */
   for (i = 0; i < NELEMS(preloaded_backends); ++i)

backend/gt68xx.c

@@ -900,7 +900,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
 
   DBG_INIT ();
   DBG (2, "SANE GT68xx backend version %d.%d build %d from %s\n", V_MAJOR,
-       V_MINOR, BUILD, PACKAGE_VERSION);
+       V_MINOR, BUILD, PACKAGE_STRING);
 
   if (version_code)
     *version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);

backend/mustek_usb.c

@@ -705,7 +705,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
 
   DBG_INIT ();
   DBG (2, "SANE Mustek USB backend version %d.%d build %d from %s\n", V_MAJOR,
-       V_MINOR, BUILD, PACKAGE_VERSION);
+       V_MINOR, BUILD, PACKAGE_STRING);
 
   if (version_code)
     *version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);

backend/net.c

@@ -466,7 +466,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
 				       SANE_DLL_V_BUILD);
 
   DBG (1, "sane_init: SANE net backend version %s from %s\n", NET_VERSION,
-       PACKAGE_VERSION);
+       PACKAGE_STRING);
 
   /* determine (client) machine byte order */
   if (*p == 0x12)

backend/pnm.c

@@ -505,7 +505,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
   DBG (2, "sane_init: version_code %s 0, authorize %s 0\n",
        version_code == 0 ? "=" : "!=", authorize == 0 ? "=" : "!=");
   DBG (1, "sane_init: SANE pnm backend version %d.%d.%d from %s\n",
-       V_MAJOR, V_MINOR, BUILD, PACKAGE_VERSION);
+       V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
 
   if (version_code)
     *version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);

backend/test.c

@@ -1380,7 +1380,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
   DBG (2, "sane_init: version_code= %p, authorize=%p\n", version_code,
        authorize);
   DBG (1, "sane_init: SANE test backend version %d.%d.%d from %s\n",
-       V_MAJOR, V_MINOR, BUILD, PACKAGE_VERSION);
+       V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
 
   if (version_code)
     *version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);

backend/umax1220u.c

@@ -592,7 +592,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
   DBG (2, "sane_init: version_code %s 0, authorize %s 0\n",
        version_code == 0 ? "=" : "!=", authorize == 0 ? "=" : "!=");
   DBG (1, "sane_init: SANE umax1220u backend version %d.%d.%d from %s\n",
-       V_MAJOR, V_MINOR, BUILD, PACKAGE_VERSION);
+       V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
 
   if (version_code)
     *version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);

backend/v4l.c

@@ -426,7 +426,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
   DBG_INIT ();
 
   DBG (2, "SANE v4l backend version %d.%d build %d from %s\n", V_MAJOR,
-       V_MINOR, BUILD, PACKAGE_VERSION);
+       V_MINOR, BUILD, PACKAGE_STRING);
 
   if (version_code)
     *version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);

configure

@@ -1,6 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.54.
+# Generated by GNU Autoconf 2.54 for sane-backends 1.0.9-cvs.
+#
+# Report bugs to <sane-devel@mostang.com>.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -420,13 +422,12 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 : ${ac_max_here_lines=38}
 
 # Identity of this package.
-PACKAGE_NAME=
+PACKAGE_NAME='sane-backends'
-PACKAGE_TARNAME=
+PACKAGE_TARNAME='sane-backends'
-PACKAGE_VERSION=
+PACKAGE_VERSION='1.0.9-cvs'
-PACKAGE_STRING=
+PACKAGE_STRING='sane-backends 1.0.9-cvs'
-PACKAGE_BUGREPORT=
+PACKAGE_BUGREPORT='sane-devel@mostang.com'
 
-ac_unique_file="include/sane/sane.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -933,7 +934,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 this package to adapt to many kinds of systems.
+\`configure' configures sane-backends 1.0.9-cvs to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -998,7 +999,9 @@ _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of sane-backends 1.0.9-cvs:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
@@ -1047,6 +1050,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
+Report bugs to <sane-devel@mostang.com>.
 _ACEOF
 fi
 
@@ -1109,6 +1113,8 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
+sane-backends configure 1.0.9-cvs
+generated by GNU Autoconf 2.54
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 Free Software Foundation, Inc.
@@ -1122,7 +1128,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by sane-backends $as_me 1.0.9-cvs, which was
 generated by GNU Autoconf 2.54.  Invocation command line was
 
   $ $0 $@
@@ -1413,6 +1419,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
+
+
+
+
+
+
 
 
 
@@ -1436,20 +1450,15 @@ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
 rm conftest.sed
 
 
-# version code:
 V_MAJOR=1
 V_MINOR=0
 V_REV=9
-V_EXTRA=-cvs
-
-
 
 
 
 PACKAGE=sane-backends
-VERSION=${V_MAJOR}.${V_MINOR}.${V_REV}${V_EXTRA}
+VERSION=1.0.9-cvs
 NUMBER_VERSION=${V_MAJOR}.${V_MINOR}.${V_REV}
-PACKAGE_VERSION="$PACKAGE-$VERSION"
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE "$PACKAGE"
@@ -1461,11 +1470,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
 cat >>confdefs.h <<_ACEOF
 #define SANE_DLL_V_MAJOR $V_MAJOR
 _ACEOF
@@ -1484,7 +1488,6 @@ _ACEOF
 
 
 
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8476,7 +8479,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8479 "configure"' > conftest.$ac_ext
+  echo '#line 8482 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8994,7 +8997,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:8997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:9000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -10744,7 +10747,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10747 "configure"
+#line 10750 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10842,7 +10845,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10845 "configure"
+#line 10848 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12388,7 +12391,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by $as_me, which was
+This file was extended by sane-backends $as_me 1.0.9-cvs, which was
 generated by GNU Autoconf 2.54.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12447,7 +12450,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-config.status
+sane-backends config.status 1.0.9-cvs
 configured by $0, generated by GNU Autoconf 2.54,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

configure.in

@@ -1,36 +1,28 @@
-dnl Process this file with autoconf to produce a configure script. -*-sh-*-
+dnl Process this file with autoconf to produce a configure script. -*-m4-*-
-AC_INIT(include/sane/sane.h)
+AC_INIT(sane-backends, 1.0.9-cvs, sane-devel@mostang.com)
 AC_CONFIG_HEADER(include/sane/config.h)
 AC_PREREQ(2.50)dnl		dnl Minimum Autoconf version required.
 AC_ARG_PROGRAM
 
-# version code:
 V_MAJOR=1
 V_MINOR=0
 V_REV=9
-V_EXTRA=-cvs
-
 AC_SUBST(V_MAJOR)
 AC_SUBST(V_MINOR)
 AC_SUBST(V_REV)
-
+PACKAGE=AC_PACKAGE_NAME
-PACKAGE=sane-backends
+VERSION=AC_PACKAGE_VERSION
-VERSION=${V_MAJOR}.${V_MINOR}.${V_REV}${V_EXTRA}
 NUMBER_VERSION=${V_MAJOR}.${V_MINOR}.${V_REV}
-PACKAGE_VERSION="$PACKAGE-$VERSION"
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE",
                    [Define to the name of the distribution.])
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION",
                    [Define to the version of the distribution.])
-AC_DEFINE_UNQUOTED(PACKAGE_VERSION, "$PACKAGE_VERSION",
-                 [The concatenation of the strings PACKAGE, "-", and VERSION.])
 AC_DEFINE_UNQUOTED(SANE_DLL_V_MAJOR, $V_MAJOR, [SANE DLL major number])
 AC_DEFINE_UNQUOTED(SANE_DLL_V_MINOR, $V_MINOR, [SANE DLL minor number])
 AC_DEFINE_UNQUOTED(SANE_DLL_V_BUILD, $V_REV, [SANE DLL revision number])
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_SUBST(NUMBER_VERSION)
-AC_SUBST(PACKAGE_VERSION)
 
 dnl Checks for programs.
 AC_PROG_CC

doc/Makefile.in

@@ -7,7 +7,7 @@ top_builddir = ..
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
-package_version = @PACKAGE_VERSION@
+package_version = @PACKAGE_STRING@
 distdir = $(top_srcdir)/$(PACKAGE)-$(VERSION)
 
 prefix = @prefix@

include/sane/config.h.in

@@ -294,7 +294,7 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
-/* The concatenation of the strings PACKAGE, "-", and VERSION. */
+/* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
 /* Define as the return type of signal handlers (`int' or `void'). */

tools/sane-desc.c

@@ -253,7 +253,7 @@ print_usage (char *program_name)
 static void
 print_version (void)
 {
-  printf ("sane-desc %s (%s)\n", SANE_DESC_VERSION, PACKAGE_VERSION);
+  printf ("sane-desc %s (%s)\n", SANE_DESC_VERSION, PACKAGE_STRING);
   printf ("Copyright (C) 2002 Henning Meier-Geinitz "
 	  "<henning@meier-geinitz.de>\n"
 	  "sane-desc comes with NO WARRANTY, to the extent permitted by "