diff options
| author | Fatih Demir <kabalak@src.gnome.org> | 2000-06-25 11:39:38 +0000 |
|---|---|---|
| committer | Fatih Demir <kabalak@src.gnome.org> | 2000-06-25 11:39:38 +0000 |
| commit | d0146ebfb64bdebfc3cd610ea7375a47bd46d5a1 (patch) | |
| tree | c53e7b35f0aaa750aab7e395f692719bf33bfc47 /configure.in | |
| parent | 90886aff8c22acb3b4f4f42891f3da499e97ab00 (diff) | |
| download | nautilus-d0146ebfb64bdebfc3cd610ea7375a47bd46d5a1.tar.gz | |
Applied some updates to the configure.in, as said to the list.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/configure.in b/configure.in index c3c18628c..f461581cb 100644 --- a/configure.in +++ b/configure.in @@ -233,9 +233,9 @@ AC_SUBST(VFS_CFLAGS) AC_SUBST(VFS_LIBS) AC_SUBST(IDL_CFLAGS) -AM_PATH_OAF(0.1.0) +AM_PATH_OAF(0.3.0) -AM_PATH_GCONF(0.1.0,,,gconf-gtk) +AM_PATH_GCONF(0.5.0,,,gconf-gtk) AC_PATH_PROG(XML_CONFIG,xml-config,no) if test x$XML_CONFIG = xno; then @@ -291,8 +291,16 @@ dnl been released yet. AC_MSG_CHECKING(for GtkHTML) if gnome-config --libs gtkhtml > /dev/null 2>&1; then AC_MSG_RESULT(yes) - GTKHTML_LIBS=`gnome-config --libs gtkhtml` - GTKHTML_CFLAGS=`gnome-config --cflags gtkhtml` + dnl <= check for GtkHTML >= 0.4 + AC_MSG_CHECKING(for GtkHTML >= 0.4) + if test `gnome-config --modversion gtkhtml|sed -e 's/.*-[[[:digit:]]].//g'` -ge 4 ; then + AC_MSG_RESULT([yeah, we are very up-to-date]) + GTKHTML_LIBS=`gnome-config --libs gtkhtml` + GTKHTML_CFLAGS=`gnome-config --cflags gtkhtml` + else + AC_MSG_ERROR([Your GtkHTML is not up-to-date enough for nautilus!]) + fi + dnl => else AC_MSG_ERROR([Not Found]) AC_MSG_ERROR([GtkHTML from the GNOME CVS is required]) |