summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2009-04-26 15:42:55 (UTC)
committer Michael Krelin <hacker@klever.net>2009-04-26 15:42:55 (UTC)
commitbc9cda5ce7c146d77ffca803857649b8551bcbed (patch) (unidiff)
tree187fe741b5e62610dedc50d92d6ceef3faf9a20d
parent6dab4b79d66fa5ad5827b53d930f6508380b4f4a (diff)
downloadlibopkele-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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac4
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
@@ -144,34 +144,34 @@ AC_CHECK_HEADER([expat.h],[
144 EXPAT_LIBS=-lexpat 144 EXPAT_LIBS=-lexpat
145 EXPAT_CFLAGS= 145 EXPAT_CFLAGS=
146 AC_SUBST([EXPAT_LIBS]) 146 AC_SUBST([EXPAT_LIBS])
147 AC_SUBST([EXPAT_CFLAGS]) 147 AC_SUBST([EXPAT_CFLAGS])
148 ],[ 148 ],[
149 AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/]) 149 AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/])
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
155AC_CHECK_HEADERS([tidy.h tidy/tidy.h],[ 155AC_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
169if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then 169if 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])
172 : 172 :
173else 173else
174 PKG_CHECK_MODULES([PCRE],[libpcre],,[ 174 PKG_CHECK_MODULES([PCRE],[libpcre],,[
175 AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/]) 175 AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/])
176 ]) 176 ])
177fi 177fi