[Gnucash-changes] r11871 - gnucash/trunk - Remove obvious comments, wrong gnomeprint comment, libgtkhtml-3.0 check.

[Joshua Sled]

Author: jsled
Date: 2005-11-06 16:47:03 -0500 (Sun, 06 Nov 2005)
New Revision: 11871

Modified:
   gnucash/trunk/configure.in
Log:
Remove obvious comments, wrong gnomeprint comment, libgtkhtml-3.0 check.


Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2005-11-06 21:01:18 UTC (rev 11870)
+++ gnucash/trunk/configure.in	2005-11-06 21:47:03 UTC (rev 11871)
@@ -102,7 +102,7 @@
 ])
 
 ## +jsled
-# copied from gnumeric
+# copied from gnumeric for our lib/goffice/ stuffs.
 AC_CHECK_HEADERS(ieeefp.h ieee754.h)
 dnl Check for some functions
 AC_CHECK_FUNCS(random drand48 finite memmove mkdtemp uname times sysconf fmin)
@@ -1003,7 +1003,6 @@
 then
     GNOME_COMPILE_WARNINGS
 
-    # Look for libgnomeui by pkg-config
     PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4)
     AS_SCRUB_INCLUDE(GTK_CFLAGS)
     AC_SUBST(GTK_CFLAGS)
@@ -1015,17 +1014,11 @@
     AC_SUBST(GNOME_CFLAGS)
     AC_SUBST(GNOME_LIBS)
 
-    # look for gdk-pixbuf
     PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
     AS_SCRUB_INCLUDE(GDK_PIXBUF_CFLAGS)
     AC_SUBST(GDK_PIXBUF_CFLAGS)
     AC_SUBST(GDK_PIXBUF_LIBS)
 
-    # Gnome-Print -- some people already have/need libgnomeprint-2.2
-    # Yep, so lets test to see if it is 2.0 or 2.2, 
-    # Anyone know why gnome has versions in the package config? 
-    # Why cant I just ask for the version of 'libgnomeprint'
-
     PKG_CHECK_MODULES(GNOME_PRINT, libgnomeprint-2.2 libgnomeprintui-2.2)
     AS_SCRUB_INCLUDE(GNOME_PRINT_CFLAGS)
     AC_SUBST(GNOME_PRINT_CFLAGS)
@@ -1037,15 +1030,12 @@
     AC_SUBST(LIBGUPPI_CFLAGS)
     AC_SUBST(LIBGUPPI_LIBS)
     
-    ### ----------------------------------------------------------------------
-    ### Check for glade, gtkhtml
-    
     PKG_CHECK_MODULES(GLADE, libglade-2.0 >= 2.4)
     AS_SCRUB_INCLUDE(GLADE_CFLAGS)
     AC_SUBST(GLADE_CFLAGS)
     AC_SUBST(GLADE_LIBS)
 
-    # check for gtkhtml 3.x
+    # check for gtkhtml 3.x versions.
     gtkhtml=0
     PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.8 , [gtkhtml=1] , [gtkhtml=0])
     if test $gtkhtml = 0
@@ -1056,12 +1046,8 @@
     	     PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.2 , [gtkhtml=1] , [gtkhtml=0])
     	     if test $gtkhtml = 0
     	       then 
-    	          PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.1 , [gtkhtml=1] , [gtkhtml=0])
-    	          if test $gtkhtml = 0
-    	            then 
-    	              PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.0 ,,
-    	    		AC_MSG_ERROR([Could not find a working gtkhtml version]))
-    	          fi
+    	          PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.1 , [gtkhtml=1],
+                                    AC_MSG_ERROR([Could not find a working gtkhtml version]))
     	    fi
     	fi
     fi