IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Check for newer gtkhtml first (#84707).

Browse Source 
* 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.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@10219 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Derek Atkins
2004-08-19 18:36:54 +00:00
parent 259e01d5c1
commit ac4a718807
2 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2004-08-19 Derek Atkins <derek@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-12 David Montenegro <sunrise2000@comcast.net>
* src/report/standard-reports/trial-balance.scm:

66
configure.in
View File

@@ -876,40 +876,56 @@ then
[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,,We 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,,We 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,,We 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`