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) (unidiff) | |
tree | 187fe741b5e62610dedc50d92d6ceef3faf9a20d | |
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 | |||
@@ -150,22 +150,22 @@ AC_CHECK_HEADER([expat.h],[ | |||
150 | ]) | 150 | ]) |
151 | ],[ | 151 | ],[ |
152 | AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/]) | 152 | AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/]) |
153 | ]) | 153 | ]) |
154 | 154 | ||
155 | AC_CHECK_HEADERS([tidy.h tidy/tidy.h],[ | 155 | AC_CHECK_HEADERS([tidy.h tidy/tidy.h],[ |
156 | AC_CHECK_LIB([tidy],[tidyParseBuffer],[ | 156 | test -z "$TIDY_LIBS" && AC_CHECK_LIB([tidy],[tidyParseBuffer],[ |
157 | TIDY_LIBS=-ltidy | 157 | TIDY_LIBS=-ltidy |
158 | TIDY_CFLAGS= | 158 | TIDY_CFLAGS= |
159 | AC_SUBST([TIDY_LIBS]) | 159 | AC_SUBST([TIDY_LIBS]) |
160 | AC_SUBST([TIDY_CFLAGS]) | 160 | AC_SUBST([TIDY_CFLAGS]) |
161 | ],[ | 161 | ],[ |
162 | AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) | 162 | AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) |
163 | ]) | 163 | ]) |
164 | ],[ | 164 | ],[ |
165 | test "$ac_header" = "tidy/tidy.h" \ | 165 | test -z "$TIDY_LIBS" -a "$ac_header" = "tidy/tidy.h" \ |
166 | && AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) | 166 | && AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) |
167 | ]) | 167 | ]) |
168 | 168 | ||
169 | if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then | 169 | if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then |
170 | AC_SUBST([PCRE_CFLAGS]) | 170 | AC_SUBST([PCRE_CFLAGS]) |
171 | AC_SUBST([PCRE_LIBS]) | 171 | AC_SUBST([PCRE_LIBS]) |