[xiph-commits] r3570 - in browser_plugin/trunk: . src

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-04-28 18:45:49 -0700 (Mon, 28 Apr 2008)
New Revision: 3570

Modified:
   browser_plugin/trunk/configure.ac
   browser_plugin/trunk/src/Makefile.am
Log:
build fixes, patch from ogg.k.ogg.k


Modified: browser_plugin/trunk/configure.ac
===================================================================
--- browser_plugin/trunk/configure.ac	2008-04-28 20:23:45 UTC (rev 3569)
+++ browser_plugin/trunk/configure.ac	2008-04-29 01:45:49 UTC (rev 3570)
@@ -84,7 +84,7 @@
 		       [Path to XPIDL include dir]))
 
 if test "x$with_xpidl_include" != x -a "x$with_xpidl_include" != xyes -a "x$with_xpidl_include" != xno ; then
-  XPIDL_INCLUDE="$with_xpidl_include"
+  XPIDL_INCLUDE=-I"$with_xpidl_include"
 else
   XPIDL_INCLUDE=-I/usr/share/idl/firefox
 fi

Modified: browser_plugin/trunk/src/Makefile.am
===================================================================
--- browser_plugin/trunk/src/Makefile.am	2008-04-28 20:23:45 UTC (rev 3569)
+++ browser_plugin/trunk/src/Makefile.am	2008-04-29 01:45:49 UTC (rev 3570)
@@ -11,10 +11,10 @@
 	win32/resource.h
 
 AM_CXXFLAGS = -Wall -Wno-non-virtual-dtor -Werror -DXP_UX -DMOZ_X11 -DUSE_AUDIO -shared \
-			-g $(SSE2_CFLAGS) -Wno-strict-aliasing $(OGGZ_CFLAGS) $(OGGPLAY_CFLAGS)
+			-g $(SSE2_CFLAGS) -Wno-strict-aliasing $(OGGZ_CFLAGS) $(LIBOGGPLAY_CFLAGS)
 AM_CFLAGS = -Wall -Werror -DXP_UX -DMOZ_X11 -DUSE_AUDIO -shared \
 			-g $(SSE2_CFLAGS) -Wno-strict-aliasing $(OGGZ_CFLAGS) \
-			$(ALSA_CFLAGS) $(IMLIB2_CFLAGS) $(OGGPLAY_CFLAGS) -Wdeclaration-after-statement
+			$(ALSA_CFLAGS) $(IMLIB2_CFLAGS) $(LIBOGGPLAY_CFLAGS) -Wdeclaration-after-statement
 
 
 INCLUDES=-I$(srcdir)/include -I$(srcdir)/support -I$(srcdir)/audio @GTK_CFLAGS@ @FIREFOX_CFLAGS@