CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/08/03 17:23:24
Modified files:
. : configure.ac ChangeLog
Log message:
* configure.ac: Fix typo so --disable-nsapi works. Cleanup the
logic of what gets built when. Add a few warnings.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.389&r2=1.390
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3930&r2=1.3931
Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -b -r1.389 -r1.390
--- configure.ac 3 Aug 2007 03:01:15 -0000 1.389
+++ configure.ac 3 Aug 2007 17:23:23 -0000 1.390
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.389 2007/08/03 03:01:15 rsavoye Exp $
+dnl $Id: configure.ac,v 1.390 2007/08/03 17:23:23 rsavoye Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -930,9 +930,7 @@
AC_CHECK_SIZEOF(short)
dnl # Check KDE if kde gui or kparts were requested
-if test x$build_kde = xyes -o x"$kparts" = xyes; then
- kde=yes
- qt=yes
+if test x$build_kde = xyes -o x$kparts = xyes; then
GNASH_PATH_KDE
GNASH_PATH_QT
fi
@@ -949,28 +947,34 @@
if test x$build_ogl = xyes -a x$build_gtk = xyes; then
GNASH_PATH_GLEXT
fi
-if test x$build_gtk = xyes; then
+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
-if test x$has_gtk2 = xyes; then
- nsapi=yes
-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
- AC_MSG_WARN(["No GTK development package installed, disabling NSAPI plugin"])
+dnl build_gtk=no
+ AC_MSG_WARN(["Disabling NSAPI plugin, no GTK development tools found"])
+fi
+
+if test x$build_gtk = xno -o x$nsapi = xyes; then
+ AC_MSG_WARN(["Enabled NSAPI plugin, but you aren't building a GTK based
GUI!"])
fi
dnl if kde isn't installed, even if it's specified, don't try to build
dnl the KPARTS plugin, which is KDE based.
-if test x$has_kde = xno; then
+if test x$has_kde = xno -a x$kparts = xyes; then
kparts=no
- AC_MSG_WARN(["No KDE development package installed, disabling KPARTS
plugin"])
+dnl build_kde=no
+ AC_MSG_WARN(["Disabling KPARTS plugin, no KDE development found"])
+fi
+
+if test x$build_kde = xno -o x$kparts = xyes; then
+ AC_MSG_WARN(["Enabled KPARTS plugin, but you aren't building a KDE based
GUI!"])
fi
AM_CONDITIONAL(BUILD_GTK_GUI, [ test x$build_gtk = xyes ])
@@ -1391,7 +1395,7 @@
fi
if test x"$kparts" = x"yes"; then
- echo " Konqueror plugin enabled (default). Use --disble-kparts to
disable"
+ echo " Konqueror plugin enabled (default). Use --disable-kparts to
disable"
else
echo " Konqueror plugin disabled."
fi
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3930
retrieving revision 1.3931
diff -u -b -r1.3930 -r1.3931
--- ChangeLog 3 Aug 2007 04:37:43 -0000 1.3930
+++ ChangeLog 3 Aug 2007 17:23:24 -0000 1.3931
@@ -1,3 +1,8 @@
+2007-08-03 Rob Savoye <[EMAIL PROTECTED]>
+
+ * configure.ac: Fix typo so --disable-nsapi works. Cleanup the
+ logic of what gets built when. Add a few warnings.
+
2007-08-02 Sandro Santilli <[EMAIL PROTECTED]>
* Makefile.am: add plugins info to 'dumpconfig' output,
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
