[Gnash-commit] gnash configure.ac ChangeLog gui/gtksup.h

[Rob Savoye]

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

Modified files:
        .              : configure.ac ChangeLog 
        gui            : gtksup.h 

Log message:
                * gui/gtksup.h: Sigh, use USE_HILDON and USE_ALP after all.
                * configure.ac: Don't build hildon as part of --enable-gui=all 
yet.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.441&r2=1.442
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4922&r2=1.4923
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtksup.h?cvsroot=gnash&r1=1.54&r2=1.55

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -b -r1.441 -r1.442
--- configure.ac        22 Nov 2007 17:11:37 -0000      1.441
+++ configure.ac        22 Nov 2007 17:34:45 -0000      1.442
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.441 2007/11/22 17:11:37 strk Exp $
+dnl $Id: configure.ac,v 1.442 2007/11/22 17:34:45 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -301,7 +301,7 @@
         build_kde=yes
         build_gtk=yes
         build_sdl=yes
-        build_hildon=yes
+dnl        build_hildon=yes
 dnl        build_alp=yes
 dnl        build_riscos=yes
         ;;

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4922
retrieving revision 1.4923
diff -u -b -r1.4922 -r1.4923
--- ChangeLog   22 Nov 2007 17:19:32 -0000      1.4922
+++ ChangeLog   22 Nov 2007 17:34:46 -0000      1.4923
@@ -1,3 +1,8 @@
+2007-11-22  Rob Savoye  <address@hidden>
+
+       * gui/gtksup.h: Sigh, use USE_HILDON and USE_ALP after all.
+       * configure.ac: Don't build hildon as part of --enable-gui=all yet.
+
 2007-11-22 Sandro Santilli <address@hidden>
 
        * configure.ac: make request for hildon and unavailability a nogo,

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