[Gnash-commit] gnash macros/alp.m4 macros/hildon.m4 gui/gtksup...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/11/22 17:19:33

Modified files:
        macros         : alp.m4 hildon.m4 
        gui            : gtksup.h 
        .              : ChangeLog 

Log message:
                * gui/gtksup.h: Use HAVE_HILDON and HAVE_ALP instead of 
USE_HILDON
                and USE_ALP.
                * macros/alp.m4, hildon.m4: Define HAVE_HILDON or HAVE_ALP if 
the
                dependant files exist.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/alp.m4?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/hildon.m4?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtksup.h?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4921&r2=1.4922

Patches:
Index: macros/alp.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/alp.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- macros/alp.m4       22 Nov 2007 16:19:56 -0000      1.1
+++ macros/alp.m4       22 Nov 2007 17:19:32 -0000      1.2
@@ -65,6 +65,7 @@
 
   if test x"${ac_cv_path_alp_lib}" != x; then
     ALP_LIBS="${ac_cv_path_alp_lib}"
+    AC_DEFINE(HAVE_ALP, [1], [has the ALP/Hiker mobile framework])
     have_alp=yes
   fi
 

Index: macros/hildon.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/hildon.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- macros/hildon.m4    22 Nov 2007 16:19:56 -0000      1.1
+++ macros/hildon.m4    22 Nov 2007 17:19:32 -0000      1.2
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: hildon.m4,v 1.1 2007/11/22 16:19:56 rsavoye Exp $
+dnl $Id: hildon.m4,v 1.2 2007/11/22 17:19:32 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_HILDON],
 [
@@ -128,6 +128,7 @@
 
   if test x"${ac_cv_path_hildon_lib}" != x; then
     HILDON_LIBS="${ac_cv_path_hildon_lib}"
+    AC_DEFINE(HAVE_HILDON, [1], [has the Hildon mobile framework])
   else
     HILDON_LIBS=""
   fi

Index: gui/gtksup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtksup.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- gui/gtksup.h        22 Nov 2007 16:19:57 -0000      1.53
+++ gui/gtksup.h        22 Nov 2007 17:19:32 -0000      1.54
@@ -29,13 +29,13 @@
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
-#ifdef GUI_HILDON
+#ifdef HAVE_HILDON
 extern "C" {
 # include <hildon/hildon.h>
 }
 #endif
 
-#ifdef USE_ALP
+#ifdef HAVE_ALP
 # include <alp/bundlemgr.h>
 #endif
 

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4921
retrieving revision 1.4922
diff -u -b -r1.4921 -r1.4922
--- ChangeLog   22 Nov 2007 17:11:36 -0000      1.4921
+++ ChangeLog   22 Nov 2007 17:19:32 -0000      1.4922
@@ -7,6 +7,11 @@
 
 2007-11-22  Rob Savoye  <address@hidden>
 
+       * gui/gtksup.h: Use HAVE_HILDON and HAVE_ALP instead of USE_HILDON
+       and USE_ALP.
+       * macros/alp.m4, hildon.m4: Define HAVE_HILDON or HAVE_ALP if the
+       dependant files exist.
+
        * Makefile.am: Add dumpconfig prints for ALP and Hildon.
        * configure.ac: Add support for the ALP and Hildon GUI frameworks,
        both of which are built on GTK+. Add initial support for the