New upstream version 5.2.13~pre1

1 files changed, 37 insertions, 11 deletions

diff --git a/configure.ac b/configure.ac
index 7b880b3..8baf35c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,10 +76,10 @@ dnl
 pushdef([GUTENPRINT_NAME],              [gutenprint])
 pushdef([GUTENPRINT_MAJOR_VERSION],     [5])
 pushdef([GUTENPRINT_MINOR_VERSION],     [2])
-pushdef([GUTENPRINT_MICRO_VERSION],     [12])
-pushdef([GUTENPRINT_EXTRA_VERSION],     [])
-pushdef([GUTENPRINT_CURRENT_INTERFACE], [7])
-pushdef([GUTENPRINT_BINARY_AGE],        [5])
+pushdef([GUTENPRINT_MICRO_VERSION],     [13])
+pushdef([GUTENPRINT_EXTRA_VERSION],     [-pre1])
+pushdef([GUTENPRINT_CURRENT_INTERFACE], [8])
+pushdef([GUTENPRINT_BINARY_AGE],        [6])
 pushdef([GUTENPRINTUI2_CURRENT_INTERFACE], [1])
 pushdef([GUTENPRINTUI2_BINARY_AGE],        [0])
 pushdef([GUTENPRINT_VERSION], GUTENPRINT_MAJOR_VERSION.GUTENPRINT_MINOR_VERSION.GUTENPRINT_MICRO_VERSION[]GUTENPRINT_EXTRA_VERSION)
@@ -403,13 +403,13 @@ dnl   [EXTRA_LIBREADLINE_DEPS]=""
 dnl fi
 
 # libusb-1.0 (For CUPS backends, but only bother if CUPS is enabled)
-if test "x$BUILD_CUPS" = "xyes" ; then
+AS_IF([test "x$BUILD_CUPS" = "xyes"], [
  PKG_CHECK_MODULES([LIBUSB], [libusb-1.0],
                    [HAVE_LIBUSB=yes
                     BUILD_LIBUSB_BACKENDS=yes],
                    [HAVE_LIBUSB=no
 	            BUILD_LIBUSB_BACKENDS=no])
-fi
+])
 
 AC_PATH_TOOL([GIMPTOOL2_CHECK], [gimptool-2.0 gimptool])
 if test -z "${GIMPTOOL2_CHECK}" ; then
@@ -440,9 +440,9 @@ PKG_CHECK_MODULES([GTK2], [gtk+-2.0],
                   [HAVE_GTK2=no
 	           BUILD_LIBGUTENPRINTUI2=no])
 # Require both gimptool and pkg-config to succeed
-if test x$BUILD_GIMP2 = xyes; then
+AS_IF([test "x$BUILD_GIMP2" = "xyes"], [
   PKG_CHECK_MODULES([GIMP2], [gimpui-2.0], [BUILD_GIMP2=yes], [BUILD_GIMP2=no])
-fi
+])
 
 STP_ARG_WITH([gimp2],
              [build GIMP 2.x Print plugin],
@@ -515,7 +515,6 @@ AC_PROG_LN_S
 AM_PROG_LEX
 AC_PROG_YACC
 AC_PROG_MKDIR_P
-AC_PATH_PROG([BZIP2], [bzip2])
 AC_PATH_PROG([TEST], [test])
 AC_PATH_PROG([TRUE], [true])
 AC_PATH_PROG([FIND], [find])
@@ -570,6 +569,30 @@ if test x${USE_MAINTAINER_MODE} = xyes ; then
   fi
 fi
 
+AC_PATH_PROG([XZ], [xz])
+AC_PATH_PROG([GZIP], [gzip])
+AC_PATH_PROG([BZIP2], [bzip2])
+AC_PATH_PROG([LRZIP], [lrzip])
+AC_PATH_PROG([RZIP], [rzip])
+if test x${LRZIP} != x ; then
+  COMPRESS="${LRZIP} -z -q"
+  CSUF=.lrz
+elif test x${XZ} != x ; then
+  COMPRESS="${XZ} -e -9"
+  CSUF=.xz
+elif test x${RZIP} != x ; then
+  COMPRESS="${RZIP} -9"
+  CSUF=.rz
+elif test x${BZIP2} != x ; then
+  COMPRESS="${BZIP2} -9"
+  CSUF=.bz2
+else
+  COMPRESS="${GZIP} -9"
+  CSUF=.gz
+fi
+AC_SUBST(COMPRESS)
+AC_SUBST(CSUF)
+
 dnl CUPS checks
 STP_CUPS_PROGS
 
@@ -943,6 +966,8 @@ STP_RELEASE_DATE
 dnl Some versions of make get very grouchy about $(RM)
 RM='rm'
 
+PKGROOT=`pwd`
+
 dnl Substitutions
 AC_SUBST(prefix)
 AC_SUBST(exec_prefix)
@@ -986,6 +1011,7 @@ AC_SUBST(BUILD_CUPS_PPDS)
 AC_SUBST(GUTENPRINT_BASE_VERSION)
 AC_SUBST(GUTENPRINT_RELEASE_VERSION)
 AC_SUBST(LIBUSB_BACKEND_LIBDEPS)
+AC_SUBST(PKGROOT)
 
 dnl Optional architecture options to be applied after all autoconf tests
 dnl are done...
@@ -1023,8 +1049,6 @@ AC_CONFIG_FILES([src/testpattern/compare-checksums],
                 [chmod +x src/testpattern/compare-checksums])
 AC_CONFIG_FILES([src/testpattern/compress-checksums],
                 [chmod +x src/testpattern/compress-checksums])
-AC_CONFIG_FILES([src/testpattern/uncompress-checksums],
-                [chmod +x src/testpattern/uncompress-checksums])
 AC_CONFIG_FILES([src/cups/test-rastertogutenprint],
                 [chmod +x src/cups/test-rastertogutenprint])
 AC_CONFIG_FILES([src/testpattern/Makefile])
@@ -1046,6 +1070,8 @@ AC_CONFIG_FILES([test/Makefile])
 AC_CONFIG_FILES([scripts/Makefile])
 AC_CONFIG_FILES([scripts/mkgitlog],
 		[chmod +x scripts/mkgitlog])
+AC_CONFIG_FILES([scripts/gversion],
+		[chmod +x scripts/gversion])
 AC_CONFIG_COMMANDS([default], [
 echo
 ],