Skip to content

Instantly share code, notes, and snippets.

@slava888
Last active December 10, 2015 23:59
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save slava888/4513866 to your computer and use it in GitHub Desktop.
Save slava888/4513866 to your computer and use it in GitHub Desktop.
Patch for wine-mone, which changes AM_CONFIG_HEADER, AM_PROG_CC_STDC to AC_CONFIG_HEADERS, AC_PROG_CC respectively
diff --git a/configure.in b/configure.in
index be5cbb2..4d40397 100644
--- wine-mono-0.0.8/mono/configure.in
+++ wine-mono-0.0.8/mono/configure.in
@@ -14,7 +14,7 @@ AC_CANONICAL_HOST
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar no-dist-gzip foreign])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE
API_VER=2.0
@@ -362,7 +362,6 @@ AC_PROG_CC
AC_CHECK_TOOL(CXX, g++, g++)
AC_PROG_CXX
AM_PROG_AS
-AM_PROG_CC_STDC
AC_PROG_INSTALL
AC_PROG_AWK
dnl We should use AM_PROG_AS, but it's not available on automake/aclocal 1.4
diff --git a/eglib/configure.ac b/eglib/configure.ac
index d3e528d..dfe9ec4 100644
--- wine-mono-0.0.8/mono/eglib/configure.ac
+++ wine-mono-0.0.8/mono/eglib/configure.ac
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
AC_CANONICAL_HOST
AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar no-dist-gzip foreign])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index c12d4a7..f70d4d2 100644
--- wine-mono-0.0.8/mono/runtime/Makefile.am
+++ wine-mono-0.0.8/mono/runtime/Makefile.am
@@ -1,6 +1,3 @@
-# hack to prevent 'check' from depending on 'all'
-AUTOMAKE_OPTIONS = cygnus
-
tmpinst = _tmpinst
noinst_SCRIPTS = mono-wrapper monodis-wrapper
--- wine-mono-0.0.8/mono/autogen.sh 2013-01-11 21:21:05.840144508 +0100
+++ wine-mono-0.0.8/mono/autogen.sh 2013-01-11 21:24:51.395781285 +0100
@@ -113,7 +113,7 @@
exit 1
}
-if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
echo "Running autoheader..."
autoheader || { echo "**Error**: autoheader failed."; exit 1; }
fi
diff -ur src.orig/wine-mono-0.0.8/mono/eglib/autogen.sh src/wine-mono-0.0.8/mono/eglib/autogen.sh
--- wine-mono-0.0.8/mono/eglib/autogen.sh 2012-09-24 21:18:25.000000000 +0200
+++ wine-mono-0.0.8/mono/eglib/autogen.sh 2013-01-12 21:00:00.238573342 +0100
@@ -113,7 +113,7 @@
exit 1
}
-if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
+if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
echo "Running autoheader..."
autoheader || { echo "**Error**: autoheader failed."; exit 1; }
fi
diff -ur src.orig/wine-mono-0.0.8/mono/libgc/autogen.sh src/wine-mono-0.0.8/mono/libgc/autogen.sh
--- wine-mono-0.0.8/mono/libgc/autogen.sh 2012-09-24 21:18:25.000000000 +0200
+++ wine-mono-0.0.8/mono/libgc/autogen.sh 2013-01-12 21:00:36.606377720 +0100
@@ -98,7 +98,7 @@
exit 1
}
-if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
echo "Running autoheader..."
autoheader || { echo "**Error**: autoheader failed."; exit 1; }
fi
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment