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

[j at svn.annodex.net]

Author: j
Date: 2008-02-17 23:27:29 -0800 (Sun, 17 Feb 2008)
New Revision: 3484

Modified:
   browser_plugin/trunk/configure.ac
   browser_plugin/trunk/src/Makefile.am
Log:
define LIBDIR, add libFLAC to static libs since libfishsound depends on it.



Modified: browser_plugin/trunk/configure.ac
===================================================================
--- browser_plugin/trunk/configure.ac	2008-02-18 06:53:19 UTC (rev 3483)
+++ browser_plugin/trunk/configure.ac	2008-02-18 07:27:29 UTC (rev 3484)
@@ -211,15 +211,16 @@
 AC_SUBST(SHLIB_VERSION_ARG)
 AC_SUBST(SHARED_VERSION_INFO)
 
+
+AS_AC_EXPAND(LIBDIR, ${libdir})
+AS_AC_EXPAND(INCLUDEDIR, ${includedir})
+AS_AC_EXPAND(BINDIR, ${bindir})
+
 AC_OUTPUT([
 Makefile
 src/Makefile
 ])
 
-AS_AC_EXPAND(LIBDIR, ${libdir})
-AS_AC_EXPAND(INCLUDEDIR, ${includedir})
-AS_AC_EXPAND(BINDIR, ${bindir})
-
 AC_MSG_RESULT([
 ------------------------------------------------------------------------
   $PACKAGE $VERSION:  Automatic configuration OK.

Modified: browser_plugin/trunk/src/Makefile.am
===================================================================
--- browser_plugin/trunk/src/Makefile.am	2008-02-18 06:53:19 UTC (rev 3483)
+++ browser_plugin/trunk/src/Makefile.am	2008-02-18 07:27:29 UTC (rev 3484)
@@ -20,7 +20,7 @@
 
 INCLUDES=-I$(srcdir)/include -I$(srcdir)/support -I$(srcdir)/audio @GTK_CFLAGS@ @FIREFOX_CFLAGS@
 
-LIBOGGPLAY_STATICLIBS = $(LIBDIR)/liboggplay.a $(LIBDIR)/liboggz.a $(LIBDIR)/libtheora.a $(LIBDIR)/libfishsound.a $(LIBDIR)/libvorbis.a $(LIBDIR)/libvorbisenc.a $(LIBDIR)/libspeex.a $(LIBDIR)/libogg.a $(LIBDIR)/libImlib2.a
+LIBOGGPLAY_STATICLIBS = @LIBDIR@/liboggplay.a @LIBDIR@/liboggz.a @LIBDIR@/libtheora.a @LIBDIR@/libfishsound.a @LIBDIR@/libvorbis.a @LIBDIR@/libvorbisenc.a @LIBDIR@/libspeex.a @LIBDIR@/libFLAC.a @LIBDIR@/libogg.a @LIBDIR@/libImlib2.a
 
 plugin_libs=libnpoggplugin.la  libnpoggplugin_dynamic.la