procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from trunk.

Browse source
This commit is contained in:
Paul Eggert 2011-09-26 14:34:22 -07:00
commit 6d69f077f1
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -15,6 +15,10 @@
* m4/stdint.m4, m4/stdio_h.m4, m4/sys_stat_h.m4, m4/time_h.m4:
* m4/unistd_h.m4: Merge from gnulib.
2011-09-26 Andreas Schwab <schwab@linux-m68k.org>
* configure.in: Initialize HAVE_LIBXML2.
2011-09-26 Glenn Morris <rgm@gnu.org>
* make-dist: Add lib/makefile.w32-in.

1
configure.in
View file

@ -2624,6 +2624,7 @@ fi
AC_SUBST(LIBXSM)
### Use libxml (-lxml2) if available
HAVE_LIBXML2=no
if test "${with_xml2}" != "no"; then
### I'm not sure what the version number should be, so I just guessed.
PKG_CHECK_MODULES(LIBXML2, libxml-2.0 > 2.6.17, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)