* configure.in: be more liberal in the use of AS_SCRUB_INCLUDE

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7869 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Derek Atkins
2003-01-21 20:32:51 +00:00
parent a1a2124aef
commit 4da35d35e5
2 changed files with 9 additions and 1 deletions
+4
View File
@@ -1,3 +1,7 @@
2003-01-21 Derek Atkins <derek@ihtfp.com>
* configure.in: be more liberal in the use of AS_SCRUB_INCLUDE
2003-01-20 Chris Lyttle <chris@wilddev.net> 2003-01-20 Chris Lyttle <chris@wilddev.net>
* configure.in: release 1.7.8 * configure.in: release 1.7.8
+5 -1
View File
@@ -282,6 +282,7 @@ AM_CONDITIONAL(GNC_HAVE_GUILE_WWW, test "${gnc_have_guile_www}" = yes)
GNOME_XML_CHECK GNOME_XML_CHECK
GNOME_XML_CFLAGS=`$GNOME_CONFIG --cflags xml` GNOME_XML_CFLAGS=`$GNOME_CONFIG --cflags xml`
AS_SCRUB_INCLUDE(GNOME_XML_CFLAGS)
AC_SUBST(GNOME_XML_CFLAGS) AC_SUBST(GNOME_XML_CFLAGS)
@@ -512,6 +513,7 @@ then
LIBS="${save_LIBS}" LIBS="${save_LIBS}"
CPPFLAGS="${save_CPPFLAGS}" CPPFLAGS="${save_CPPFLAGS}"
AS_SCRUB_INCLUDE(LIBOFX_CFLAGS)
AC_SUBST(LIBOFX_CFLAGS) AC_SUBST(LIBOFX_CFLAGS)
AC_SUBST(LIBOFX_LIBS) AC_SUBST(LIBOFX_LIBS)
fi fi
@@ -528,6 +530,7 @@ then
HBCI_LIBS="${OPENHBCI_LIBS}" HBCI_LIBS="${OPENHBCI_LIBS}"
HBCI_CFLAGS="${OPENHBCI_CXXFLAGS}" HBCI_CFLAGS="${OPENHBCI_CXXFLAGS}"
AS_SCRUB_INCLUDE(HBCI_CFLAGS)
AC_SUBST(HBCI_LIBS) AC_SUBST(HBCI_LIBS)
AC_SUBST(HBCI_CFLAGS) AC_SUBST(HBCI_CFLAGS)
fi fi
@@ -766,6 +769,7 @@ then
GLADE_LIBS="$LIBGLADE_LIBS" GLADE_LIBS="$LIBGLADE_LIBS"
GLADE_CFLAGS="$LIBGLADE_CFLAGS" GLADE_CFLAGS="$LIBGLADE_CFLAGS"
AS_SCRUB_INCLUDE(GLADE_CFLAGS)
AC_SUBST(GLADE_LIBS) AC_SUBST(GLADE_LIBS)
AC_SUBST(GLADE_CFLAGS) AC_SUBST(GLADE_CFLAGS)
@@ -786,7 +790,6 @@ then
AC_DEFINE(HAVE_LIBGTKHTML), AC_DEFINE(HAVE_LIBGTKHTML),
AC_MSG_ERROR([Cannot find gtkhtml. See the README and config.log for more info.]), AC_MSG_ERROR([Cannot find gtkhtml. See the README and config.log for more info.]),
$GTKHTML_LIBS) $GTKHTML_LIBS)
AS_SCRUB_INCLUDE(GTKHTML_CFLAGS)
else else
AC_PATH_PROG(PKG_CONFIG,pkg-config) AC_PATH_PROG(PKG_CONFIG,pkg-config)
if test "x$PKG_CONFIG" = x; then if test "x$PKG_CONFIG" = x; then
@@ -807,6 +810,7 @@ then
AC_MSG_ERROR([Cannot find gtkhtml-1.1. See the README and config.log for more info.]), AC_MSG_ERROR([Cannot find gtkhtml-1.1. See the README and config.log for more info.]),
$GTKHTML_LIBS) $GTKHTML_LIBS)
fi fi
AS_SCRUB_INCLUDE(GTKHTML_CFLAGS)
GHTTP_LIBS=`$GNOME_CONFIG --libs ghttp` GHTTP_LIBS=`$GNOME_CONFIG --libs ghttp`
GHTTP_CFLAGS=`$GNOME_CONFIG --cflags ghttp` GHTTP_CFLAGS=`$GNOME_CONFIG --cflags ghttp`