1 |
tetromino 13/04/30 14:29:12 |
2 |
|
3 |
Added: glib-2.34.3-automake-1.13.patch |
4 |
glib-1.2.10-automake-1.13.patch |
5 |
Log: |
6 |
On second thought, fix automake-1.13 compatibility properly, with patches. |
7 |
|
8 |
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 dev-libs/glib/files/glib-2.34.3-automake-1.13.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.34.3-automake-1.13.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.34.3-automake-1.13.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: glib-2.34.3-automake-1.13.patch |
17 |
=================================================================== |
18 |
Replace macros deprecated in automake-1.13; fixed upstream in glib-2.36 |
19 |
|
20 |
diff --git a/configure.ac b/configure.ac |
21 |
index a3567b3..3e3d697 100644 |
22 |
--- a/configure.ac |
23 |
+++ b/configure.ac |
24 |
@@ -56,7 +56,7 @@ m4_define([glib_debug_default], |
25 |
AC_INIT(glib, [glib_version], |
26 |
[http://bugzilla.gnome.org/enter_bug.cgi?product=glib]) |
27 |
|
28 |
-AC_CONFIG_HEADER([config.h]) |
29 |
+AC_CONFIG_HEADERS([config.h]) |
30 |
AC_CONFIG_SRCDIR([glib/glib.h]) |
31 |
AC_CONFIG_MACRO_DIR([m4macros]) |
32 |
|
33 |
@@ -291,7 +291,6 @@ AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=) |
34 |
AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""]) |
35 |
AC_LANG_RESTORE |
36 |
|
37 |
-AM_PROG_CC_STDC |
38 |
AM_PROG_CC_C_O |
39 |
AC_PROG_INSTALL |
40 |
|
41 |
|
42 |
|
43 |
|
44 |
1.1 dev-libs/glib/files/glib-1.2.10-automake-1.13.patch |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-1.2.10-automake-1.13.patch?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-1.2.10-automake-1.13.patch?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: glib-1.2.10-automake-1.13.patch |
50 |
=================================================================== |
51 |
Replace macros deprecated in automake-1.13; fixed upstream in glib-2.36 |
52 |
|
53 |
diff --git a/configure.in b/configure.in |
54 |
index e94cc77..d88d834 100644 |
55 |
--- a/configure.in |
56 |
+++ b/configure.in |
57 |
@@ -60,7 +60,7 @@ PACKAGE=glib |
58 |
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) |
59 |
|
60 |
# Specify a configuration file |
61 |
-AM_CONFIG_HEADER(config.h) |
62 |
+AC_CONFIG_HEADERS(config.h) |
63 |
|
64 |
AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION) |
65 |
AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION) |
66 |
@@ -151,7 +151,6 @@ AC_DEFINE_UNQUOTED(G_COMPILED_WITH_DEBUGGING, "${enable_debug}") |
67 |
|
68 |
# Checks for programs. |
69 |
AC_PROG_CC |
70 |
-AM_PROG_CC_STDC |
71 |
AC_PROG_INSTALL |
72 |
|
73 |
changequote(,)dnl |