[maemo-commits] [maemo-commits] r15091 - projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-01-17 14:56:23 +0200 (Thu, 17 Jan 2008)
New Revision: 15091

Modified:
   projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_040_dependency_removal.diff
Log:
gtkhtml_040_dependency_removal.diff updated to reflect soft gail check

Modified: projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_040_dependency_removal.diff
===================================================================
--- projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_040_dependency_removal.diff	2008-01-17 12:55:17 UTC (rev 15090)
+++ projects/haf/branches/gtkhtml/gtkhtml-3.17.5-port/patches/gtkhtml_040_dependency_removal.diff	2008-01-17 12:56:23 UTC (rev 15091)
@@ -12,7 +12,7 @@
  #undef BONOBO_DISABLE_DEPRECATED
 diff -ru gtkhtml-3.17.5/configure.in gtkhtml-3.17.5-040/configure.in
 --- gtkhtml-3.17.5/configure.in	2008-01-12 11:24:23.000000000 +0200
-+++ gtkhtml-3.17.5-040/configure.in	2008-01-17 13:28:57.000000000 +0200
++++ gtkhtml-3.17.5-040/configure.in	2008-01-17 14:50:38.000000000 +0200
 @@ -5,6 +5,8 @@
  
  PACKAGE=gtkhtml
@@ -33,7 +33,7 @@
  
  AC_SUBST(CFLAGS)
  AC_SUBST(CPPFLAGS)
-@@ -75,47 +77,133 @@
+@@ -75,47 +77,138 @@
  
  AM_GLIB_GNU_GETTEXT
  
@@ -51,9 +51,14 @@
 +             [ac_cv_enable_a11y=$enableval],[ac_cv_enable_a11y=yes])
 +AC_MSG_CHECKING([whether to enable a11y])
 +if test "$ac_cv_enable_a11y" = yes; then
-+       AC_MSG_RESULT(yes)
-+       GAIL_MODULES="gail >= gail_minimum_version"
-+       PKG_CHECK_MODULES(GAIL, $GAIL_MODULES)
++          AC_MSG_RESULT(yes)
++          GAIL_MODULES="gail >= gail_minimum_version"
++          PKG_CHECK_MODULES(GAIL, $GAIL_MODULES, ac_cv_enable_a11y=yes,
++          [AC_MSG_RESULT(no)
++            ac_cv_enable_a11y=no
++          ])
++fi
++if test "$ac_cv_enable_a11y" = yes; then
 +       AC_SUBST(GAIL_CFLAGS)
 +       AC_SUBST(GAIL_LIBS)
 +       AC_SUBST(GAIL_MODULES)
@@ -91,8 +96,7 @@
 +       CFLAGS="-DDISABLE_GNOME $CFLAGS"
 +       PC_CFLAGS="-DDISABLE_GNOME $PC_CFLAGS"
 +fi
- 
--GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version libgnomeui-2.0 >= libgnomeui_minimum_version libglade-2.0 >= libglade_minimum_version"
++
 +dnl
 +dnl do we want libglade support?
 +dnl
@@ -108,7 +112,8 @@
 +       LIBGLADE_MODULES=""
 +       AC_MSG_RESULT(no)
 +fi
-+
+ 
+-GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version libgnomeui-2.0 >= libgnomeui_minimum_version libglade-2.0 >= libglade_minimum_version"
 +GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version $GNOME_MODULES $LIBGLADE_MODULES"
  PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
  AC_SUBST(GTKHTML_CFLAGS)
@@ -193,7 +198,7 @@
  
  dnl **************************************************
  dnl * regex library
-@@ -161,6 +249,8 @@
+@@ -161,6 +254,8 @@
  AC_SUBST(GTKHTML_REVISION)
  AC_SUBST(GTKHTML_AGE)
  
@@ -202,7 +207,7 @@
  dnl **************
  dnl Done.
  dnl **************
-@@ -182,5 +272,11 @@
+@@ -182,5 +277,11 @@
  
  Configuration: