diff -r c7ae8642a8d8 -r 879e47e5b731 configure.ac --- a/configure.ac Wed May 02 20:33:58 2007 +0000 +++ b/configure.ac Wed Jan 02 21:03:09 2008 +0000 @@ -26,33 +26,13 @@ dnl Checks for libraries. PKG_CHECK_MODULES([GTK], [libgnomecanvasmm-2.6 >= 2.6.0 gtkmm-2.4 >= 2.6]) -AC_ARG_WITH([lemon-prefix], -AS_HELP_STRING([--with-lemon-prefix@<:@=PREFIX@:>@], [search for LEMON under PREFIX]), [], [with_lemon_prefix=no]) -if test x"$with_lemon_prefix" != x"no"; then - export PKG_CONFIG_PATH="$with_lemon_prefix/lib/pkgconfig/:$PKG_CONFIG_PATH" +AC_ARG_WITH([lemon], +AS_HELP_STRING([--with-lemon@<:@=PREFIX@:>@], [search for LEMON under PREFIX]), [], [with_lemon=no]) +if test x"$with_lemon" != x"no"; then + export PKG_CONFIG_PATH="$with_lemon/lib/pkgconfig/:$PKG_CONFIG_PATH" fi -PKG_CHECK_MODULES([LEMON_0_5], [lemon >= 0.5], - [lemon_0_5_found=yes], [ - AC_MSG_RESULT([no]) - lemon_0_5_found=no]) -PKG_CHECK_MODULES([LEMON_SVNHEAD], [lemon = svnhead], - [lemon_svn_head_found=yes], [ - AC_MSG_RESULT([no]) - lemon_svn_head_found=no]) -if test x"$lemon_0_5_found" = x"no" -a x"$lemon_svn_head_found" = x"no"; then - AC_MSG_ERROR([LEMON not found.]) -else - if test x"$lemon_svn_head_found" = x"yes"; then - LEMON_CFLAGS="$LEMON_SVNHEAD_CFLAGS" - LEMON_LIBS="$LEMON_SVNHEAD_LIBS" - else - LEMON_CFLAGS="$LEMON_0_5_CFLAGS" - LEMON_LIBS="$LEMON_0_5_LIBS" - fi - AC_SUBST(LEMON_CFLAGS) - AC_SUBST(LEMON_LIBS) -fi +PKG_CHECK_MODULES([LEMON], [lemon >= 0.6.90]) dnl Checks for header files. AC_CHECK_HEADERS([libintl.h locale.h])