summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAurelien Jarno <aurel32@debian.org>2005-02-03 16:24:20 +0100
committerMattia Rizzolo <mattia@mapreri.org>2014-10-03 14:05:06 +0000
commit825ef604db05e42ea267a86187bf62d54670c98c (patch)
treec41b8addd68e573fcf6ef599ec777e251a130b8e /include
parentac8459519a9ef2a1ee635509b52a653da1bfe9d5 (diff)
parent817e6294b42b3e4435f1b99728afc1dca84a6445 (diff)
Imported Debian patch 0.97-3debian/0.97-3
Diffstat (limited to 'include')
-rw-r--r--include/Makefile1
-rw-r--r--include/config.h22
-rw-r--r--include/config.h.in16
3 files changed, 25 insertions, 14 deletions
diff --git a/include/Makefile b/include/Makefile
index 214d47e..c8de918 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,3 @@
-# Generated automatically from Makefile.in by configure.
# This is just a dummy to ensure that the include directory gets created
# in a shadow-build.
diff --git a/include/config.h b/include/config.h
index ed6a027..77e5fba 100644
--- a/include/config.h
+++ b/include/config.h
@@ -1,4 +1,4 @@
-/* include/config.h. Generated automatically by configure. */
+/* include/config.h. Generated by configure. */
#ifndef SANE_CONFIG_H
#define SANE_CONFIG_H
@@ -98,11 +98,11 @@
/* Define to the name of the distribution. */
#define PACKAGE "xsane"
-/* The concatenation of the strings PACKAGE, "-", and VERSION. */
-#define PACKAGE_VERSION "xsane-0.84"
-
/* Define to the version of the distribution. */
-#define VERSION "0.84"
+#define VERSION "0.97"
+
+/* The concatenation of the strings PACKAGE, "-", and VERSION. */
+#define XSANE_PACKAGE_VERSION "xsane-0.97"
/* Define if you have the __argz_count function. */
#define HAVE___ARGZ_COUNT 1
@@ -243,6 +243,9 @@
/* 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 */
@@ -267,11 +270,14 @@
/* Define if you have the <dlfcn.h> header file. */
/* #undef HAVE_DLFCN_H */
-/* Define if you have the GIMP header files and library. */
-#define HAVE_LIBGIMP_GIMP_H 1
+/* 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. */
-#define HAVE_LIBGIMP_GIMPFEATURES_H 1
+/* #undef HAVE_LIBGIMP_GIMPFEATURES_H */
/* Define if you have libjpeg. */
#define HAVE_LIBJPEG 1
diff --git a/include/config.h.in b/include/config.h.in
index 16a6f57..e056158 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -97,12 +97,12 @@
/* Define to the name of the distribution. */
#undef PACKAGE
-/* The concatenation of the strings PACKAGE, "-", and VERSION. */
-#undef PACKAGE_VERSION
-
/* Define to the version of the distribution. */
#undef VERSION
+/* The concatenation of the strings PACKAGE, "-", and VERSION. */
+#undef XSANE_PACKAGE_VERSION
+
/* Define if you have the __argz_count function. */
#undef HAVE___ARGZ_COUNT
@@ -242,6 +242,9 @@
/* 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
@@ -266,8 +269,11 @@
/* Define if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if you have the GIMP header files and library. */
-#undef HAVE_LIBGIMP_GIMP_H
+/* Define if you have GIMP installed - no matter what version. */
+#undef HAVE_ANY_GIMP
+
+/* Define if you have GIMP-2.0 installed. */
+#undef HAVE_GIMP_2
/* Define if you have the GIMPfeatures header file. */
#undef HAVE_LIBGIMP_GIMPFEATURES_H