| blob | c9505992fcebac0665366a66d17c0d80e5d76bb5 |
1 diff -upr php-gtk-2.0.1.orig/ext/extra/config.m4 php-gtk-2.0.1/ext/extra/config.m4
2 --- php-gtk-2.0.1.orig/ext/extra/config.m4 2007-05-29 02:53:32.000000000 +0300
3 +++ php-gtk-2.0.1/ext/extra/config.m4 2008-10-12 15:19:46.000000000 +0300
4 @@ -15,8 +15,8 @@ if test "$PHP_GTK_EXTRA" != "no"; then
5 AC_DEFINE(HAVE_GTKEXTRA, 1, [gtkextra support])
6 PHP_EVAL_INCLINE($GTKEXTRA_CFLAGS)
7 if test "$php_gtk_ext_shared" = "yes"; then
8 - PHP_EVAL_LIBLINE($GTKEXTRA_LIBS, GTKEXTRA_SHARED_LIBADD)
9 - PHP_SUBST(GTKEXTRA_SHARED_LIBADD)
10 + PHP_EVAL_LIBLINE($GTKEXTRA_LIBS, PHP_GTK2_EXTRA_SHARED_LIBADD)
11 + PHP_SUBST(PHP_GTK2_EXTRA_SHARED_LIBADD)
12 else
13 PHP_EVAL_LIBLINE($GTKEXTRA_LIBS, PHP_GTK2_SHARED_LIBADD)
14 fi
15 diff -upr php-gtk-2.0.1.orig/ext/html/config.m4 php-gtk-2.0.1/ext/html/config.m4
16 --- php-gtk-2.0.1.orig/ext/html/config.m4 2007-05-29 02:53:32.000000000 +0300
17 +++ php-gtk-2.0.1/ext/html/config.m4 2008-10-12 15:20:03.000000000 +0300
18 @@ -15,8 +15,8 @@ if test "$PHP_GTK_HTML" != "no"; then
19 AC_DEFINE(HAVE_HTML, 1, [html support])
20 PHP_EVAL_INCLINE($HTML_CFLAGS)
21 if test "$php_gtk_ext_shared" = "yes"; then
22 - PHP_EVAL_LIBLINE($HTML_LIBS, HTML_SHARED_LIBADD)
23 - PHP_SUBST(HTML_SHARED_LIBADD)
24 + PHP_EVAL_LIBLINE($HTML_LIBS, PHP_GTK2_HTML_SHARED_LIBADD)
25 + PHP_SUBST(PHP_GTK2_HTML_SHARED_LIBADD)
26 else
27 PHP_EVAL_LIBLINE($HTML_LIBS, PHP_GTK2_SHARED_LIBADD)
28 fi
29 diff -upr php-gtk-2.0.1.orig/ext/libglade/config.m4 php-gtk-2.0.1/ext/libglade/config.m4
30 --- php-gtk-2.0.1.orig/ext/libglade/config.m4 2007-05-29 02:53:33.000000000 +0300
31 +++ php-gtk-2.0.1/ext/libglade/config.m4 2008-10-12 15:20:17.000000000 +0300
32 @@ -14,8 +14,8 @@ if test "$PHP_GTK_LIBGLADE" != "no"; the
33 AC_DEFINE(HAVE_LIBGLADE, 1, [libglade support])
34 PHP_EVAL_INCLINE($LIBGLADE_CFLAGS)
35 if test "$php_gtk_ext_shared" = "yes"; then
36 - PHP_EVAL_LIBLINE($LIBGLADE_LIBS, LIBGLADE_SHARED_LIBADD)
37 - PHP_SUBST(LIBGLADE_SHARED_LIBADD)
38 + PHP_EVAL_LIBLINE($LIBGLADE_LIBS, PHP_GTK2_LIBGLADE_SHARED_LIBADD)
39 + PHP_SUBST(PHP_GTK2_LIBGLADE_SHARED_LIBADD)
40 else
41 PHP_EVAL_LIBLINE($LIBGLADE_LIBS, PHP_GTK2_SHARED_LIBADD)
42 fi
43 diff -upr php-gtk-2.0.1.orig/ext/libsexy/config.m4 php-gtk-2.0.1/ext/libsexy/config.m4
44 --- php-gtk-2.0.1.orig/ext/libsexy/config.m4 2007-05-29 02:53:33.000000000 +0300
45 +++ php-gtk-2.0.1/ext/libsexy/config.m4 2008-10-12 15:20:24.000000000 +0300
46 @@ -14,8 +14,8 @@ if test "$PHP_GTK_LIBSEXY" != "no"; then
47 AC_DEFINE(HAVE_LIBSEXY, 1, [libsexy support])
48 PHP_EVAL_INCLINE($LIBSEXY_CFLAGS)
49 if test "$php_gtk_ext_shared" = "yes"; then
50 - PHP_EVAL_LIBLINE($LIBSEXY_LIBS, LIBSEXY_SHARED_LIBADD)
51 - PHP_SUBST(LIBSEXY_SHARED_LIBADD)
52 + PHP_EVAL_LIBLINE($LIBSEXY_LIBS, PHP_GTK2_LIBSEXY_SHARED_LIBADD)
53 + PHP_SUBST(PHP_GTK2_LIBSEXY_SHARED_LIBADD)
54 else
55 PHP_EVAL_LIBLINE($LIBSEXY_LIBS, PHP_GTK2_SHARED_LIBADD)
56 fi
57 diff -upr php-gtk-2.0.1.orig/ext/mozembed/config.m4 php-gtk-2.0.1/ext/mozembed/config.m4
58 --- php-gtk-2.0.1.orig/ext/mozembed/config.m4 2007-05-29 02:53:33.000000000 +0300
59 +++ php-gtk-2.0.1/ext/mozembed/config.m4 2008-10-12 15:20:32.000000000 +0300
60 @@ -21,8 +21,8 @@ if test "$PHP_GTK_MOZEMBED" != "no"; the
61 AC_DEFINE(HAVE_MOZEMBED, 1, [mozembed support])
62 PHP_EVAL_INCLINE($MOZEMBED_CFLAGS)
63 if test "$php_gtk_ext_shared" = "yes"; then
64 - PHP_EVAL_LIBLINE($MOZEMBED_LIBS, MOZEMBED_SHARED_LIBADD)
65 - PHP_SUBST(MOZEMBED_SHARED_LIBADD)
66 + PHP_EVAL_LIBLINE($MOZEMBED_LIBS, PHP_GTK2_MOZEMBED_SHARED_LIBADD)
67 + PHP_SUBST(PHP_GTK2_MOZEMBED_SHARED_LIBADD)
68 else
69 PHP_EVAL_LIBLINE($MOZEMBED_LIBS, PHP_GTK2_SHARED_LIBADD)
70 fi
71 diff -upr php-gtk-2.0.1.orig/ext/sourceview/config.m4 php-gtk-2.0.1/ext/sourceview/config.m4
72 --- php-gtk-2.0.1.orig/ext/sourceview/config.m4 2007-05-29 02:53:33.000000000 +0300
73 +++ php-gtk-2.0.1/ext/sourceview/config.m4 2008-10-12 15:21:04.000000000 +0300
74 @@ -15,8 +15,8 @@ if test "$PHP_GTK_SOURCEVIEW" != "no"; t
75 AC_DEFINE(HAVE_SOURCEVIEW, 1, [sourceview support])
76 PHP_EVAL_INCLINE($SOURCEVIEW_CFLAGS)
77 if test "$php_gtk_ext_shared" = "yes"; then
78 - PHP_EVAL_LIBLINE($SOURCEVIEW_LIBS, SOURCEVIEW_SHARED_LIBADD)
79 - PHP_SUBST(SOURCEVIEW_SHARED_LIBADD)
80 + PHP_EVAL_LIBLINE($SOURCEVIEW_LIBS, PHP_GTK2_SOURCEVIEW_SHARED_LIBADD)
81 + PHP_SUBST(PHP_GTK2_SOURCEVIEW_SHARED_LIBADD)
82 else
83 PHP_EVAL_LIBLINE($SOURCEVIEW_LIBS, PHP_GTK2_SHARED_LIBADD)
84 fi
85 diff -upr php-gtk-2.0.1.orig/ext/spell/config.m4 php-gtk-2.0.1/ext/spell/config.m4
86 --- php-gtk-2.0.1.orig/ext/spell/config.m4 2007-05-29 02:53:33.000000000 +0300
87 +++ php-gtk-2.0.1/ext/spell/config.m4 2008-10-12 15:21:12.000000000 +0300
88 @@ -15,8 +15,8 @@ if test "$PHP_GTK_SPELL" != "no"; then
89 AC_DEFINE(HAVE_SPELL, 1, [spell support])
90 PHP_EVAL_INCLINE($SPELL_CFLAGS)
91 if test "$php_gtk_ext_shared" = "yes"; then
92 - PHP_EVAL_LIBLINE($SPELL_LIBS, SPELL_SHARED_LIBADD)
93 - PHP_SUBST(SPELL_SHARED_LIBADD)
94 + PHP_EVAL_LIBLINE($SPELL_LIBS, PHP_GTK2_SPELL_SHARED_LIBADD)
95 + PHP_SUBST(PHP_GTK2_SPELL_SHARED_LIBADD)
96 else
97 PHP_EVAL_LIBLINE($SPELL_LIBS, PHP_GTK2_SHARED_LIBADD)
98 fi
99 diff -upr php-gtk-2.0.1.orig/php_gtk.m4 php-gtk-2.0.1/php_gtk.m4
100 --- php-gtk-2.0.1.orig/php_gtk.m4 2008-02-23 18:21:06.000000000 +0200
101 +++ php-gtk-2.0.1/php_gtk.m4 2008-10-12 15:18:25.000000000 +0300
102 @@ -497,7 +497,7 @@ dnl ------------------------------------
103 # shared module
104 ifelse($3,,,PHP_ADD_SOURCES_X($php_gtk_ext_builddir,$3,$ac_extra,[shared_objects_]translit($1,a-z-+,A-Z__),yes))
105 ifelse($4,,,PHP_ADD_SOURCES_X(/ext/$1,$4,$ac_extra,[shared_objects_]translit($1,a-z-+,A-Z__),yes))
106 - PHP_GTK_SHARED_MODULE(php_gtk_$1,[shared_objects_]translit($1,a-z-+,A-Z__), $php_gtk_ext_builddir)
107 + PHP_GTK_SHARED_MODULE(php_gtk2_$1,[shared_objects_]translit($1,a-z-+,A-Z__), $php_gtk_ext_builddir)
108 AC_DEFINE_UNQUOTED([PHP_GTK_COMPILE_DL_]translit($1,a-z-+,A-Z__), 1, Whether to build $1 as dynamic module)
109 fi