Imported Debian patch 0.84-2debian/0.84-2

1 files changed, 411 insertions, 257 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index ae0266d..4c39f9c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,3 +1,4 @@
+######################################################################
 # Configure paths for GTK+
 # Owen Taylor     97-11-3
 
@@ -8,12 +9,11 @@ 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)
+  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"
@@ -171,267 +171,420 @@ main ()
 
 
 ######################################################################
+# Configure paths for The GIMP 
+# Oliver Rauch 2000-12-28
 
-## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
-## Copyright (C) 1996-1998 Free Software Foundation, Inc.
-## Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
-
-# serial 24 AM_PROG_LIBTOOL
-AC_DEFUN(AM_PROG_LIBTOOL,
-[AC_REQUIRE([AM_ENABLE_SHARED])dnl
-AC_REQUIRE([AM_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_RANLIB])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AM_PROG_LD])dnl
-AC_REQUIRE([AM_PROG_NM])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
+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
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags=
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$silent" = yes && libtool_flags="$libtool_flags --silent"
-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case "$host" in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
+  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
-  rm -rf conftest*
-  ;;
 
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  CFLAGS="$CFLAGS -belf"
-  ;;
-esac
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-])
+  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
 
-# AM_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AM_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN(AM_ENABLE_SHARED,
-[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared         build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT]
-changequote([, ])dnl
-[  --enable-shared=PKGS    only build shared libraries if the current package
-                          appears as an element in the PKGS list],
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
+  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
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl
-])
+    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
 
-# AM_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN(AM_DISABLE_SHARED,
-[AM_ENABLE_SHARED(no)])
-
-# AM_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN(AM_DISABLE_STATIC,
-[AM_ENABLE_STATIC(no)])
-
-# AM_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AM_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN(AM_ENABLE_STATIC,
-[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static         build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT]
-changequote([, ])dnl
-[  --enable-static=PKGS    only build shared libraries if the current package
-                          appears as an element in the PKGS list],
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
+  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
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AM_ENABLE_STATIC_DEFAULT)dnl
-])
+  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>
 
-# AM_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN(AM_PROG_LD,
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])
-ac_prog=ld
-if test "$ac_cv_prog_gcc" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  ac_prog=`($CC -print-prog-name=ld) 2>&5`
-  case "$ac_prog" in
-  # Accept absolute paths.
-  /* | [A-Za-z]:\\*)
-    test -z "$LD" && LD="$ac_prog"
-    ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(ac_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog"; then
-      ac_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-        test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$ac_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_SUBST(LD)
-AM_PROG_LD_GNU
-])
+#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)))                                
 
-AC_DEFUN(AM_PROG_LD_GNU,
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
-else
-  ac_cv_prog_gnu_ld=no
-fi])
+#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
 ])
 
-# AM_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN(AM_PROG_NM,
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(ac_cv_path_NM,
-[case "$NM" in
-/* | [A-Za-z]:\\*)
-  ac_cv_path_NM="$NM" # Let the user override the test with a path.
-  ;;
-*)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/nm; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -B"
-      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -p"
-      else
-        ac_cv_path_NM="$ac_dir/nm"
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
-  ;;
-esac])
-NM="$ac_cv_path_NM"
-AC_MSG_RESULT([$NM])
-AC_SUBST(NM)
+
+# ********************************************************************
+# 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_WITH(sane-prefix,[  --with-sane-prefix=PFX  Prefix where SANE is installed (optional)],
+              sane_config_prefix="$withval", sane_config_prefix="")
+  AC_ARG_WITH(sane-exec-prefix,[  --with-sane-exec-prefix=PFX Exec prefix where SANE is installed (optional)],
+              sane_config_exec_prefix="$withval", sane_config_exec_prefix="")
+  AC_ARG_ENABLE(sanetest, [  --disable-sanetest      Do not try to compile and run a test SANE program], , enable_sanetest=yes)
+
+  if test x$sane_config_exec_prefix != x ; then
+     sane_config_args="$sane_config_args --exec-prefix=$sane_config_exec_prefix"
+     if test x${SANE_CONFIG+set} != xset ; then
+        SANE_CONFIG=$sane_config_exec_prefix/bin/sane-config
+     fi
+  fi
+  if test x$sane_config_prefix != x ; then
+     sane_config_args="$sane_config_args --prefix=$sane_config_prefix"
+     if test x${SANE_CONFIG+set} != xset ; then
+        SANE_CONFIG=$sane_config_prefix/bin/sane-config
+     fi
+  fi
+
+  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
 ])
-##### end of libtool.m4
+
+# ********************************************************************
+
 
 dnl AM_FUNC_ALLOCA
 AC_DEFUN(AM_FUNC_ALLOCA,
@@ -503,8 +656,8 @@ static char *f (char * (*g) (char **, int), char **p, ...)
 }                                                                               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, i
-nt);
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int,
+ int);
 int argc;
 char **argv;
 ], [
@@ -528,6 +681,7 @@ esac
 
 
  
+# ********************************************************************
 dnl aclocal.m4 generated automatically by aclocal 1.2f
 
 dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
@@ -590,7 +744,7 @@ 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.
@@ -613,7 +767,7 @@ AC_DEFUN(AM_LC_MESSAGES,
   fi])
 
 
-
+# ********************************************************************
 # gettext.m4 from gettext 0.32
 # Macro to add for using GNU gettext.
 # Ulrich Drepper <drepper@cygnus.com>, 1995.