diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-05-16 20:26:47 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-05-16 20:26:47 +0000 |
| commit | abc19a8845b0b1e90284325b6e3d5a1664a1d8a5 (patch) | |
| tree | 2640c3a67764f8c19906a616efbffe1c1f2f2008 | |
| parent | 547ce2fd805f6a008df03e6deef215bbb1bb5c65 (diff) | |
* fix installation directory
* bump version numbers for polypaudio 0.9.0
git-svn-id: file:///home/lennart/svn/public/gst-pulse/trunk@29 bb39ca4e-bce3-0310-b5d4-eea78a553289
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | src/Makefile.am | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 3d8fecb..e1728bc 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. AC_PREREQ(2.57) -AC_INIT([gst-polyp],[0.8.1],[mzkzzfcbylc (at) 0pointer (dot) de]) +AC_INIT([gst-polyp],[0.9.0],[mzkzzfcbylc (at) 0pointer (dot) de]) AC_CONFIG_SRCDIR([src/plugin.c]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) @@ -47,10 +47,10 @@ PKG_PROG_PKG_CONFIG if test -d ../polypaudio ; then POLYP_CFLAGS='-I$(top_srcdir)/../polypaudio/src' - POLYP_LIBS='-L$(top_srcdir)/../polypaudio/src/.libs -lpolyp-0.8.1' + POLYP_LIBS='-L$(top_srcdir)/../polypaudio/src/.libs -lpolyp' echo "*** Found polypaudio in ../polypaudio, using that version ***" else - PKG_CHECK_MODULES(POLYP, [ polyplib >= 0.8.1 ]) + PKG_CHECK_MODULES(POLYP, [ polyplib >= 0.9.0 ]) fi AC_SUBST(POLYP_LIBS) @@ -58,8 +58,11 @@ AC_SUBST(POLYP_CFLAGS) PKG_CHECK_MODULES(GST, [ gstreamer-0.10 >= 0.10 gstreamer-plugins-base-0.10 >= 0.10 ]) +GST_MODDIR=`pkg-config --variable=pluginsdir gstreamer-0.10` + AC_SUBST(GST_LIBS) AC_SUBST(GST_CFLAGS) +AC_SUBST(GST_MODDIR) # If using GCC specifiy some additional parameters if test "x$GCC" = "xyes" ; then diff --git a/src/Makefile.am b/src/Makefile.am index 6449aba..24f0f20 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,7 +17,9 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. -pkglib_LTLIBRARIES = libgstpolyp.la +modlibexecdir=$(GST_MODDIR) + +modlibexec_LTLIBRARIES = libgstpolyp.la libgstpolyp_la_SOURCES = \ plugin.c \ @@ -33,7 +35,8 @@ libgstpolyp_la_CFLAGS = $(GST_CFLAGS) $(POLYP_CFLAGS) libgstpolyp_la_LIBADD = $(POLYP_LIBS) $(GST_LIBS) -lgstaudio-0.10 inspect: - gst-inspect polypsink - gst-inspect polypsrc + gst-inspect-0.10 polypsink + gst-inspect-0.10 polypsrc + gst-inspect-0.10 polypmixer .PHONY: inspect |