31 files changed, 55 insertions, 1647 deletions
diff --git a/debian/changelog b/debian/changelog
index 5f9092f..69e219f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xsane (0.999-2) unstable; urgency=medium
+
+  * Add new package xsane-dbg (Closes: #690359).
+  * debian/control:
+    - New package xsane-dbg.
+    - Reformat Depends.
+  * debian/rules:
+    - Add override_dh_strip for xsane-dbg.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Tue, 16 Dec 2014 23:03:17 +0100
+
 xsane (0.999-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 0effc91..f3f3c6f 100644
--- a/debian/control
+++ b/debian/control
@@ -21,9 +21,18 @@ Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/xsane.git
 
 Package: xsane
 Architecture: any
-Depends: xsane-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: iceweasel | www-browser, cups-client
-Suggests: gimp, hylafax-client | mgetty-fax, gv, gocr
+Depends: 
+ ${shlibs:Depends}, 
+ ${misc:Depends},
+ xsane-common (= ${source:Version})
+Recommends:
+ cups-client,
+ iceweasel | firefox | www-browser
+Suggests:
+ gimp,
+ gocr,
+ gv,
+ hylafax-client | mgetty-fax
 Description: featureful graphical frontend for SANE (Scanner Access Now Easy)
  xsane can be run as a stand-alone program or through the GIMP image
  manipulation program.  In stand-alone mode, xsane can save an image
@@ -40,16 +49,41 @@ Description: featureful graphical frontend for SANE (Scanner Access Now Easy)
  under the GNU General Public License (commercial applications and
  backends are welcome, too, however).
 
+Package: xsane-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: 
+ ${misc:Depends},
+ xsane (= ${binary:Version})
+Description: featureful graphical frontend for SANE (Debug files)
+ xsane can be run as a stand-alone program or through the GIMP image
+ manipulation program.  In stand-alone mode, xsane can save an image
+ to a file in a variety of image formats, serve as a frontend to a
+ fax program, or send an image to a printer.
+ .
+ SANE stands for "Scanner Access Now Easy" and is an application
+ programming interface (API) that provides standardized access to any
+ raster image scanner hardware (flatbed scanner, hand-held scanner,
+ video- and still-cameras, frame-grabbers, etc.). The SANE standard is
+ free and its discussion and development are open to everybody. The
+ current source code is written to support several operating systems,
+ including GNU/Linux, OS/2, Win32 and various Unices and is available
+ under the GNU General Public License (commercial applications and
+ backends are welcome, too, however).
+ .
+ This package contains debug files needed by xsane.
+
 Package: xsane-common
 Architecture: all
 Depends: ${misc:Depends}
 Replaces: xsane
 Recommends: xsane
 Description: xsane architecture independent files
- xsane can be run as a stand-alone program or through the GIMP image 
- manipulation program.  In stand-alone mode, xsane can save an image 
- to a file in a variety of image formats, serve as a frontend to a 
- fax program, or send an image to a printer. 
+ xsane can be run as a stand-alone program or through the GIMP image
+ manipulation program.  In stand-alone mode, xsane can save an image
+ to a file in a variety of image formats, serve as a frontend to a
+ fax program, or send an image to a printer.
  .
  This package contains architecture-independent files needed by xsane
  (locales, help).
diff --git a/debian/rules b/debian/rules
index 9b9327c..a3b49f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,9 @@ override_dh_auto_clean:
 	rm -f xsane.spec include/config.h
 	rm -f po/*.gmo
 
+override_dh_strip:
+	dh_strip -pxsane --dbg-package=xsane-dbg
+
 override_dh_auto_install:
 	dh_auto_install
 
diff --git a/include/config.h b/include/config.h
deleted file mode 100644
index 03f6a0f..0000000
--- a/include/config.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/* include/config.h.  Generated from config.h.in by configure.  */
-#ifndef SANE_CONFIG_H
-#define SANE_CONFIG_H
-
-/* Define if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-#define _ALL_SOURCE 1
-#endif
-
-/* Define if using alloca.c.  */
-/* #undef C_ALLOCA */
-
-/* Define to empty if the keyword does not work.  */
-/* #undef const */
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define if you have alloca, as a function or macro.  */
-#define HAVE_ALLOCA 1
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-#define HAVE_ALLOCA_H 1
-
-/* Define if you have a working `mmap' system call.  */
-#define HAVE_MMAP 1
-
-/* Define as __inline if that's what the C compiler calls it.  */
-/* #undef inline */
-
-/* Define if on MINIX.  */
-/* #undef _MINIX */
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-/* #undef off_t */
-
-/* Define if the system does not provide POSIX.1 features except
-   with this defined.  */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE */
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
-
-/* Define to `unsigned char' if <sys/types.h> doesn't define.  */
-/* #undef u_char */
-
-/* Define to `unsigned int' if <sys/types.h> doesn't define.  */
-/* #undef u_int */
-
-/* Define to `unsigned long' if <sys/types.h> doesn't define.  */
-/* #undef u_long */
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-/* #undef ssize_t */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef pid_t */
-
-/* Define scsireq_t as `struct scsireq' if necessary.  */
-/* #undef scsireq_t */
-
-/* Define to the return type of signal handlers. */
-#define RETSIGTYPE void
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown
- */
-/* #undef STACK_DIRECTION */
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define to 1 if NLS is requested.  */
-#define ENABLE_NLS 1
-
-/* Define as 1 if you have catgets and don't want to use GNU gettext.  */
-/* #undef HAVE_CATGETS */
-
-/* Define as 1 if you have gettext and don't want to use GNU gettext.  */
-#define HAVE_GETTEXT 1
-
-/* Define if your locale.h file contains LC_MESSAGES.  */
-#define HAVE_LC_MESSAGES 1
-
-/* Define to 1 if you have the stpcpy function.  */
-#define HAVE_STPCPY 1
-
-/* Define to the name of the distribution.  */
-#define PACKAGE "xsane"
-
-/* Define to the version of the distribution.  */
-#define VERSION "0.999"
-
-/* The concatenation of the strings PACKAGE, "-", and VERSION.  */
-#define XSANE_PACKAGE_VERSION "xsane-0.999"
-
-/* Define if you have the __argz_count function.  */
-#define HAVE___ARGZ_COUNT 1
-
-/* Define if you have the __argz_next function.  */
-#define HAVE___ARGZ_NEXT 1
-
-/* Define if you have the __argz_stringify function.  */
-#define HAVE___ARGZ_STRINGIFY 1
-
-/* Define if you have the atexit function. */
-#define HAVE_ATEXIT 1
-
-/* Define if you have the dcgettext function.  */
-#define HAVE_DCGETTEXT 1
-
-/* Define if you have the getcwd function.  */
-#define HAVE_GETCWD 1
-
-/* Define if you have the getpagesize function.  */
-#define HAVE_GETPAGESIZE 1
-
-/* Define if you have the lstat function.  */
-#define HAVE_LSTAT 1
-
-/* Define if you have the mkdir function.  */
-#define HAVE_MKDIR 1
-
-/* Define if you have the munmap function.  */
-#define HAVE_MUNMAP 1
-
-/* Define if you have the putenv function.  */
-#define HAVE_PUTENV 1
-
-/* Define if you have the scsireq_enter function.  */
-/* #undef HAVE_SCSIREQ_ENTER */
-
-/* Define if you have the sigprocmask function.  */
-#define HAVE_SIGPROCMASK 1
-
-/* Define if you have the setenv function.  */
-#define HAVE_SETENV 1
-
-/* Define if you have the setlocale function.  */
-#define HAVE_SETLOCALE 1
-
-/* Define if you have the snprintf function.  */
-#define HAVE_SNPRINTF 1
-
-/* Define if you have the stpcpy function.  */
-#define HAVE_STPCPY 1
-
-/* Define if you have the strcasecmp function.  */
-#define HAVE_STRCASECMP 1
-
-/* Define if you have the strchr function.  */
-#define HAVE_STRCHR 1
-
-/* Define if you have the strdup function.  */
-#define HAVE_STRDUP 1
-
-/* Define if you have the strncasecmp function.  */
-#define HAVE_STRNCASECMP 1
-
-/* Define if you have the strndup function.  */
-#define HAVE_STRNDUP 1
-
-/* Define if you have the strftime function.  */
-#define HAVE_STRFTIME 1
-
-/* Define if you have the strstr function.  */
-#define HAVE_STRSTR 1
-
-/* Define if you have the strsep function.  */
-#define HAVE_STRSEP 1
-
-/* Define if you have the strtod function.  */
-#define HAVE_STRTOD 1
-
-/* Define if you have the valloc function.  */
-/* #undef HAVE_VALLOC */
-
-/* Ignore HAVE_USLEEP under Apollo Domain because the usleep()
-   implementation in the Sys5.3 environment is broken.  */
-#ifndef apollo
-  /* Define if you have the usleep function.  */
-# define HAVE_USLEEP 1
-#endif
-
-/* Define if you have the <argz.h> header file.  */
-#define HAVE_ARGZ_H 1
-
-/* Define if you have the <fcntl.h> header file.  */
-#define HAVE_FCNTL_H 1
-
-/* Define if you have the <libintl.h> header file.  */
-/* #undef HAVE_LIBINTL_H */
-
-/* Define if you have the <libc.h> header file.  */
-/* #undef HAVE_LIBC_H */
-
-/* Define if you have the <limits.h> header file.  */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <locale.h> header file.  */
-#define HAVE_LOCALE_H 1
-
-/* Define if you have the <malloc.h> header file.  */
-#define HAVE_MALLOC_H 1
-
-/* Define if you have the <nl_types.h> header file.  */
-#define HAVE_NL_TYPES_H 1
-
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <sys/select.h> header file. */
-/* #undef HAVE_SYS_SELECT_H */
-
-/* Define if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define if you have the <sys/io.h> header file. */
-/* #undef HAVE_SYS_IO_H */
-
-/* Define if you have the <asm/io.h> header file. */
-/* #undef HAVE_ASM_IO_H */
-
-/* Define if you have the <scsi.h> header file. */
-/* #undef HAVE_SCSI_H */
-
-/* Define if you have the <scsi/sg.h> header file. */
-/* #undef HAVE_SCSI_SG_H */
-
-/* Define if you have the "/usr/src/linux/include/scsi/sg.h" header file. */
-/* #undef HAVE__USR_SRC_LINUX_INCLUDE_SCSI_SG_H */
-
-/* Define if you have the <sys/dsreq.h> header file. */
-/* #undef HAVE_SYS_DSREQ_H */
-
-/* Define if you have the <windows.h> header file.  */
-/* #undef HAVE_WINDOWS_H */
-
-/* Define if you have the <os2.h> header file.  */
-/* #undef HAVE_OS2_H */
-
-/* Define if you have sys/types.h. OS/2 wants them before select.h, etc. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
-
-/* Define if you have the <values.h> header file.  */
-#define HAVE_VALUES_H 1
-
-/* Define if you have the i library (-li).  */
-/* #undef HAVE_LIBI */
-
-/* Define if you have the intl library (-lintl).  */
-/* #undef HAVE_LIBINTL */
-
-/* Define if you have the m library (-lm).  */
-#define HAVE_LIBM 1
-
-/* Define if you have the <dlfcn.h> header file.  */
-/* #undef HAVE_DLFCN_H */
-
-/* Define if you have GIMP installed - no matter what version.  */
-#define HAVE_ANY_GIMP 1
-
-/* Define if you have GIMP-2.0 installed.  */
-#define HAVE_GIMP_2 1
-
-/* Define if you have the GIMPfeatures header file.  */
-/* #undef HAVE_LIBGIMP_GIMPFEATURES_H */
-
-/* Define if you have libjpeg.  */
-#define HAVE_LIBJPEG 1
-
-/* Define if you have libz.  */
-#define HAVE_LIBZ 1
-
-/* Define if you have libpng.  */
-#define HAVE_LIBPNG 1
-
-/* Define if you have libtiff.  */
-#define HAVE_LIBTIFF 1
-
-/* Define if you have liblcms.  */
-#define HAVE_LIBLCMS 1
-
-#ifndef HAVE_STRNCASECMP
-  /* OS/2 needs this */
-# define strncasecmp(a, b, c) strnicmp(a, b, c)
-#endif
-
-#if defined (__sun) && defined (__GNUC__)
-# define _POSIX_SOURCE
-# define __EXTENSIONS__ 1
-#endif
-
-#endif /* SANE_CONFIG_H */
diff --git a/m4/old/aclocal.m4.bak b/m4/old/aclocal.m4.bak
deleted file mode 100755
index d9d0216..0000000
--- a/m4/old/aclocal.m4.bak
+++ /dev/null
@@ -1,1086 +0,0 @@
-######################################################################
-# Configure paths for GTK+2
-# Oliver Rauch 2002-06-17
-
-dnl AM_PATH_GTK2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for GTK+-2.0.x, and define GTK_CFLAGS and GTK_LIBS
-dnl
-AC_DEFUN(AM_PATH_GTK2,
-[
-  AC_ARG_ENABLE(gtk2, [  --disable-gtk2          Do not use gtk+-2.0.x], USE_GTK2=$enableval, USE_GTK2=yes)
-
-  if test $USE_GTK2 != no ; then
-    min_gtk_version=ifelse([$1], ,2.0.0,$1)
-    if `pkg-config --atleast-pkgconfig-version=0` ; then
-      AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
-      if `pkg-config gtk+-2.0 --atleast-version=$min_gtk_version` ; then
-        GTK_CFLAGS=`pkg-config gtk+-2.0 --cflags`
-        GTK_LIBS=`pkg-config gtk+-2.0 --libs`
-        AC_MSG_RESULT(yes)
-        ifelse([$2], , :, [$2])
-      else
-        AC_MSG_RESULT(no)
-      ifelse([$3], , :, [$3])
-      fi
-    else
-    AC_MSG_WARN(***************************************************************)
-    AC_MSG_WARN(*** pgk-config is not avilable: test for gtk2 not possible ****)
-    AC_MSG_WARN(***************************************************************)
-    ifelse([$3], , :, [$3])
-    fi
-  else
-    ifelse([$3], , :, [$3])
-  fi
-
-
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-]
-)
-
-# Configure paths for GTK+
-# Owen Taylor     97-11-3
-dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
-dnl
-AC_DEFUN(AM_PATH_GTK,
-[dnl 
-dnl Get the cflags and libraries from the gtk-config script
-dnl
-  AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
-              gtk_config_prefix="$withval", gtk_config_prefix="")
-  AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
-              gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
-  AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program], , enable_gtktest=yes)
-
-  if test x$gtk_config_exec_prefix != x ; then
-     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-     fi
-  fi
-  if test x$gtk_config_prefix != x ; then
-     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-     fi
-  fi
-
-  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-  min_gtk_version=ifelse([$1], ,0.99.7,$1)
-  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
-  no_gtk=""
-  if test "$GTK_CONFIG" = "no" ; then
-    no_gtk=yes
-  else
-    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
-    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
-    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$LIBS $GTK_LIBS"
-dnl
-dnl Now check if the installed GTK is sufficiently new. (Also sanity
-dnl checks the results of gtk-config to some extent)
-dnl
-      rm -f conf.gtktest
-      AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-
-  system ("touch conf.gtktest");
-
-  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If gtk-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
-      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    } 
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
-        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$GTK_CONFIG" = "no" ; then
-       echo "*** The gtk-config script installed by GTK could not be found"
-       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the GTK_CONFIG environment variable to the"
-       echo "*** full path to gtk-config."
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK test program, checking why..."
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK or finding the wrong"
-          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
-          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-  rm -f conf.gtktest
-])
-
-
-######################################################################
-# Configure paths for The GIMP 
-# Oliver Rauch 2000-12-28
-
-dnl AM_PATH_GIMP([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for GIMP, and define GIMP_CFLAGS and GIMP_LIBS
-dnl
-AC_DEFUN(AM_PATH_GIMP,
-[dnl 
-dnl Get the cflags and libraries from the gimp-config script
-dnl
-  AC_ARG_WITH(gimp-prefix,[  --with-gimp-prefix=PFX   Prefix where GIMP is installed (optional)],
-              gimp_config_prefix="$withval", gimp_config_prefix="")
-  AC_ARG_WITH(gimp-exec-prefix,[  --with-gimp-exec-prefix=PFX Exec prefix where GIMP is installed (optional)],
-              gimp_config_exec_prefix="$withval", gimp_config_exec_prefix="")
-  AC_ARG_ENABLE(gimptest, [  --disable-gimptest      Do not try to compile and run a test GIMP program], , enable_gimptest=yes)
-
-  ac_save_CFLAGS="$CFLAGS"
-  ac_save_LIBS="$LIBS"
-  ac_save_GTK_CFLAGS="$GTK_CFLAGS"
-  ac_save_GTK_LIBS="$GTK_LIBS"
-
-  if test x$gimp_config_exec_prefix != x ; then
-     gimp_config_args="$gimp_config_args --exec-prefix=$gimp_config_exec_prefix"
-     if test x${GIMP_CONFIG+set} != xset ; then
-        GIMP_CONFIG=$gimp_config_exec_prefix/bin/gimp-config
-     fi
-  fi
-
-  if test x$gimp_config_prefix != x ; then
-     gimp_config_args="$gimp_config_args --prefix=$gimp_config_prefix"
-     if test x${GIMP_CONFIG+set} != xset ; then
-        GIMP_CONFIG=$gimp_config_prefix/bin/gimp-config
-     fi
-  fi
-
-  AC_PATH_PROG(GIMP_CONFIG, gimp-config, no)
-  if test "$GIMP_CONFIG" = "no" ; then
-    if test x$gimp_config_exec_prefix != x ; then
-       gimp_config_args="$gimp_config_args --exec-prefix=$gimp_config_exec_prefix"
-       if test x${GIMP_TOOL+set} != xset ; then
-          GIMP_TOOL=$gimp_config_exec_prefix/bin/gimptool
-       fi
-    fi
-    if test x$gimp_config_prefix != x ; then
-       gimp_config_args="$gimp_config_args --prefix=$gimp_config_prefix"
-       if test x${GIMP_TOOL+set} != xset ; then
-          GIMP_TOOL=$gimp_config_prefix/bin/gimptool
-       fi
-    fi
-    AC_PATH_PROG(GIMP_TOOL, gimptool, no)
-    GIMP_CONFIG=$GIMP_TOOL
-  fi
-
-  min_gimp_version=ifelse([$1], ,1.0.0,$1)
-  no_gimp=""
-
-  if test "$GIMP_CONFIG" = "no" ; then
-dnl we do not have gimp-config (gimp-1.0.x does not have gimp-config)
-dnl so we have to use the GTK_* things for testing for gimp.h and gimpfeatures.h
-    ac_save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="${CPPFLAGS} ${GTK_CFLAGS}"
-    AC_CHECK_HEADERS(libgimp/gimp.h, GIMP_LIBS="-lgimp", no_gimp=yes)
-    AC_CHECK_HEADERS(libgimp/gimpfeatures.h)
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    CFLAGS="${CFLAGS} ${GTK_CFLAGS}"
-    LIBS="${LIBS} ${GTK_LIBS} ${GIMP_LIBS}"
-    if test "x$no_gimp" = x ; then
-      AC_MSG_CHECKING(GIMP compilation)
-      gimp_config_major_version=-1
-      gimp_config_minor_version=0
-      gimp_config_micro_version=0
-    fi
-  else
-dnl Ok, we have gimp-config and so we do not need the GTK_* things because they are
-dnl included in the output of gimp-config
-    GTK_CFLAGS=""
-    GTK_LIBS=""
-    GIMP_CFLAGS=`$GIMP_CONFIG $gimp_config_args --cflags`
-    GIMP_LIBS=`$GIMP_CONFIG $gimp_config_args --libs`" -lgimp"
-    gimp_config_major_version=`$GIMP_CONFIG $gimp_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gimp_config_minor_version=`$GIMP_CONFIG $gimp_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gimp_config_micro_version=`$GIMP_CONFIG $gimp_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-      CFLAGS="${CFLAGS} ${GIMP_CFLAGS}"
-      LIBS="${LIBS} ${GIMP_LIBS}"
-      AC_MSG_CHECKING(for GIMP - version >= $min_gimp_version)
-  fi
-
-dnl
-dnl Now check if the installed GIMP is sufficiently new. (Also sanity
-dnl checks the results of gimp-config to some extent
-dnl
-  if test "x$no_gimp" = x ; then
-    if test "x$enable_gimptest" = "xyes" ; then
-      rm -f conf.gimptest
-      AC_TRY_RUN([
-#include <libgimp/gimp.h>
-#include <stdio.h>
-
-#define GIMP_TEST_CHECK_VERSION(major, minor, micro) \
-    ($gimp_config_major_version > (major) || \
-     ($gimp_config_major_version == (major) && $gimp_config_minor_version > (minor)) || \
-     ($gimp_config_major_version == (major) && $gimp_config_minor_version == (minor) && \
-      $gimp_config_micro_version >= (micro)))                                
-
-#if !GIMP_TEST_CHECK_VERSION(1,1,25)
-#  define GimpPlugInInfo GPlugInInfo /* do test with gimp interface version 1.0 */
-#endif
-
-GimpPlugInInfo PLUG_IN_INFO =
-{
-  NULL, NULL, NULL, NULL
-};
-
-
-int 
-main ()
-{
-  int major, minor, micro;
-
-  system ("touch conf.gimptest");
-
-  if (sscanf("$min_gimp_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gimp_version");
-     exit(1);
-   }
-
-  if ( ($gimp_config_major_version != -1) &&
-       ((gimp_major_version != $gimp_config_major_version) ||
-       (gimp_minor_version != $gimp_config_minor_version) ||
-       (gimp_micro_version != $gimp_config_micro_version)) )
-  {
-      printf("\n*** 'gimp-config --version' returned %d.%d.%d, but GIMP (%d.%d.%d)\n", 
-             $gimp_config_major_version, $gimp_config_minor_version, $gimp_config_micro_version,
-             gimp_major_version, gimp_minor_version, gimp_micro_version);
-      printf ("*** was found! If gimp-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GIMP. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If gimp-config was wrong, set the environment variable GIMP_CONFIG\n");
-      printf("*** to point to the correct copy of gimp-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-  } 
-  else
-  {
-      if ((gimp_major_version > major) ||
-        ((gimp_major_version == major) && (gimp_minor_version > minor)) ||
-        ((gimp_major_version == major) && (gimp_minor_version == minor) && (gimp_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GIMP (%d.%d.%d) was found.\n",
-               gimp_major_version, gimp_minor_version, gimp_micro_version);
-        printf("*** You need a version of GIMP newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GIMP is always available from ftp://ftp.gimp.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the gimp-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GIMP, but you can also set the GIMP_CONFIG environment to point to the\n");
-        printf("*** correct copy of gimp-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-  }
-  return 1;
-}
-], , no_gimp=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-     fi
-  fi
-
-  if test "x$no_gimp" = x ; then
-dnl gimp test succeeded or not tested
-     if test "x$enable_gimptest" = "xyes" ; then
-       AC_MSG_RESULT(yes)
-     else
-       AC_MSG_RESULT(not tested)
-     fi
-     if test "$GIMP_CONFIG" != "no" ; then
-       ac_save_CPPFLAGS="$CPPFLAGS"
-       CPPFLAGS="${CPPFLAGS} ${GIMP_CFLAGS}"
-       AC_CHECK_HEADERS(libgimp/gimp.h)
-       AC_CHECK_HEADERS(libgimp/gimpfeatures.h)
-       CPPFLAGS="$ac_save_CPPFLAGS"
-     fi
-     CFLAGS="$ac_save_CFLAGS"
-     LIBS="$ac_save_LIBS"
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-       if test -f conf.gimptest ; then
-        :
-       else
-        echo "*** Could not run GIMP test program, checking why..."
-        CFLAGS="$CFLAGS $GIMP_CFLAGS"
-        LIBS="$LIBS $GIMP_LIBS"
-        AC_TRY_LINK([
-#include <libgimp/gimp.h>
-#include <stdio.h>
-#define GIMP_TEST_CHECK_VERSION(major, minor, micro) \
-    ($gimp_config_major_version > (major) || \
-     ($gimp_config_major_version == (major) && $gimp_config_minor_version > (minor)) || \
-     ($gimp_config_major_version == (major) && $gimp_config_minor_version == (minor) && \
-      $gimp_config_micro_version >= (micro)))                                
-
-#if !GIMP_TEST_CHECK_VERSION(1,1,25)
-#  define GimpPlugInInfo GPlugInInfo /* do test with gimp interface version 1.0 */
-#endif
-GimpPlugInInfo PLUG_IN_INFO = { NULL, NULL, NULL, NULL };
-],    [ return ((gimp_major_version) || (gimp_minor_version) || (gimp_micro_version)); ],
-      [ echo "*** The test program compiled, but did not run. This usually means"
-        echo "*** that the run-time linker is not finding GIMP or finding the wrong"
-        echo "*** version of GIMP. If it is not finding GIMP, you'll need to set your"
-        echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-        echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-        echo "*** is required on your system"
-        echo "***"
-        echo "*** If you have an old version installed, it is best to remove it, although"
-        echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-        echo "***"
-        echo "***" ])
-        CFLAGS="$ac_save_CFLAGS"
-        LIBS="$ac_save_LIBS"
-     fi
-dnl ok, gimp does not work, so we have to use the gtk_* things again
-     GIMP_CFLAGS=""
-     GIMP_LIBS=""
-     GTK_CFLAGS="$ac_save_GTK_CFLAGS"
-     GTK_LIBS="$ac_save_GTK_LIBS"
-     CFLAGS="${CFLAGS} ${GTK_CFLAGS}"
-     LIBS="${LIBS} ${GTK_LIBS} ${GIMP_LIBS}"
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GIMP_CFLAGS)
-  AC_SUBST(GIMP_LIBS)
-  rm -f conf.gimptest
-])
-
-
-# ********************************************************************
-# Configure paths for SANE 
-# Oliver Rauch 2000-10-30
-
-dnl AM_PATH_SANE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for SANE, and define SANE_CFLAGS and SANE_LIBS
-dnl
-AC_DEFUN(AM_PATH_SANE,
-[dnl 
-dnl Get the cflags and libraries from the sane-config script
-dnl
-  AC_ARG_ENABLE(sanetest, [  --disable-sanetest      Do not try to compile and run a test SANE program], , enable_sanetest=yes)
-
-  AC_PATH_PROG(SANE_CONFIG, sane-config, no)
-  min_sane_version=ifelse([$1], ,1.0.0,$1)
-  AC_MSG_CHECKING(for SANE - version >= $min_sane_version)
-  no_sane=""
-  if test "$SANE_CONFIG" = "no" ; then
-    no_sane=yes
-  else
-    SANE_CFLAGS=`$SANE_CONFIG $sane_config_args --cflags`
-    SANE_LDFLAGS=`$SANE_CONFIG $sane_config_args --ldflags`
-#    SANE_LIBS=`$SANE_CONFIG $sane_config_args --libs`
-    SANE_LIBS=`$SANE_CONFIG $sane_config_args --libs | sed -e 's/-lintl//g'`
-    SANE_PREFIX=`$SANE_CONFIG $sane_config_args --prefix`
-    sane_config_major_version=`$SANE_CONFIG $sane_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    sane_config_minor_version=`$SANE_CONFIG $sane_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    sane_config_micro_version=`$SANE_CONFIG $sane_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_sanetest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LDFLAGS="$LDFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $SANE_CFLAGS"
-      LDFLAGS="$LDFLAGS $SANE_LDFLAGS"
-      LIBS="$LIBS $SANE_LIBS"
-dnl
-dnl Now check if the installed SANE is sufficiently new. (Also sanity
-dnl checks the results of sane-config to some extent
-dnl
-      rm -f conf.sanetest
-      AC_TRY_RUN([
-#include <sane/sane.h>
-#include <stdio.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-
-  system ("touch conf.sanetest");
-
-  if (sscanf("$min_sane_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_sane_version");
-     exit(1);
-   }
-
-   if ( ($sane_config_major_version == major) &&
-        ( ($sane_config_minor_version > minor) ||
-          ( ($sane_config_minor_version == minor) && ($sane_config_micro_version >= micro))))
-   {
-     return 0;
-   }
-   else if ($sane_config_major_version > major)
-   {
-     printf("\n*** A too new version of SANE (%d.%d.%d) was found.\n",
-            $sane_config_major_version, $sane_config_minor_version, $sane_config_micro_version);
-     printf("*** You need a version of SANE with the major version number %d.\n", major);
-   }
-   else
-   {
-     printf("\n*** An old version of SANE (%d.%d.%d) was found.\n",
-            $sane_config_major_version, $sane_config_minor_version, $sane_config_micro_version);
-     printf("*** You need a version of SANE newer than %d.%d.%d. The latest version of\n",
-            major, minor, micro);
-   }
-
-   printf("*** SANE is always available from ftp://ftp.mostang.com\n");
-   printf("***\n");
-   printf("*** If you have already installed a sufficient version, this error\n");
-   printf("*** probably means that the wrong copy of the sane-config shell script is\n");
-   printf("*** being found. The easiest way to fix this is to remove the old version\n");
-   printf("*** of SANE, but you can also set the SANE_CONFIG environment to point to the\n");
-   printf("*** correct copy of sane-config. (In this case, you will have to\n");
-   printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-   printf("*** so that the correct libraries are found at run-time))\n");
-
-  return 1;
-}
-],, no_sane=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LDFLAGS="$ac_save_LDFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_sane" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$SANE_CONFIG" = "no" ; then
-       echo "*** The sane-config script installed by SANE could not be found"
-       echo "*** If SANE was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the SANE_CONFIG environment variable to the"
-       echo "*** full path to sane-config."
-     else
-       if test -f conf.sanetest ; then
-        :
-       else
-          echo "*** Could not run SANE test program, checking why..."
-          CFLAGS="$CFLAGS $SANE_CFLAGS"
-          LIBS="$LIBS $SANE_LIBS"
-          LDFLAGS="$LDFLAGS $SANE_LDFLAGS"
-          AC_TRY_LINK([
-#include <sane/sane.h>
-#include <stdio.h>
-],      [ return (SANE_CURRENT_MAJOR); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding SANE or finding the wrong"
-          echo "*** version of SANE. If it is not finding SANE, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***" ]
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means SANE was incorrectly installed"
-          echo "*** or that you have moved SANE since it was installed. In the latter case, you"
-          echo "*** may want to edit the sane-config script: $SANE_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LDFLAGS="$ac_save_LDFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     SANE_CFLAGS=""
-     SANE_LDFLAGS=""
-     SANE_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(SANE_LDFLAGS)
-  AC_SUBST(SANE_CFLAGS)
-  AC_SUBST(SANE_LIBS)
-  AC_SUBST(SANE_PREFIX)
-  rm -f conf.sanetest
-])
-
-# ********************************************************************
-
-
-dnl AM_FUNC_ALLOCA
-AC_DEFUN(AM_FUNC_ALLOCA,
-[AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-test $ac_cv_func_alloca_works = no && LTALLOCA=alloca.lo
-AC_SUBST(LTALLOCA)dnl
-])
-
-# @defmac AC_PROG_CC_STDC
-# @maindex PROG_CC_STDC
-# @ovindex CC
-# If the C compiler in not in ANSI C mode by default, try to add an option
-# to output variable @code{CC} to make it so.  This macro tries various
-# options that select ANSI C on some system or another.  It considers the
-# compiler to be in ANSI C mode if it handles function prototypes correctly.
-#
-# If you use this macro, you should check after calling it whether the C
-# compiler has been set to accept ANSI C; if not, the shell variable
-# @code{am_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
-# code in ANSI C, you can make an un-ANSIfied copy of it by using the
-# program @code{ansi2knr}, which comes with Ghostscript.
-# @end defmac
-
-AC_DEFUN(AM_PROG_CC_STDC,
-[AC_REQUIRE([AC_PROG_CC])
-AC_BEFORE([$0], [AC_C_INLINE])
-AC_BEFORE([$0], [AC_C_CONST])
-dnl Force this before AC_PROG_CPP.  Some cpp's, eg on HPUX, require
-dnl a magic option to avoid problems with ANSI preprocessor commands
-dnl like #elif.
-dnl FIXME: can't do this because then AC_AIX won't work due to a
-dnl circular dependency.
-dnl AC_BEFORE([$0], [AC_PROG_CPP])
-AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
-AC_CACHE_VAL(am_cv_prog_cc_stdc,
-[am_cv_prog_cc_stdc=no
-ac_save_CC="$CC"
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX                   -qlanglvl=ansi                                          # Ultrix and OSF/1      -std1
-# HP-UX                 -Aa -D_HPUX_SOURCE
-# SVR4                  -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__
-"
-do
-  CC="$ac_save_CC $ac_arg"
-  AC_TRY_COMPILE(
-[#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}                                                                               int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int,
- int);
-int argc;
-char **argv;
-], [
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-],
-[am_cv_prog_cc_stdc="$ac_arg"; break])
-done
-CC="$ac_save_CC"
-])
-if test -z "$am_cv_prog_cc_stdc"; then
-  AC_MSG_RESULT([none needed])
-else
-  AC_MSG_RESULT($am_cv_prog_cc_stdc)
-fi
-case "x$am_cv_prog_cc_stdc" in
-  x|xno) ;;
-  *) CC="$CC $am_cv_prog_cc_stdc" ;;
-esac
-])
-
-
-
- 
-# ********************************************************************
-dnl aclocal.m4 generated automatically by aclocal 1.2f
-
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-
-# progtest.m4 from gettext 0.32
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 1
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# ********************************************************************
-# lcmessage.m4 from gettext 0.32
-# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 1
-
-AC_DEFUN(AM_LC_MESSAGES,
-  [if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES)
-    fi
-  fi])
-
-
-# ********************************************************************
-# gettext.m4 from gettext 0.32
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 3
-
-AC_DEFUN(AM_WITH_NLS,
-  [AC_MSG_CHECKING([whether NLS is requested])
-    dnl Default is enabled NLS
-    AC_ARG_ENABLE(nls,
-      [  --disable-nls           do not use Native Language Support],
-      USE_NLS=$enableval, USE_NLS=yes)
-    AC_MSG_RESULT($USE_NLS)
-    AC_SUBST(USE_NLS)
-
-    USE_INCLUDED_LIBINTL=no
-
-    dnl If we use NLS figure out what method
-    if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS)
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH(included-gettext,
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If gettext or catgets are available (in this order) we
-        dnl use this.  Else we have to fall back to GNU NLS library.
-	dnl catgets is only used if permitted by option --with-catgets.
-	nls_cv_header_intl=
-	nls_cv_header_libgt=
-	CATOBJEXT=NONE
-
-	AC_CHECK_HEADER(libintl.h,
-	  [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
-	    [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
-	       gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
-
-	   if test "$gt_cv_func_gettext_libc" != "yes"; then
-	     AC_CHECK_LIB(intl, bindtextdomain,
-	       [AC_CACHE_CHECK([for gettext in libintl],
-		 gt_cv_func_gettext_libintl,
-		 [AC_TRY_LINK([], [return (int) gettext ("")],
-		 gt_cv_func_gettext_libintl=yes,
-		 gt_cv_func_gettext_libintl=no)])])
-	   fi
-
-	   if test "$gt_cv_func_gettext_libintl" = "yes"; then
-	    LIBS="-lintl $LIBS"
-	   fi
-
-	   if test "$gt_cv_func_gettext_libc" = "yes" \
-	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
-	      AC_DEFINE(HAVE_GETTEXT)
-	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	      if test "$MSGFMT" != "no"; then
-		AC_CHECK_FUNCS(dcgettext)
-		AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-		AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-		  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-		AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			       return _nl_msg_cat_cntr],
-		  [CATOBJEXT=.gmo
-		   DATADIRNAME=share],
-		  [CATOBJEXT=.mo
-		   DATADIRNAME=lib])
-		INSTOBJEXT=.mo
-	      fi
-	    fi
-	])
-
-        if test "$CATOBJEXT" = "NONE"; then
-	  AC_MSG_CHECKING([whether catgets can be used])
-	  AC_ARG_WITH(catgets,
-	    [  --with-catgets          use catgets functions if available],
-	    nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
-	  AC_MSG_RESULT($nls_cv_use_catgets)
-
-	  if test "$nls_cv_use_catgets" = "yes"; then
-	    dnl No gettext in C library.  Try catgets next.
-	    AC_CHECK_LIB(i, main)
-	    AC_CHECK_FUNC(catgets,
-	      [AC_DEFINE(HAVE_CATGETS)
-	       INTLOBJS="\$(CATOBJS)"
-	       AC_PATH_PROG(GENCAT, gencat, no)dnl
-	       if test "$GENCAT" != "no"; then
-		 AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
-		 if test "$GMSGFMT" = "no"; then
-		   AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
-		    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
-		 fi
-		 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-		   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-		 USE_INCLUDED_LIBINTL=yes
-		 CATOBJEXT=.cat
-		 INSTOBJEXT=.cat
-		 DATADIRNAME=lib
-		 INTLDEPS='$(top_builddir)/intl/libintl.a'
-		 INTLLIBS=$INTLDEPS
-		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-		 nls_cv_header_intl=intl/libintl.h
-		 nls_cv_header_libgt=intl/libgettext.h
-	       fi])
-	  fi
-        fi
-
-        if test "$CATOBJEXT" = "NONE"; then
-	  dnl Neither gettext nor catgets in included in the C library.
-	  dnl Fall back on GNU gettext library.
-	  nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        INTLOBJS="\$(GETTOBJS)"
-        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
-        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-        AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-        AC_SUBST(MSGFMT)
-	USE_INCLUDED_LIBINTL=yes
-        CATOBJEXT=.gmo
-        INSTOBJEXT=.mo
-        DATADIRNAME=share
-	INTLDEPS='$(top_builddir)/intl/libintl.a'
-	INTLLIBS=$INTLDEPS
-	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-        nls_cv_header_intl=intl/libintl.h
-        nls_cv_header_libgt=intl/libgettext.h
-      fi
-
-      dnl Test whether we really found GNU xgettext.
-      if test "$XGETTEXT" != ":"; then
-	dnl If it is no GNU xgettext we define it as : so that the
-	dnl Makefiles still can work.
-	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-	  : ;
-	else
-	  AC_MSG_RESULT(
-	    [found xgettext programs is not GNU xgettext; ignore it])
-	  XGETTEXT=":"
-	fi
-      fi
-
-      # We need to process the po/ directory.
-      POSUB=po
-    else
-      DATADIRNAME=share
-      nls_cv_header_intl=intl/libintl.h
-      nls_cv_header_libgt=intl/libgettext.h
-    fi
-
-    # If this is used in GNU gettext we have to set USE_NLS to `yes'
-    # because some of the sources are only built for this goal.
-    if test "$PACKAGE" = gettext; then
-      USE_NLS=yes
-      USE_INCLUDED_LIBINTL=yes
-    fi
-
-    dnl These rules are solely for the distribution goal.  While doing this
-    dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.in.
-    for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(USE_INCLUDED_LIBINTL)
-    AC_SUBST(CATALOGS)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(DATADIRNAME)
-    AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLDEPS)
-    AC_SUBST(INTLLIBS)
-    AC_SUBST(INTLOBJS)
-    AC_SUBST(POFILES)
-    AC_SUBST(POSUB)
-  ])
-
-AC_DEFUN(AM_GNU_GETTEXT,
-  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-   AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_PROG_RANLIB])dnl
-   AC_REQUIRE([AC_ISC_POSIX])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   AC_REQUIRE([AC_C_CONST])dnl
-   AC_REQUIRE([AC_C_INLINE])dnl
-   AC_REQUIRE([AC_TYPE_OFF_T])dnl
-   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-   AC_REQUIRE([AC_FUNC_MMAP])dnl
-
-   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h values.h sys/param.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next])
-
-   if test "${ac_cv_func_stpcpy+set}" != "set"; then
-     AC_CHECK_FUNCS(stpcpy)
-   fi
-   if test "${ac_cv_func_stpcpy}" = "yes"; then
-     AC_DEFINE(HAVE_STPCPY)
-   fi
-
-   AM_LC_MESSAGES
-   AM_WITH_NLS
-
-   if test "x$CATOBJEXT" != "x"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-   dnl The reference to <locale.h> in the installed <libintl.h> file
-   dnl must be resolved because we cannot expect the users of this
-   dnl to define HAVE_LOCALE_H.
-   if test $ac_cv_header_locale_h = yes; then
-     INCLUDE_LOCALE_H="#include <locale.h>"
-   else
-     INCLUDE_LOCALE_H="\
-/* The system does not provide the header <locale.h>.  Take care yourself.  */"
-   fi
-   AC_SUBST(INCLUDE_LOCALE_H)
-
-   dnl Determine which catalog format we have (if any is needed)
-   dnl For now we know about two different formats:
-   dnl   Linux libc-5 and the normal X/Open format
-   test -d intl || mkdir intl
-   if test "$CATOBJEXT" = ".cat"; then
-     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
-
-     dnl Transform the SED scripts while copying because some dumb SEDs
-     dnl cannot handle comments.
-     sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
-   fi
-   dnl po2tbl.sed is always needed.
-   sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
-
-   dnl In the intl/Makefile.in we have a special dependency which makes
-   dnl only sense for gettext.  We comment this out for non-gettext
-   dnl packages.
-   if test "$PACKAGE" = "gettext"; then
-     GT_NO="#NO#"
-     GT_YES=
-   else
-     GT_NO=
-     GT_YES="#YES#"
-   fi
-   AC_SUBST(GT_NO)
-   AC_SUBST(GT_YES)
-
-   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-   dnl Try to locate is.
-   MKINSTALLDIRS=
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
-   AC_SUBST(MKINSTALLDIRS)
-
-   dnl *** For now the libtool support in intl/Makefile is not for real.
-   l=
-   AC_SUBST(l)
-  ])
-
diff --git a/po/ca.gmo b/po/ca.gmo
deleted file mode 100644
index c3f335d..0000000
--- a/po/ca.gmo
+++ /dev/null
diff --git a/po/cs.gmo b/po/cs.gmo
deleted file mode 100644
index 4422f03..0000000
--- a/po/cs.gmo
+++ /dev/null
diff --git a/po/da.gmo b/po/da.gmo
deleted file mode 100644
index e3d1edd..0000000
--- a/po/da.gmo
+++ /dev/null
diff --git a/po/de.gmo b/po/de.gmo
deleted file mode 100644
index 37bdc7b..0000000
--- a/po/de.gmo
+++ /dev/null
diff --git a/po/es.gmo b/po/es.gmo
deleted file mode 100644
index aaa4c19..0000000
--- a/po/es.gmo
+++ /dev/null
diff --git a/po/fi.gmo b/po/fi.gmo
deleted file mode 100644
index 539363d..0000000
--- a/po/fi.gmo
+++ /dev/null
diff --git a/po/fr.gmo b/po/fr.gmo
deleted file mode 100644
index d61912d..0000000
--- a/po/fr.gmo
+++ /dev/null
diff --git a/po/hu.gmo b/po/hu.gmo
deleted file mode 100644
index 6a726ac..0000000
--- a/po/hu.gmo
+++ /dev/null
diff --git a/po/it.gmo b/po/it.gmo
deleted file mode 100644
index b95c739..0000000
--- a/po/it.gmo
+++ /dev/null
diff --git a/po/ja.gmo b/po/ja.gmo
deleted file mode 100644
index 7989931..0000000
--- a/po/ja.gmo
+++ /dev/null
diff --git a/po/nl.gmo b/po/nl.gmo
deleted file mode 100644
index 771dcf8..0000000
--- a/po/nl.gmo
+++ /dev/null
diff --git a/po/pa.gmo b/po/pa.gmo
deleted file mode 100644
index 6c15812..0000000
--- a/po/pa.gmo
+++ /dev/null
diff --git a/po/pl.gmo b/po/pl.gmo
deleted file mode 100644
index 6a5d498..0000000
--- a/po/pl.gmo
+++ /dev/null
diff --git a/po/pt.gmo b/po/pt.gmo
deleted file mode 100644
index 1937146..0000000
--- a/po/pt.gmo
+++ /dev/null
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
deleted file mode 100644
index 2d06b2e..0000000
--- a/po/pt_BR.gmo
+++ /dev/null
diff --git a/po/ro.gmo b/po/ro.gmo
deleted file mode 100644
index ddf371d..0000000
--- a/po/ro.gmo
+++ /dev/null
diff --git a/po/ru.gmo b/po/ru.gmo
deleted file mode 100644
index f99aeb1..0000000
--- a/po/ru.gmo
+++ /dev/null
diff --git a/po/sk.gmo b/po/sk.gmo
deleted file mode 100644
index ad752c4..0000000
--- a/po/sk.gmo
+++ /dev/null
diff --git a/po/sl.gmo b/po/sl.gmo
deleted file mode 100644
index 7b92862..0000000
--- a/po/sl.gmo
+++ /dev/null
diff --git a/po/sr.gmo b/po/sr.gmo
deleted file mode 100644
index 1d33769..0000000
--- a/po/sr.gmo
+++ /dev/null
diff --git a/po/sv.gmo b/po/sv.gmo
deleted file mode 100644
index 500dc3a..0000000
--- a/po/sv.gmo
+++ /dev/null
diff --git a/po/tr.gmo b/po/tr.gmo
deleted file mode 100644
index e203ed2..0000000
--- a/po/tr.gmo
+++ /dev/null
diff --git a/po/vi.gmo b/po/vi.gmo
deleted file mode 100644
index 7761831..0000000
--- a/po/vi.gmo
+++ /dev/null
diff --git a/po/zh.gmo b/po/zh.gmo
deleted file mode 100644
index 54c873e..0000000
--- a/po/zh.gmo
+++ /dev/null
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
deleted file mode 100644
index 633a47b..0000000
--- a/po/zh_CN.gmo
+++ /dev/null
diff --git a/src/Makefile.in.orig b/src/Makefile.in.orig
deleted file mode 100644
index a0b0244..0000000
--- a/src/Makefile.in.orig
+++ /dev/null
@@ -1,247 +0,0 @@
-SHELL = /bin/sh
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-
-sane_prefix = @SANE_PREFIX@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-configdir = ${sysconfdir}/sane.d
-sanedatadir = ${datadir}/sane
-xsanedocdir = ${datadir}/sane/xsane/doc
-
-MKINSTALLDIRS = @MKINSTALLDIRS@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-CC = @CC@
-INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include @INCLUDES@
-DEFS = @DEFS@ -DLOCALEDIR=$(datadir)/locale -DSANELOCALEDIR=$(sane_prefix)/share/locale
-CPPFLAGS = @CPPFLAGS@ -DPATH_XSANE_DOC_DIR=$(xsanedocdir) -DPATH_SANE_DATA_DIR=$(sanedatadir)
-CFLAGS   = @CFLAGS@ @SANE_CFLAGS@ @GIMP_CFLAGS@ @GTK_CFLAGS@
-LDFLAGS  = @LDFLAGS@ @SANE_LDFLAGS@
-LIBS     = @SANE_LIBS@ @GIMP_LIBS@ @GTK_LIBS@ @INTLLIBS@ @LIBS@
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LINK = $(CC) $(LDFLAGS) -o $@
-
-BINPROGS = @BINPROGS@
-
-@SET_MAKE@
-
-PROGRAMS = $(BINPROGS)
-LIBLIB = ../lib/liblib.a
-
-XSANE_OBJS = xsane-back-gtk.o xsane-front-gtk.o xsane-gamma.o \
-             xsane-preview.o xsane-viewer.o \
-             xsane-fax-project.o \
-             xsane-email-project.o \
-             xsane-multipage-project.o \
-             xsane-rc-io.o xsane-device-preferences.o xsane-batch-scan.o \
-             xsane-preferences.o xsane-setup.o xsane-save.o xsane-scan.o \
-             xsane-icons.o xsane.o @XSANE_ICON@
-
-
-.c.o:
-	$(COMPILE) $<
-
-all: $(PROGRAMS)
-
-install: $(PROGRAMS)
-	$(MKINSTALLDIRS) $(bindir) $(sbindir) $(datadir) $(sanedatadir) $(xsanedocdir) $(sanedatadir)/xsane
-	@for program in $(BINPROGS); do \
-	  $(INSTALL_PROGRAM) $${program} $(bindir)/$${program}; \
-	done
-	$(INSTALL_DATA) $(srcdir)/xsane-style.rc $(sanedatadir)/xsane/xsane-style.rc
-	$(INSTALL_DATA) $(srcdir)/xsane-startimage.pnm $(sanedatadir)/xsane/xsane-startimage.pnm
-	$(INSTALL_DATA) $(srcdir)/xsane-calibration.pnm $(sanedatadir)/xsane/xsane-calibration.pnm
-	$(INSTALL_DATA) $(srcdir)/xsane-logo.xpm $(sanedatadir)/xsane/xsane-logo.xpm
-	$(INSTALL_DATA) $(srcdir)/xsane-gpl.txt $(sanedatadir)/xsane/xsane-gpl.txt
-	$(INSTALL_DATA) $(srcdir)/xsane-eula.txt $(sanedatadir)/xsane/xsane-eula.txt
-	@for logo in *-logo.xpm; do \
-	  echo installing $(sanedatadir)/xsane/$${logo}; \
-	  $(INSTALL_DATA) $(srcdir)/$${logo} $(sanedatadir)/xsane/$${logo}; \
-	done 
-
-uninstall:
-	@for program in $(BINPROGS); do \
-	  echo uninstalling $(bindir)/$${program}...; \
-	  rm -f $(bindir)/$${program}; \
-	done
-	echo uninstalling $(sanedatadir)/xsane/xsane-style.rc...
-	rm -f $(sanedatadir)/xsane/xsane-style.rc
-	echo uninstalling $(sanedatadir)/xsane/xsane-startimage.pnm...
-	rm -f $(sanedatadir)/xsane/xsane-startimage.pnm
-	echo uninstalling $(sanedatadir)/xsane/xsane-calibration.pnm...
-	rm -f $(sanedatadir)/xsane/xsane-calibration.pnm
-	echo uninstalling $(sanedatadir)/xsane/xsane-logo.xpm...
-	rm -f $(sanedatadir)/xsane/xsane-logo.xpm
-	@for logo in *-logo.xpm; do \
-	  echo uninstalling $(sanedatadir)/xsane/$${logo}; \
-	  rm -f $(sanedatadir)/xsane/$${logo}; \
-	done 
-
-xsane: $(XSANE_OBJS) $(LIBLIB)
-	$(LINK) $(XSANE_OBJS) \
-	        $(LIBLIB) $(LIBS) $(SANE_LIBS)
-
-xsane-icon.opc: xsane-icon.rc xsane.ico
-	windres -i xsane-icon.rc -o xsane-icon.opc
-
-clean:
-	rm -f *.o *~ .*~ *.bak
-	rm -rf .libs
-
-distclean: clean
-	rm -f Makefile $(PROGRAMS)
-
-depend:
-	makedepend $(INCLUDES) *.c
-
-.PHONY: all install depend clean distclean
-
-xsane.o: xsane.h
-xsane.o: xsane-back-gtk.h
-xsane.o: xsane-front-gtk.h
-xsane.o: xsane-preview.h
-xsane.o: xsane-save.h
-xsane.o: xsane-gamma.h
-xsane.o: xsane-setup.h
-xsane.o: xsane-scan.h
-xsane.o: xsane-rc-io.h
-xsane.o: xsane-device-preferences.h
-xsane.o: xsane-preferences.h
-xsane.o: xsane-icons.h
-xsane.o: xsane-batch-scan.h
-xsane.o: xsane-multipage-project.h
-xsane.o: xsane-fax-project.h
-xsane.o: xsane-email-project.h
-xsane.o: xsane-text.h
-
-xsane-back-gtk.o: xsane.h
-xsane-back-gtk.o: xsane-back-gtk.h
-xsane-back-gtk.o: xsane-front-gtk.h
-xsane-back-gtk.o: xsane-preferences.h
-xsane-back-gtk.o: xsane-gamma.h
-
-xsane-front-gtk.o: xsane.h
-xsane-front-gtk.o: xsane-back-gtk.h
-xsane-front-gtk.o: xsane-preferences.h
-xsane-front-gtk.o: xsane-preview.h
-xsane-front-gtk.o: xsane-save.h
-xsane-front-gtk.o: xsane-gamma.h
-xsane-front-gtk.o: xsane-setup.h
-
-xsane-batch-scan.o: xsane.h
-xsane-batch-scan.o: xsane-scan.h
-xsane-batch-scan.o: xsane-batch-scan.h
-xsane-batch-scan.o: xsane-back-gtk.h
-xsane-batch-scan.o: xsane-front-gtk.h
-xsane-batch-scan.o: xsane-rc-io.h
-xsane-batch-scan.o: xsane-preview.h
-xsane-batch-scan.o: xsane-gamma.h
-xsane-batch-scan.o: xsane-text.h
-
-xsane-preview.o: xsane.h
-xsane-preview.o: xsane-back-gtk.h
-xsane-preview.o: xsane-front-gtk.h
-xsane-preview.o: xsane-batch-scan.h
-xsane-preview.o: xsane-preview.h
-xsane-preview.o: xsane-preferences.h
-xsane-preview.o: xsane-gamma.h
-xsane-preview.o: xsane-text.h
-
-xsane-preferecnes.o: xsane.h
-xsane-preferecnes.o: xsane-preferences.h
-xsane-preferecnes.o: xsane-rc-io.h
-
-xsane-device-preferences.o: xsane.h
-xsane-device-preferences.o: xsane-rc-io.h
-xsane-device-preferences.o: xsane-back-gtk.h
-xsane-device-preferences.o: xsane-front-gtk.h
-xsane-device-preferences.o: xsane-gamma.h
-
-xsane-rc-io.o: xsane.h
-xsane-rc-io.o: xsane-rc-io.h
-
-xsane-save.o: xsane.h
-xsane-save.o: xsane-back-gtk.h
-xsane-save.o: xsane-front-gtk.h
-
-xsane-scan.o: xsane.h
-xsane-scan.o: xsane-back-gtk.h
-xsane-scan.o: xsane-front-gtk.h
-xsane-scan.o: xsane-preferences.h
-xsane-scan.o: xsane-preview.h
-xsane-scan.o: xsane-viewer.h
-xsane-scan.o: xsane-save.h
-xsane-scan.o: xsane-gamma.h
-xsane-scan.o: xsane-setup.h
-xsane-scan.o: xsane-email-project.h
-xsane-scan.o: xsane-text.h
-
-xsane-gamma.o: xsane.h
-xsane-gamma.o: xsane-back-gtk.h
-xsane-gamma.o: xsane-front-gtk.h
-xsane-gamma.o: xsane-preferences.h
-xsane-gamma.o: xsane-preview.h
-xsane-gamma.o: xsane-save.h
-xsane-gamma.o: xsane-text.h
-
-xsane-setup.o: xsane.h
-xsane-setup.o: xsane-back-gtk.h
-xsane-setup.o: xsane-front-gtk.h
-xsane-setup.o: xsane-preferences.h
-xsane-setup.o: xsane-device-preferences.h
-xsane-setup.o: xsane-preview.h
-xsane-setup.o: xsane-save.h
-xsane-setup.o: xsane-gamma.h
-xsane-setup.o: xsane-batch-scan.h
-xsane-setup.o: xsane-text.h
-
-xsane-viewer.o: xsane.h
-xsane-viewer.o: xsane-back-gtk.h
-xsane-viewer.o: xsane-front-gtk.h
-xsane-viewer.o: xsane-preferences.h
-xsane-viewer.o: xsane-viewer.h
-xsane-viewer.o: xsane-gamma.h
-xsane-viewer.o: xsane-icons.h
-xsane-viewer.o: xsane-save.h
-xsane-viewer.o: xsane-text.h
-
-xsane-multipage-project.o: xsane.h
-xsane-multipage-project.o: xsane-back-gtk.h
-xsane-multipage-project.o: xsane-front-gtk.h
-xsane-multipage-project.o: xsane-preferences.h
-xsane-multipage-project.o: xsane-multipage-project.h
-xsane-multipage-project.o: xsane-text.h
-
-xsane-fax-project.o: xsane.h
-xsane-fax-project.o: xsane-back-gtk.h
-xsane-fax-project.o: xsane-front-gtk.h
-xsane-fax-project.o: xsane-preferences.h
-xsane-fax-project.o: xsane-fax-project.h
-xsane-fax-project.o: xsane-text.h
-
-xsane-email-project.o: xsane.h
-xsane-email-project.o: xsane-back-gtk.h
-xsane-email-project.o: xsane-front-gtk.h
-xsane-email-project.o: xsane-preferences.h
-xsane-email-project.o: xsane-email-project.h
-xsane-email-project.o: xsane-text.h
-