diff options
author | Eli Zaretskii <[email protected]> | 2010-09-18 16:13:09 +0200 |
---|---|---|
committer | Eli Zaretskii <[email protected]> | 2010-09-18 16:13:09 +0200 |
commit | 0d4afaf7ffb6d1881c9acf9ef03f386cc87254e6 (patch) | |
tree | 7152c41cb4ecd70b35424f4683c839b5f4373301 | |
parent | bf5ba10b08798317749077578a87b687d8d4b7e7 (diff) | |
parent | f3ec267ad61a020d81af44ebb3c090ea11c69278 (diff) |
Fix MSDOS build broken by 2010-09-10T16:44:[email protected], support MSDOS build with libxml2.
config.bat: Detect that libxml2 is installed and if so, build with it.
src/deps.mk (xml.o): Add dependencies.
msdos/sed1v2.inp (LIBXML2_LIBS, LIBXML2_CFLAGS): Edit to empty.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | config.bat | 26 | ||||
-rw-r--r-- | msdos/ChangeLog | 4 | ||||
-rw-r--r-- | msdos/sed1v2.inp | 2 | ||||
-rw-r--r-- | src/ChangeLog | 4 | ||||
-rw-r--r-- | src/deps.mk | 1 |
6 files changed, 42 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2010-09-18 Eli Zaretskii <[email protected]> + + * config.bat: Detect that libxml2 is installed and if so, build + with it. + 2010-09-13 Lars Magne Ingebrigtsen <[email protected]> * configure.in (HAVE_LIBXML2): Check that the libxml2 we found can diff --git a/config.bat b/config.bat index 802cacc889..63f9c5d586 100644 --- a/config.bat +++ b/config.bat @@ -38,6 +38,7 @@ set X11= set nodebug=
set djgpp_ver=
set sys_malloc=
+set libxml=
if "%1" == "" goto usage
rem ----------------------------------------------------------------------
rem See if their environment is large enough. We need 28 bytes.
@@ -175,6 +176,24 @@ rem The following line disables DECL_ALIGN which in turn disables USE_LSB_TAG rem For details see lisp.h where it defines USE_LSB_TAG
echo #define NO_DECL_ALIGN >>config.h2
:alignOk
+Rem See if they have libxml2 later than v2.2.0 installed
+Echo Checking whether libxml2 v2.2.1 or later is installed ...
+rm -f junk.c junk.o junk junk.exe
+rem Use djecho here because we need to quote brackets
+djecho "#include <libxml/xmlversion.h>" >junk.c
+djecho "int main()" >>junk.c
+djecho "{return (LIBXML_VERSION > 20200 ? 0 : 1);}" >>junk.c
+redir -o Nul -eo gcc -I/dev/env/DJDIR/include/libxml2 -o junk junk.c
+if not exist junk Goto xmlDone
+if not exist junk.exe coff2exe junk
+junk
+If ErrorLevel 1 Goto xmlDone
+Echo Configuring with libxml2 ...
+sed -e "/#undef HAVE_LIBXML2/s/^.*$/#define HAVE_LIBXML2 1/" <config.h2 >config.h3
+mv config.h3 config.h2
+set libxml=1
+:xmlDone
+rm -f junk.c junk junk.exe
Rem See if they requested a SYSTEM_MALLOC build
if "%sys_malloc%" == "" Goto cfgDone
rm -f config.tmp
@@ -213,6 +232,12 @@ sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp sed -e "/^LDFLAGS *=/s/=/=-s/" <makefile.tmp >Makefile
rm -f makefile.tmp
:src6
+
+if "%libxml%" == "" goto src7
+sed -e "/^LIBXML2_LIBS *=/s/=/= -lxml2 -lz -liconv/" <Makefile >makefile.tmp
+sed -e "/^LIBXML2_CFLAGS *=/s|=|= -I/dev/env/DJDIR/include/libxml2|" <makefile.tmp >Makefile
+rm -f makefile.tmp
+:src7
cd ..
rem ----------------------------------------------------------------------
Echo Configuring the library source directory...
@@ -289,6 +314,7 @@ set X11= set nodebug=
set djgpp_ver=
set sys_malloc=
+set libxml=
goto skipArchTag
arch-tag: 2d2fed23-4dc6-4006-a2e4-49daf0031f33
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index cc9a63ef12..121dbf3554 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,7 @@ +2010-09-17 Eli Zaretskii <[email protected]> + + * sed1v2.inp (LIBXML2_LIBS, LIBXML2_CFLAGS): Edit to empty. + 2010-08-22 Chong Yidong <[email protected]> * sedleim.inp (RUN-EMACS): Don't use --multibyte. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index e9dfc9dea3..9ccbb67705 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -90,6 +90,8 @@ s/\.h\.in/.h-in/ /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@// /^IMAGEMAGICK_LIBS *=/s/@IMAGEMAGICK_LIBS@// /^IMAGEMAGICK_CFLAGS *=/s/@IMAGEMAGICK_CFLAGS@// +/^LIBXML2_LIBS *=/s/@LIBXML2_LIBS@// +/^LIBXML2_CFLAGS *=/s/@LIBXML2_CFLAGS@// /^WIDGET_OBJ *=/s/@WIDGET_OBJ@// /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/ diff --git a/src/ChangeLog b/src/ChangeLog index 88030b7b4c..1318419172 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2010-09-18 Eli Zaretskii <[email protected]> + * deps.mk (xml.o): Add dependencies. + +2010-09-18 Eli Zaretskii <[email protected]> + * xdisp.c (Fcurrent_bidi_paragraph_direction): Call bidi_paragraph_init with NO_DEFAULT_P non-zero. (Bug#7038) diff --git a/src/deps.mk b/src/deps.mk index d00be96744..eebf98ec00 100644 --- a/src/deps.mk +++ b/src/deps.mk @@ -230,6 +230,7 @@ xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \ charset.h keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h \ systime.h gtkutil.h msdos.h coding.h menu.h lisp.h $(config_h) composite.h \ keymap.h sysselect.h +xml.o: xml.c buffer.h lisp.h $(config_h) xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \ dispextern.h frame.h disptab.h blockinput.h atimer.h systime.h syssignal.h \ keyboard.h emacs-icon.h character.h charset.h ccl.h fontset.h composite.h \ |