Permalink
Browse files

Fixed shared extensions linking in Unix.

Patch from foutrelis@gmail.com.
  • Loading branch information...
1 parent 176f97d commit 093a4662ebb66ead959dfe914caf68bc580c3e82 Andrei Zmievski committed Oct 14, 2008
Showing with 15 additions and 15 deletions.
  1. +2 −2 ext/extra/config.m4
  2. +2 −2 ext/html/config.m4
  3. +2 −2 ext/libglade/config.m4
  4. +2 −2 ext/libsexy/config.m4
  5. +2 −2 ext/mozembed/config.m4
  6. +2 −2 ext/sourceview/config.m4
  7. +2 −2 ext/spell/config.m4
  8. +1 −1 php_gtk.m4
View
@@ -15,8 +15,8 @@ if test "$PHP_GTK_EXTRA" != "no"; then
AC_DEFINE(HAVE_GTKEXTRA, 1, [gtkextra support])
PHP_EVAL_INCLINE($GTKEXTRA_CFLAGS)
if test "$php_gtk_ext_shared" = "yes"; then
- PHP_EVAL_LIBLINE($GTKEXTRA_LIBS, GTKEXTRA_SHARED_LIBADD)
- PHP_SUBST(GTKEXTRA_SHARED_LIBADD)
+ PHP_EVAL_LIBLINE($GTKEXTRA_LIBS, PHP_GTK2_EXTRA_SHARED_LIBADD)
+ PHP_SUBST(PHP_GTK2_EXTRA_SHARED_LIBADD)
else
PHP_EVAL_LIBLINE($GTKEXTRA_LIBS, PHP_GTK2_SHARED_LIBADD)
fi
View
@@ -15,8 +15,8 @@ if test "$PHP_GTK_HTML" != "no"; then
AC_DEFINE(HAVE_HTML, 1, [html support])
PHP_EVAL_INCLINE($HTML_CFLAGS)
if test "$php_gtk_ext_shared" = "yes"; then
- PHP_EVAL_LIBLINE($HTML_LIBS, HTML_SHARED_LIBADD)
- PHP_SUBST(HTML_SHARED_LIBADD)
+ PHP_EVAL_LIBLINE($HTML_LIBS, PHP_GTK2_HTML_SHARED_LIBADD)
+ PHP_SUBST(PHP_GTK2_HTML_SHARED_LIBADD)
else
PHP_EVAL_LIBLINE($HTML_LIBS, PHP_GTK2_SHARED_LIBADD)
fi
@@ -14,8 +14,8 @@ if test "$PHP_GTK_LIBGLADE" != "no"; then
AC_DEFINE(HAVE_LIBGLADE, 1, [libglade support])
PHP_EVAL_INCLINE($LIBGLADE_CFLAGS)
if test "$php_gtk_ext_shared" = "yes"; then
- PHP_EVAL_LIBLINE($LIBGLADE_LIBS, LIBGLADE_SHARED_LIBADD)
- PHP_SUBST(LIBGLADE_SHARED_LIBADD)
+ PHP_EVAL_LIBLINE($LIBGLADE_LIBS, PHP_GTK2_LIBGLADE_SHARED_LIBADD)
+ PHP_SUBST(PHP_GTK2_LIBGLADE_SHARED_LIBADD)
else
PHP_EVAL_LIBLINE($LIBGLADE_LIBS, PHP_GTK2_SHARED_LIBADD)
fi
@@ -14,8 +14,8 @@ if test "$PHP_GTK_LIBSEXY" != "no"; then
AC_DEFINE(HAVE_LIBSEXY, 1, [libsexy support])
PHP_EVAL_INCLINE($LIBSEXY_CFLAGS)
if test "$php_gtk_ext_shared" = "yes"; then
- PHP_EVAL_LIBLINE($LIBSEXY_LIBS, LIBSEXY_SHARED_LIBADD)
- PHP_SUBST(LIBSEXY_SHARED_LIBADD)
+ PHP_EVAL_LIBLINE($LIBSEXY_LIBS, PHP_GTK2_LIBSEXY_SHARED_LIBADD)
+ PHP_SUBST(PHP_GTK2_LIBSEXY_SHARED_LIBADD)
else
PHP_EVAL_LIBLINE($LIBSEXY_LIBS, PHP_GTK2_SHARED_LIBADD)
fi
@@ -21,8 +21,8 @@ if test "$PHP_GTK_MOZEMBED" != "no"; then
AC_DEFINE(HAVE_MOZEMBED, 1, [mozembed support])
PHP_EVAL_INCLINE($MOZEMBED_CFLAGS)
if test "$php_gtk_ext_shared" = "yes"; then
- PHP_EVAL_LIBLINE($MOZEMBED_LIBS, MOZEMBED_SHARED_LIBADD)
- PHP_SUBST(MOZEMBED_SHARED_LIBADD)
+ PHP_EVAL_LIBLINE($MOZEMBED_LIBS, PHP_GTK2_MOZEMBED_SHARED_LIBADD)
+ PHP_SUBST(PHP_GTK2_MOZEMBED_SHARED_LIBADD)
else
PHP_EVAL_LIBLINE($MOZEMBED_LIBS, PHP_GTK2_SHARED_LIBADD)
fi
@@ -15,8 +15,8 @@ if test "$PHP_GTK_SOURCEVIEW" != "no"; then
AC_DEFINE(HAVE_SOURCEVIEW, 1, [sourceview support])
PHP_EVAL_INCLINE($SOURCEVIEW_CFLAGS)
if test "$php_gtk_ext_shared" = "yes"; then
- PHP_EVAL_LIBLINE($SOURCEVIEW_LIBS, SOURCEVIEW_SHARED_LIBADD)
- PHP_SUBST(SOURCEVIEW_SHARED_LIBADD)
+ PHP_EVAL_LIBLINE($SOURCEVIEW_LIBS, PHP_GTK2_SOURCEVIEW_SHARED_LIBADD)
+ PHP_SUBST(PHP_GTK2_SOURCEVIEW_SHARED_LIBADD)
else
PHP_EVAL_LIBLINE($SOURCEVIEW_LIBS, PHP_GTK2_SHARED_LIBADD)
fi
View
@@ -15,8 +15,8 @@ if test "$PHP_GTK_SPELL" != "no"; then
AC_DEFINE(HAVE_SPELL, 1, [spell support])
PHP_EVAL_INCLINE($SPELL_CFLAGS)
if test "$php_gtk_ext_shared" = "yes"; then
- PHP_EVAL_LIBLINE($SPELL_LIBS, SPELL_SHARED_LIBADD)
- PHP_SUBST(SPELL_SHARED_LIBADD)
+ PHP_EVAL_LIBLINE($SPELL_LIBS, PHP_GTK2_SPELL_SHARED_LIBADD)
+ PHP_SUBST(PHP_GTK2_SPELL_SHARED_LIBADD)
else
PHP_EVAL_LIBLINE($SPELL_LIBS, PHP_GTK2_SHARED_LIBADD)
fi
View
@@ -497,7 +497,7 @@ dnl ---------------------------------------------- Shared module
# shared module
ifelse($3,,,PHP_ADD_SOURCES_X($php_gtk_ext_builddir,$3,$ac_extra,[shared_objects_]translit($1,a-z-+,A-Z__),yes))
ifelse($4,,,PHP_ADD_SOURCES_X(/ext/$1,$4,$ac_extra,[shared_objects_]translit($1,a-z-+,A-Z__),yes))
- PHP_GTK_SHARED_MODULE(php_gtk_$1,[shared_objects_]translit($1,a-z-+,A-Z__), $php_gtk_ext_builddir)
+ PHP_GTK_SHARED_MODULE(php_gtk2_$1,[shared_objects_]translit($1,a-z-+,A-Z__), $php_gtk_ext_builddir)
AC_DEFINE_UNQUOTED([PHP_GTK_COMPILE_DL_]translit($1,a-z-+,A-Z__), 1, Whether to build $1 as dynamic module)
fi

0 comments on commit 093a466

Please sign in to comment.