| author | Michael Krelin <hacker@klever.net> | 2009-04-26 15:42:55 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2009-04-26 15:42:55 (UTC) |
| commit | bc9cda5ce7c146d77ffca803857649b8551bcbed (patch) (side-by-side diff) | |
| tree | 187fe741b5e62610dedc50d92d6ceef3faf9a20d /configure.ac | |
| parent | 6dab4b79d66fa5ad5827b53d930f6508380b4f4a (diff) | |
| download | libopkele-bc9cda5ce7c146d77ffca803857649b8551bcbed.zip libopkele-bc9cda5ce7c146d77ffca803857649b8551bcbed.tar.gz libopkele-bc9cda5ce7c146d77ffca803857649b8551bcbed.tar.bz2 | |
configure: fix htmltidy detection
when making it detect tidy/tidy.h I seem to have broken non-subdired detection.
Signed-off-by: Michael Krelin <hacker@klever.net>
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 2ded490..9fc5c9d 100644 --- a/configure.ac +++ b/configure.ac @@ -132,58 +132,58 @@ if test "${WANT_DOXYGEN}" = "yes" ; then AC_WITH_DOT else AM_CONDITIONAL([HAVE_DOXYGEN],[false]) AM_CONDITIONAL([HAVE_DOT],[false]) fi LIBCURL_CHECK_CONFIG(,,,[ AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/]) ]) AC_CHECK_HEADER([expat.h],[ AC_CHECK_LIB([expat],[XML_ParserCreate],[ EXPAT_LIBS=-lexpat EXPAT_CFLAGS= AC_SUBST([EXPAT_LIBS]) AC_SUBST([EXPAT_CFLAGS]) ],[ AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/]) ]) ],[ AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/]) ]) AC_CHECK_HEADERS([tidy.h tidy/tidy.h],[ - AC_CHECK_LIB([tidy],[tidyParseBuffer],[ + test -z "$TIDY_LIBS" && AC_CHECK_LIB([tidy],[tidyParseBuffer],[ TIDY_LIBS=-ltidy TIDY_CFLAGS= AC_SUBST([TIDY_LIBS]) AC_SUBST([TIDY_CFLAGS]) ],[ AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) ]) ],[ - test "$ac_header" = "tidy/tidy.h" \ + test -z "$TIDY_LIBS" -a "$ac_header" = "tidy/tidy.h" \ && AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) ]) if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then AC_SUBST([PCRE_CFLAGS]) AC_SUBST([PCRE_LIBS]) : else PKG_CHECK_MODULES([PCRE],[libpcre],,[ AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/]) ]) fi PKG_CHECK_MODULES([SQLITE3],[sqlite3],[have_sqlite3=true],[have_sqlite3=false]) AM_CONDITIONAL([HAVE_SQLITE3],[$have_sqlite3]) PKG_CHECK_MODULES([KINGATE],[kingate-plaincgi],[have_kingate=true],[have_kingate=false]) AM_CONDITIONAL([HAVE_KINGATE],[$have_kingate]) PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) if $have_uuid ; then AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) AC_SUBST([UUID_UUID],[uuid]) fi |