[Gnash-commit] /srv/bzr/gnash/trunk r10850: remove enable-gtk-widget option, we always built it now that way.

[rob]

------------------------------------------------------------
revno: 10850
committer: address@hidden
branch nick: trunk
timestamp: Sun 2009-04-26 12:19:07 -0600
message:
  remove enable-gtk-widget option, we always built it now that way.
modified:
  configure.ac

=== modified file 'configure.ac'
--- a/configure.ac      2009-04-26 00:54:20 +0000
+++ b/configure.ac      2009-04-26 18:19:07 +0000
@@ -228,17 +228,8 @@
 LC_KEY=${lckey}
 AC_SUBST(LC_KEY)
 
-AC_ARG_ENABLE(gtk-widget,
-  AC_HELP_STRING([--enable-gtk-widget],[Enable building the GTK Widget]),
-[case "${enableval}" in
-  yes) gtkwidget=yes ;;
-  no)  gtkwidget=no ;;
-  *)   AC_MSG_ERROR([bad value ${enableval} for --enable-gtk-widget option]) ;;
-esac],gtkwidget=yes)
-AM_CONDITIONAL([BUILD_GTK_WIDGET], test x$gtkwidget = xyes)
-if test x$gtkwidget = xyes; then
-  AC_DEFINE([BUILD_CANVAS], [], [Build GTK Canvas support for the GTK Widget ])
-fi
+dnl FIXME: this should go away when gtk.cpp is cleaned up..
+AC_DEFINE([BUILD_CANVAS], [], [Build GTK Canvas support for the GTK Widget ])
 
 AC_ARG_ENABLE(python,
   AC_HELP_STRING([--enable-python],[Enable python for the python wrapper]),
@@ -1133,11 +1124,11 @@
 dnl Check for PKG_CONFIG before any GNASH_PATH call
 PKG_PROG_PKG_CONFIG
 
-dnl If python support is enabled, look for the flags and libs
-dnl if test x"$python" = xyes; then
-  GNASH_PATH_PYTHON
-dnl fi
+dnl Look for python, which is optional. If enabled, a python loadable
+dnl module of Gnash is created.
+GNASH_PATH_PYTHON
 AM_CONDITIONAL([USE_PYTHON], test x"$python" = xyes)
+AM_CONDITIONAL([HAS_PYTHON], test x"$has_python" = xyes)
 
 AC_PATH_PROG(PERL, perl)
 AM_CONDITIONAL(HAVE_PERL, test x"$PERL" != x)