summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-05-16 12:13:47 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-05-16 12:13:47 +0000
commitc09753ed385cce649a8e027866b21c85371cd8bb (patch)
tree0270c9cc8eae77a49cc0ead75f69d29a6f38b26f
parent00f5fc5902c262b115faf44f41b67408d7f6dc6c (diff)
mtx: bug fix for AIX, from Vladimir Volovic
git-svn-id: svn://tug.org/texlive/trunk@26443 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/utils/mtx/ChangeLog6
-rw-r--r--Build/source/utils/mtx/Makefile.am1
-rw-r--r--Build/source/utils/mtx/Makefile.in1
3 files changed, 8 insertions, 0 deletions
diff --git a/Build/source/utils/mtx/ChangeLog b/Build/source/utils/mtx/ChangeLog
index 310be8a5432..2a54c90d82e 100644
--- a/Build/source/utils/mtx/ChangeLog
+++ b/Build/source/utils/mtx/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (AM_CPPFLAGS): Add '-DNO_DECLARE_MALLOC' to avoid
+ a possibly conflicting redeclaration of malloc().
+ From Vladimir Volovich <vvv@vsu.ru>.
+
2012-04-16 Peter Breitenlohner <peb@mppmu.mpg.de>
Adapt mtx-0.60d to the TeX Live build system.
diff --git a/Build/source/utils/mtx/Makefile.am b/Build/source/utils/mtx/Makefile.am
index 9e5e066da64..f84371cf50a 100644
--- a/Build/source/utils/mtx/Makefile.am
+++ b/Build/source/utils/mtx/Makefile.am
@@ -15,6 +15,7 @@ dist-hook:
rm -rf `find $(distdir) -name .svn`
INCLUDES = -I$(srcdir)/$(MTX_TREE)/libp2c
+AM_CPPFLAGS = -DNO_DECLARE_MALLOC
AM_CFLAGS = #$(WARNING_CFLAGS)
bin_PROGRAMS = prepmx
diff --git a/Build/source/utils/mtx/Makefile.in b/Build/source/utils/mtx/Makefile.in
index 12d3180b8f2..4ab0b15eea2 100644
--- a/Build/source/utils/mtx/Makefile.in
+++ b/Build/source/utils/mtx/Makefile.in
@@ -261,6 +261,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = $(MTX_TREE) $(MTX_TREE)-PATCHES ../../build-aux/relpath \
$(TESTS) tests/mozart.mtx tests/mozart.pmx
INCLUDES = -I$(srcdir)/$(MTX_TREE)/libp2c
+AM_CPPFLAGS = -DNO_DECLARE_MALLOC
AM_CFLAGS = #$(WARNING_CFLAGS)
prepmx_SOURCES = \
$(MTX_TREE)/analyze.c \