author | Michael Krelin <hacker@klever.net> | 2008-06-25 21:24:53 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-06-25 21:24:53 (UTC) |
commit | 2744ea9808c3a6c50f8be78a9a71f6d3b2ba7e00 (patch) (unidiff) | |
tree | a9c124efee2b4edbeaeb646f1b94928bdc4e8c4c /configure.ac | |
parent | 04aac0e097992df01e17fbbb62a5a7d9682bcea9 (diff) | |
download | libopkele-2744ea9808c3a6c50f8be78a9a71f6d3b2ba7e00.zip libopkele-2744ea9808c3a6c50f8be78a9a71f6d3b2ba7e00.tar.gz libopkele-2744ea9808c3a6c50f8be78a9a71f6d3b2ba7e00.tar.bz2 |
improved detection of htmltidy for debian and co.
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 0aa1272..a66e53d 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -144,27 +144,28 @@ AC_CHECK_HEADER([expat.h],[ | |||
144 | AC_SUBST([EXPAT_CFLAGS]) | 144 | AC_SUBST([EXPAT_CFLAGS]) |
145 | ],[ | 145 | ],[ |
146 | AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/]) | 146 | AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/]) |
147 | ]) | 147 | ]) |
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_CHECK_HEADER([tidy.h],[ | 152 | AC_CHECK_HEADERS([tidy.h tidy/tidy.h],[ |
153 | AC_CHECK_LIB([tidy],[tidyParseBuffer],[ | 153 | AC_CHECK_LIB([tidy],[tidyParseBuffer],[ |
154 | TIDY_LIBS=-ltidy | 154 | TIDY_LIBS=-ltidy |
155 | TIDY_CFLAGS= | 155 | TIDY_CFLAGS= |
156 | AC_SUBST([TIDY_LIBS]) | 156 | AC_SUBST([TIDY_LIBS]) |
157 | AC_SUBST([TIDY_CFLAGS]) | 157 | AC_SUBST([TIDY_CFLAGS]) |
158 | ],[ | 158 | ],[ |
159 | AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) | 159 | AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) |
160 | ]) | 160 | ]) |
161 | ],[ | 161 | ],[ |
162 | AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) | 162 | test "$ac_header" = "tidy/tidy.h" \ |
163 | && AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) | ||
163 | ]) | 164 | ]) |
164 | 165 | ||
165 | if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then | 166 | if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then |
166 | AC_SUBST([PCRE_CFLAGS]) | 167 | AC_SUBST([PCRE_CFLAGS]) |
167 | AC_SUBST([PCRE_LIBS]) | 168 | AC_SUBST([PCRE_LIBS]) |
168 | : | 169 | : |
169 | else | 170 | else |
170 | PKG_CHECK_MODULES([PCRE],[libpcre],,[ | 171 | PKG_CHECK_MODULES([PCRE],[libpcre],,[ |