diff options
| author | Don Scorgie <dscorgie@src.gnome.org> | 2006-04-19 18:04:54 +0000 |
|---|---|---|
| committer | Don Scorgie <dscorgie@src.gnome.org> | 2006-04-19 18:04:54 +0000 |
| commit | e5350a27b48b4422a7fd833a2d69049851347192 (patch) | |
| tree | fda38e5211f78c9d532e6ec5a14fd32fa7d31ff3 | |
| parent | 1b7ccd3642684d567c24f9b637d3004997d0494f (diff) | |
| download | yelp-e5350a27b48b4422a7fd833a2d69049851347192.tar.gz | |
Clean up configure.in a bit Fixes #337437
* configure.in: Clean up configure.in a bit Fixes #337437
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 18 |
2 files changed, 12 insertions, 12 deletions
@@ -1,3 +1,9 @@ +2006-04-19 Don Scorgie <dscorgie@cvs.gnome.org> + + * configure.in: + Clean up configure.in a bit + Fixes #337437 + 2006-04-18 Kjartan Maraas <kmaraas@gnome.org> * configure.in: Remove obsolete entry for no_NO diff --git a/configure.in b/configure.in index 16aa7860..866726e0 100644 --- a/configure.in +++ b/configure.in @@ -178,8 +178,6 @@ AM_CONDITIONAL(ENABLE_BEAGLE, test x"$with_search" = xbeagle) if test "x$with_search" = "xbeagle"; then PKG_CHECK_MODULES(YELP_SEARCH, $BEAGLE_MODULES) -elif test "x$have_beagle" = "xyes"; then - PKG_CHECK_MODULES(YELP_SEARCH, $BEAGLE_MODULES) else YELP_SEARCH_CFLAGS="" YELP_SEARCH_LIBS="" @@ -188,18 +186,23 @@ fi case "x$with_search" in "xbasic") + search_backend="basic" AC_DEFINE(ENABLE_SEARCH, 1, [Define if you want any search]) ;; "xbeagle") + search_backend="beagle" AC_DEFINE(ENABLE_SEARCH, 1, [Define if you want any search]) AC_DEFINE(ENABLE_BEAGLE, 1, [Define if you want the power of Beagle]) ;; "xno") + search_backend="none" ;; "xauto") AC_DEFINE(ENABLE_SEARCH, 1) + search_backend="auto - basic" if test x$have_beagle = xyes; then AC_DEFINE(ENABLE_BEAGLE, 1) + search_backend="auto - beagle" fi ;; *) @@ -236,15 +239,6 @@ AC_DEFINE([MOZILLA_INTERNAL_API],[1],[Define to have access to internal Mozilla AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/fastfind/nsITypeAheadFind.h], [AC_DEFINE([TYPEAHEADFIND],[1],[Define if we have toolkit's nsITypeAheadFind])]) -dnl ================= -dnl Check for whereis -dnl ================= - -case $host in - *-linux-gnu | *-irix6*) AC_DEFINE(HAVE_MAN_WHEREIS, 1, [man(1) understands -w option]);; - *-solaris*) AC_DEFINE(HAVE_MAN_DEBUG, 1, [man(1) has a -d debug option]);; -esac - dnl ==================================== dnl = zlib for help converters dnl ==================================== @@ -313,6 +307,6 @@ yelp-$VERSION: Man Pages enabled: ${enable_man} Info Pages enabled: ${enable_info} Beagle available: ${have_beagle} - Search backend: ${with_search} + Search backend: ${search_backend} Mozilla version: ${MOZILLA} " |