Mercurial > mxe-octave

comparison src/vcdimager-1-configure.patch @ 3632:4e78b4a9e87c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add libcdio,mpcdec, vcdimager, a52dec, wavpack from mxe_devel * dist-files.mk: add libcdio.mk,libmpcdec-1-configure_ac.patch,libmpcdec.mk, vcdimager-* * index.html: add libcdio, libmpcdec, a52dec, wavpack * src/libcdio.mk: new file * src/libmpcdec-1-configure_ac.patch: new file * src/libmpcdec.mk: new file * src/vcdimager-1-configure.patch: new file * src/vcdimager.mk: new file * src/a52dec.mk: new file * src/wavpack-1-exec_prefix.patch: new file * src/wavpack.mk: new file
author John Donoghue <john.donoghue@ieee.org>
date Mon, 30 Jun 2014 06:10:45 -0400
parents
children
comparison
equal deleted inserted replaced
3631:f11ee3f8e632 3632:4e78b4a9e87c
1 This file is part of MXE.
2 See index.html for further information.
3
4 diff -urN vcdimager-0.7.24/configure.ac vcdimager-0.7.24-patch/configure.ac
5 --- vcdimager-0.7.24/configure.ac 2011-03-18 01:43:53.000000000 +0200
6 +++ vcdimager-0.7.24-patch/configure.ac 2013-12-18 10:58:39.175296932 +0200
7 @@ -154,9 +154,13 @@
8 fi
9
10 if test "x$enable_xml_fe" = "xyes"; then
11 - AM_PATH_XML2(2.3.8, , enable_xml_fe=no)
12 + PKG_CHECK_MODULES(XML, libxml-2.0)
13 + dnl Using this causes pain and suffering
14 + dnl AM_PATH_XML2(2.3.8, , enable_xml_fe=no)
15 fi
16
17 +
18 +
19 dnl headers
20
21 dnl AC_DEFINE(_DEVELOPMENT_, [], enable warnings about being development release)
22 diff -urN vcdimager-0.7.24/frontends/xml/Makefile.am vcdimager-0.7.24-patch/frontends/xml/Makefile.am
23 --- vcdimager-0.7.24/frontends/xml/Makefile.am 2004-08-15 15:16:49.000000000 +0300
24 +++ vcdimager-0.7.24-patch/frontends/xml/Makefile.am 2013-12-18 11:07:39.344356593 +0200
25 @@ -27,7 +27,7 @@
26
27 MAINTAINERCLEANFILES = $(man_MANS)
28
29 -INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBVCD_CFLAGS) $(XML_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) $(XML_CPPFLAGS)
30 +INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBVCD_CFLAGS) $(XML_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) $(XML_CFLAGS)
31
32 BUILT_SOURCES = videocd_dtd.inc
33 MOSTLYCLEANFILES = videocd_dtd.inc
34 diff -urN vcdimager-0.7.24/frontends/xml/Makefile.in vcdimager-0.7.24-patch/frontends/xml/Makefile.in
35 --- vcdimager-0.7.24/frontends/xml/Makefile.in 2011-03-18 01:46:36.000000000 +0200
36 +++ vcdimager-0.7.24-patch/frontends/xml/Makefile.in 2013-12-18 11:08:17.458924350 +0200
37 @@ -222,7 +222,7 @@
38 STRIP = @STRIP@
39 VERSION = @VERSION@
40 XML2_CONFIG = @XML2_CONFIG@
41 -XML_CPPFLAGS = @XML_CPPFLAGS@
42 +XML_CFLAGS = @XML_CFLAGS@
43 XML_LIBS = @XML_LIBS@
44 abs_builddir = @abs_builddir@
45 abs_srcdir = @abs_srcdir@
46 @@ -279,7 +279,7 @@
47 top_srcdir = @top_srcdir@
48 man_MANS = vcdxbuild.1 vcdxgen.1 vcdxrip.1 vcdxminfo.1
49 MAINTAINERCLEANFILES = $(man_MANS)
50 -INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBVCD_CFLAGS) $(XML_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) $(XML_CPPFLAGS)
51 +INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBVCD_CFLAGS) $(XML_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) $(XML_CFLAGS)
52 BUILT_SOURCES = videocd_dtd.inc
53 MOSTLYCLEANFILES = videocd_dtd.inc
54 EXTRA_DIST = videocd.dtd $(man_MANS)