diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-06-21 06:17:38 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-06-21 06:17:38 -0400 |
| commit | 4628c0bf57a62949c617dc28777b5afe21d1ca78 (patch) | |
| tree | 7f1b61515862bc39104d3bd8a1feee0f729b7298 /autogen | |
| parent | aed838b5abc33741f0c6c919c9f4b7d79d3bdb52 (diff) | |
| download | emacs-4628c0bf57a62949c617dc28777b5afe21d1ca78.tar.gz | |
Auto-commit of generated files.
Diffstat (limited to 'autogen')
| -rw-r--r-- | autogen/config.in | 3 | ||||
| -rwxr-xr-x | autogen/configure | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/autogen/config.in b/autogen/config.in index 9282b6eacbf..56d59da131a 100644 --- a/autogen/config.in +++ b/autogen/config.in @@ -746,6 +746,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Define to 1 if you have the `localtime_r' function. */ #undef HAVE_LOCALTIME_R +/* Define to 1 if you have the `log2' function. */ +#undef HAVE_LOG2 + /* Define to 1 if you support file names longer than 14 characters. */ #undef HAVE_LONG_FILE_NAMES diff --git a/autogen/configure b/autogen/configure index 97e8078d4ec..b3ff28d9b16 100755 --- a/autogen/configure +++ b/autogen/configure @@ -14314,6 +14314,27 @@ $as_echo "no" >&6; } HAVE_LIBXML2=no fi + # Built-in libxml2 on OS X 10.8 lacks libxml-2.0.pc. + if test "${HAVE_LIBXML2}" != "yes" -a "$opsys" = "darwin"; then + SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I/usr/include/libxml2" + ac_fn_c_check_header_mongrel "$LINENO" "libxml/HTMLparser.h" "ac_cv_header_libxml_HTMLparser_h" "$ac_includes_default" +if test "x$ac_cv_header_libxml_HTMLparser_h" = x""yes; then : + ac_fn_c_check_decl "$LINENO" "HTML_PARSE_RECOVER" "ac_cv_have_decl_HTML_PARSE_RECOVER" "#include <libxml/HTMLparser.h> +" +if test "x$ac_cv_have_decl_HTML_PARSE_RECOVER" = x""yes; then : + HAVE_LIBXML2=yes +fi + +fi + + + CPPFLAGS="$SAVE_CPPFLAGS" + if test "${HAVE_LIBXML2}" = "yes"; then + LIBXML2_LIBS="-lxml2" + LIBXML2_CFLAGS="-I/usr/include/libxml2" + fi + fi if test "${HAVE_LIBXML2}" = "yes"; then if test "${opsys}" != "mingw32"; then LIBS="$LIBXML2_LIBS $LIBS" @@ -14679,7 +14700,7 @@ gai_strerror mkstemp getline getdelim sync \ difftime posix_memalign \ getpwent endpwent getgrent endgrent \ touchlock \ -cfmakeraw cfsetspeed copysign __executable_start +cfmakeraw cfsetspeed copysign __executable_start log2 do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" |