[Gnash-commit] gnash ChangeLog configure.ac

[Dossy Shiobara]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Dossy Shiobara <dossy>  08/03/30 18:24:11

Modified files:
        .              : ChangeLog configure.ac 

Log message:
        Add detection for NSPR and windres for Win32 builds of npgnash.dll
        NPAPI plugin.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6095&r2=1.6096
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.504&r2=1.505

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6095
retrieving revision 1.6096
diff -u -b -r1.6095 -r1.6096
--- ChangeLog   30 Mar 2008 18:23:19 -0000      1.6095
+++ ChangeLog   30 Mar 2008 18:24:10 -0000      1.6096
@@ -1,5 +1,10 @@
 2008-03-30  Dossy Shiobara <address@hidden>
 
+       * configure.ac: Add detection for NSPR and windres for Win32
+         builds of npgnash.dll NPAPI plugin.
+
+2008-03-30  Dossy Shiobara <address@hidden>
+
        * macros/gnashpkgtool.m4: Add support for pkgname-config scripts
          that don't understand --cxxflags, such as nspr-config.
 

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -b -r1.504 -r1.505
--- configure.ac        29 Mar 2008 00:23:21 -0000      1.504
+++ configure.ac        30 Mar 2008 18:24:10 -0000      1.505
@@ -1382,6 +1382,11 @@
 dnl Shm::resize() uses this if it exists
 AC_CHECK_LIB(c, mremap)
 
+GNASH_PKG_FIND(nspr, [nspr.h], [Netscape Portable Runtime (NSPR)], PR_Init)
+
+AC_PATH_PROG(WINDRES, windres, [], [${pathlist}])
+AC_SUBST(WINDRES)
+
 GNASH_PKG_FIND(z, [zlib.h], [zlib compression library], compress)
 GNASH_PKG_FIND(jpeg, [jpeglib.h], [jpeg images], jpeg_mem_init)
 GNASH_PKG_FIND(png, [png.h], [png images], png_info_init)
@@ -1485,6 +1490,15 @@
   AC_MSG_WARN(["Enabled NSAPI plugin, but you aren't building a GTK based 
GUI!"])
 fi
 
+if test x$windows = xyes -a x$nsapi = xyes; then
+  if test x$NSPR_CFLAGS = x -a x$NSPR_LIBS = x; then
+    AC_MSG_ERROR(["On Win32, NPAPI plugin requires NSPR."])
+  fi
+  if test x$WINDRES = x; then
+    AC_MSG_ERROR(["On Win32, NPAPI plugin requires windres."])
+  fi
+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 -a x$kparts = xyes; then
@@ -1979,6 +1993,8 @@
 extensions/metome/Makefile
 plugin/Makefile
 plugin/klash/Makefile
+plugin/mozilla-sdk/Makefile
+plugin/win32/Makefile
 cygnal/Makefile
 cygnal/testsuite/Makefile
 cygnal/testsuite/cygnal.all/Makefile