2000-12-23 Henning Meier-Geinitz <hmg@gmx.de>

* aclocal.m4 configure: Fixed some bugs concerning link checks for libsane.
	* src/xscanimage.c: Use g_free for memory acquired by g_new.
	* TODO: Removed entries about g_free and ac_local.m4.

TODO

@@ -1,4 +1,4 @@
-TODO (2000-12-17)
+TODO (2000-12-23)
 
 ******** todo ********
 
@@ -45,13 +45,12 @@ TODO (2000-12-17)
 
   * Add/improve debug output for xscanimage and xcam.
 
-  * use g_free for memory allocated by g_new.
-
-  * check configure.in/aclocal.m4: Compilation/link test for SANE doesn't
-    work.
 
 ******** done ********
 
+  * use g_free for memory allocated by g_new.
+  * check configure.in/aclocal.m4: Compilation/link test for SANE doesn't
+    work.
   * xscanimage doesn't exit when the window close button is pressed in the
     "select device" window.
   * configure --without-x doesn't work

aclocal.m4

@@ -480,17 +480,17 @@ main ()
           AC_TRY_LINK([
 #include <sane/sane.h>
 #include <stdio.h>
-],      [ return ((sane_major_version) || (sane_minor_version) || (sane_micro_version)); ],
+],      [ 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 "*** 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 "***" ],
         [ 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"