[Gnucash-changes] Check for newer gtkhtml first (#84707).

Derek Atkins warlord at cvs.gnucash.org
Thu Aug 19 14:36:41 EDT 2004


Log Message:
-----------
Check for newer gtkhtml first (#84707).

	* configure.in: change the gtkhtml order to search for >= 1.1 before
	  < 1.1, in order to try to fix #84707 on systems with multiple
	  versions of gtkhtml.

Tags:
----
gnucash-1-8-branch

Modified Files:
--------------
    gnucash:
        ChangeLog
        configure.in

Revision Data
-------------
Index: configure.in
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/configure.in,v
retrieving revision 1.358.2.37
retrieving revision 1.358.2.38
diff -Lconfigure.in -Lconfigure.in -u -r1.358.2.37 -r1.358.2.38
--- configure.in
+++ configure.in
@@ -805,40 +805,56 @@
       [AC_MSG_ERROR([gal library not found. See the README and config.log for more info.])],
       `$GNOME_CONFIG --libs gal`)
     
-    AC_MSG_CHECKING([for gtkhtml < 1.1])
-    GTKHTML_LIBS=`$GNOME_CONFIG --libs gtkhtml`
-    GTKHTML_CFLAGS=`$GNOME_CONFIG --cflags gtkhtml`
-    AS_SCRUB_INCLUDE(GTKHTML_CFLAGS)
-    if test "x$GTKHTML_LIBS" != x; then
-	# check for gtkhtml and enable it via HAVE_LIBGTKHTML
-	# if found
-	AC_CHECK_LIB(gtkhtml, gtk_html_new,
-		     GNOMEBUILDLIBS="${GNOMEBUILDLIBS}"
-		     AC_DEFINE(HAVE_LIBGTKHTML),
-		     AC_MSG_ERROR([Cannot find gtkhtml. See the README and config.log for more info.]),
-		     $GTKHTML_LIBS)
-    else
-	AC_PATH_PROG(PKG_CONFIG,pkg-config)
-	if test "x$PKG_CONFIG" = x; then
-	    # @*%&$ Ximian programmers renamed this application
-	    AC_PATH_PROG(PKG_CONFIG,pkgconfig)
-	    if test "x$PKG_CONFIG" = x; then
-	    	AC_MSG_ERROR([Could not find the pkg-config (or pkgconfig) program.],)
-	    fi
-	fi
+    #
+    # Check for GtkHTML..  First check for 1.1, then check for < 1.1
+    #
+
+    AC_PATH_PROG(PKG_CONFIG,pkg-config)
+    if test "x$PKG_CONFIG" = x; then
+	# @*%&$ Ximian programmers renamed this application
+	AC_PATH_PROG(PKG_CONFIG,pkgconfig)
+    fi
+
+    AC_MSG_CHECKING([for gtkhtml >= 1.1])
+    if test "x$PKG_CONFIG" != x; then
 	GTKHTML_LIBS=`$PKG_CONFIG --libs gtkhtml-1.1`
 	GTKHTML_CFLAGS=`$PKG_CONFIG --cflags gtkhtml-1.1`
         AS_SCRUB_INCLUDE(GTKHTML_CFLAGS)
-	# check for gtkhtml and enable it via HAVE_LIBGTKHTML
-	# if found
-	AC_MSG_CHECKING([for gtkhtml >= 1.1])
+    fi
+
+    if test "x$GTKHTML_LIBS" != x; then
+	AC_MSG_RESULT(yes)
+	# check for gtkhtml and enable it via HAVE_LIBGTKHTML if found
 	AC_CHECK_LIB(gtkhtml-1.1, gtk_html_new,
 		     GNOMEBUILDLIBS="${GNOMEBUILDLIBS} $GTKHTML_TEST_LIB"
 		     AC_DEFINE(HAVE_LIBGTKHTML),
-		     AC_MSG_ERROR([Cannot find gtkhtml-1.1. See the README and config.log for more info.]),
+		     AC_MSG_ERROR([Cannot link gtkhtml-1.1. See the README and config.log for more info.]),
 		     $GTKHTML_LIBS)
+    else
+        AC_MSG_CHECKING([for gtkhtml < 1.1])
+        GTKHTML_LIBS=`$GNOME_CONFIG --libs gtkhtml`
+        GTKHTML_CFLAGS=`$GNOME_CONFIG --cflags gtkhtml`
+        AS_SCRUB_INCLUDE(GTKHTML_CFLAGS)
+
+	if test "x$GTKHTML_LIBS" != x; then
+	    AC_MSG_RESULT(yes)
+
+	    # check for gtkhtml and enable it via HAVE_LIBGTKHTML if found
+	    AC_CHECK_LIB(gtkhtml, gtk_html_new,
+		     GNOMEBUILDLIBS="${GNOMEBUILDLIBS}"
+		     AC_DEFINE(HAVE_LIBGTKHTML),
+		     AC_MSG_ERROR([Cannot link gtkhtml. See the README and config.log for more info.]),
+		     $GTKHTML_LIBS)
+	else
+	    AC_MSG_ERROR([Cannot find GtkHTML <= 1.x on your system.  See the README and config.log for more info.])
+
+	fi
     fi
     
+    #
+    # Check for GHTTP
+    #
+
     GHTTP_LIBS=`$GNOME_CONFIG --libs ghttp`
     GHTTP_CFLAGS=`$GNOME_CONFIG --cflags ghttp`
     
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1461.2.348
retrieving revision 1.1461.2.349
diff -LChangeLog -LChangeLog -u -r1.1461.2.348 -r1.1461.2.349
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,9 @@
+2004-08-19  Derek Atkins  <derek at ihtfp.com>
+
+	* configure.in: change the gtkhtml order to search for >= 1.1 before
+	  < 1.1, in order to try to fix #84707 on systems with multiple
+	  versions of gtkhtml.
+
 2004-08-11  Derek Atkins  <derek at ihtfp.com>
 
 	* src/gnome/gnucash.desktop.in: make the desktop HIG compliant.


More information about the gnucash-changes mailing list