diff options
author | Michael Lauer <mickey@vanille-media.de> | 2008-08-26 15:35:52 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2008-08-26 15:35:52 +0000 |
commit | de9009f8e9bfdad0343494ba99e3ae4e830fb871 (patch) | |
tree | 698255efa5035f9e055afef359d39154a2392910 /packages/classpath/files/autotools.patch | |
parent | a46613fd6a2998861272090c62e7d3d7a8b93325 (diff) | |
parent | 6e5e69478c517beaa1c74b947c5043441d9397f5 (diff) |
merge of '8f5711b8ee04e00c48f5997987d6ab4600e5dc19'
and 'b04f946bcf310267d7557532bc06f235d79f8226'
Diffstat (limited to 'packages/classpath/files/autotools.patch')
-rw-r--r-- | packages/classpath/files/autotools.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/packages/classpath/files/autotools.patch b/packages/classpath/files/autotools.patch new file mode 100644 index 0000000000..baae366d5f --- /dev/null +++ b/packages/classpath/files/autotools.patch @@ -0,0 +1,37 @@ +Index: classpath-0.93/configure.ac +=================================================================== +--- classpath-0.93.orig/configure.ac 2006-12-08 20:22:50.000000000 +0100 ++++ classpath-0.93/configure.ac 2008-08-25 22:07:40.711946598 +0200 +@@ -41,6 +41,11 @@ + AC_CONFIG_HEADERS([include/config.h]) + AC_PREFIX_DEFAULT(/usr/local/classpath) + ++AC_CONFIG_MACRO_DIR([m4]) ++ ++ ++AM_ICONV_LINK ++ + dnl ----------------------------------------------------------- + dnl Enable collections.jar (disabled by default) + dnl ----------------------------------------------------------- +@@ -312,6 +317,7 @@ + dnl AC_PROG_AWK + AC_PROG_CC + AC_PROG_CPP ++AM_PROG_CC_C_O + + # Handle -Werror default case. + if test "$ENABLE_WERROR" = default; then +Index: classpath-0.93/Makefile.am +=================================================================== +--- classpath-0.93.orig/Makefile.am 2006-02-08 08:35:30.000000000 +0100 ++++ classpath-0.93/Makefile.am 2008-08-24 21:45:42.405241264 +0200 +@@ -4,7 +4,7 @@ + SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR) + DIST_SUBDIRS = lib doc external include native resource scripts tools examples + +-ACLOCAL_AMFLAGS = -I m4 ++ACLOCAL_AMFLAGS = -I m4 --install + + native: lib + |