[Gnash-commit] gnash ChangeLog configure.ac

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/03 18:48:38

Modified files:
        .              : ChangeLog configure.ac 

Log message:
                * configure.ac: check GTK dependencies only if $build_gtk=yes.
                  print a WARNING and set $build_gtk=no if deps are not met.
                  All of this is done *before* NSAPI is checked, so it would
                  correctly be built or not depending on $build_gtk only.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3934&r2=1.3935
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.392&r2=1.393

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3934
retrieving revision 1.3935
diff -u -b -r1.3934 -r1.3935
--- ChangeLog   3 Aug 2007 18:31:59 -0000       1.3934
+++ ChangeLog   3 Aug 2007 18:48:37 -0000       1.3935
@@ -1,5 +1,12 @@
 2007-08-02 Sandro Santilli <address@hidden>
 
+       * configure.ac: check GTK dependencies only if $build_gtk=yes.
+         print a WARNING and set $build_gtk=no if deps are not met.
+         All of this is done *before* NSAPI is checked, so it would
+         correctly be built or not depending on $build_gtk only.
+
+2007-08-02 Sandro Santilli <address@hidden>
+
        * configure.ac: fix automatic kparts/nsapi plugin build
          based on gui availability.
 

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -b -r1.392 -r1.393
--- configure.ac        3 Aug 2007 18:31:59 -0000       1.392
+++ configure.ac        3 Aug 2007 18:48:38 -0000       1.393
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.392 2007/08/03 18:31:59 strk Exp $
+dnl $Id: configure.ac,v 1.393 2007/08/03 18:48:38 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -540,6 +540,24 @@
 AC_SUBST([LIBTOOL_DEPS])
 AC_LIB_LTDL
 
+if test x$build_gtk = xyes; then
+   GNASH_PATH_GTK2
+   GNASH_PATH_PANGO
+   GNASH_PKG_FIND(atk, [atk/atk.h], [atk library], atk_focus_tracker_init, 
[1.0])
+   if test x$build_ogl = xyes; then
+      GNASH_PATH_GLEXT
+   fi
+
+   dnl if gtk isn't installed, even if it's specified, don't try to build
+   dnl the GTK gui. 
+   if test x$has_gtk2 = xno; then
+      build_gtk=no
+      AC_MSG_WARN(["Disabling GTK GUI, no GTK development tools found"])
+   fi
+fi
+
+
+
 AM_CONDITIONAL(ENABLE_SHARED, [test x"${enable_shared}" = xyes])
 AM_CONDITIONAL(ENABLE_STATIC, [test x"${enable_shared}" = xno])
 dnl -- AM_CONDITIONAL(STATIC_GUI, test x"${dynamic_gui}" = xno -o 
x"${enable_shared}" = xno)
@@ -944,23 +962,6 @@
 
 AM_CONDITIONAL(HAVE_GLIB, [ test x$has_glib = xyes ])
 
-if test x$build_ogl = xyes -a x$build_gtk = xyes; then
-   GNASH_PATH_GLEXT
-fi
-if test x$build_gtk = xyes -o x$nsapi = xyes; then
-   GNASH_PATH_GTK2
-   GNASH_PATH_PANGO
-   GNASH_PKG_FIND(atk, [atk/atk.h], [atk library], atk_focus_tracker_init, 
[1.0])
-fi
-
-dnl if gtk isn't installed, even if it's specified, don't try to build
-dnl the NSAPI plugin, which is GTK based.
-if test x$has_gtk2 = xno; then
-  nsapi=no
-dnl  build_gtk=no
-  AC_MSG_WARN(["Disabling NSAPI plugin, no GTK development tools found"])
-fi
-
 if test x$build_gtk = xno -a x$nsapi = xyes; then
   AC_MSG_WARN(["Enabled NSAPI plugin, but you aren't building a GTK based 
GUI!"])
 fi