r3871 - in branches/beast-mingw: . data drivers/bse-portaudio

[stw svn gnome org]

Author: stw
Date: 2006-08-27 14:40:39 -0400 (Sun, 27 Aug 2006)
New Revision: 3871

Modified:
   branches/beast-mingw/ChangeLog.win32
   branches/beast-mingw/data/bse.pc.in
   branches/beast-mingw/drivers/bse-portaudio/Makefile.am
   branches/beast-mingw/drivers/bse-portaudio/configure.in
Log:
Sun Aug 27 20:38:09 2006  Stefan Westerfeld  <stefan space twc de>

	* data/bse.pc.in: BSE does require not only gmodule-2.0, but also
	gobject-2.0 : without this change, the portaudio driver doesn't
	compile under windows due to undefined symbols.

	* drivers/bse-portaudio/configure.in: Minor cleanups. Bump version to
	0.7.1.

	* drivers/bse-portaudio/Makefile.am: Add -no-undefined for dll
	building.


Modified: branches/beast-mingw/ChangeLog.win32
===================================================================
--- branches/beast-mingw/ChangeLog.win32	2006-08-26 22:55:21 UTC (rev 3870)
+++ branches/beast-mingw/ChangeLog.win32	2006-08-27 18:40:39 UTC (rev 3871)
@@ -1,3 +1,15 @@
+Sun Aug 27 20:38:09 2006  Stefan Westerfeld  <stefan space twc de>
+
+	* data/bse.pc.in: BSE does require not only gmodule-2.0, but also
+	gobject-2.0 : without this change, the portaudio driver doesn't
+	compile under windows due to undefined symbols.
+
+	* drivers/bse-portaudio/configure.in: Minor cleanups. Bump version to
+	0.7.1.
+
+	* drivers/bse-portaudio/Makefile.am: Add -no-undefined for dll
+	building.
+
 Sun Aug 27 00:53:31 2006  Stefan Westerfeld  <stefan space twc de>
 
 	* plugins/Makefile.plugins: Generate this file again with the new

Modified: branches/beast-mingw/data/bse.pc.in
===================================================================
--- branches/beast-mingw/data/bse.pc.in	2006-08-26 22:55:21 UTC (rev 3870)
+++ branches/beast-mingw/data/bse.pc.in	2006-08-27 18:40:39 UTC (rev 3871)
@@ -15,7 +15,7 @@
 
 Name: BSE
 Description: Bedevilled Sound Engine (Synthesis Core)
-Requires: @BSE_PC_REQUIRE@ gmodule-2.0
+Requires: @BSE_PC_REQUIRE@ gmodule-2.0 gobject-2.0
 Version: @VERSION@
 Libs: -L${libdir} -lbse @BSE_PC_LIBS@
 Cflags: -I${includedir} @BSE_PC_CFLAGS@

Modified: branches/beast-mingw/drivers/bse-portaudio/Makefile.am
===================================================================
--- branches/beast-mingw/drivers/bse-portaudio/Makefile.am	2006-08-26 22:55:21 UTC (rev 3870)
+++ branches/beast-mingw/drivers/bse-portaudio/Makefile.am	2006-08-27 18:40:39 UTC (rev 3871)
@@ -13,7 +13,7 @@
 # extra dependancies
 configure: acbeast.m4
 
-drivers_ldflags     = -avoid-version
+drivers_ldflags     = -avoid-version -no-undefined
 drivers_libs        = $(BSE_LIBS)
 driversdir          = $(bsedriverinstalldir)
 drivers_LTLIBRARIES = bsepcmdevice-portaudio.la

Modified: branches/beast-mingw/drivers/bse-portaudio/configure.in
===================================================================
--- branches/beast-mingw/drivers/bse-portaudio/configure.in	2006-08-26 22:55:21 UTC (rev 3870)
+++ branches/beast-mingw/drivers/bse-portaudio/configure.in	2006-08-27 18:40:39 UTC (rev 3871)
@@ -17,7 +17,7 @@
 AC_DIVERT_BEFORE_HELP([
 PACKAGE_MAJOR_VERSION=0
 PACKAGE_MINOR_VERSION=7
-PACKAGE_MICRO_VERSION=0
+PACKAGE_MICRO_VERSION=1
 PACKAGE_INTERFACE_AGE=0
 PACKAGE_BINARY_AGE=0
 ])
@@ -128,10 +128,10 @@
 AC_DEFUN(AC_PORTAUDIO_CHECK,
 [
     saved_cflags="$CFLAGS"
-    saved_cxxflags="$CXXFLAGS"
+    saved_cppflags="$CPPFLAGS"
     saved_ldflags="$LDFLAGS"
     CFLAGS="$CFLAGS $BSE_CFLAGS" dnl *** automatically search for libportaudio under the BSE prefix
-    CXXFLAGS="$CFLAGS $BSE_CFLAGS"
+    CPPFLAGS="$CFLAGS $BSE_CFLAGS"
     LDFLAGS="$LDFLAGS $BSE_LIBS"
     AC_LANG_SAVE
     AC_LANG_CPLUSPLUS
@@ -163,7 +163,7 @@
 
     AC_LANG_RESTORE
     CFLAGS="$saved_cflags"
-    CXXFLAGS="$saved_cxxflags"
+    CPPFLAGS="$saved_cppflags"
     LDFLAGS="$saved_ldflags"
 ])