diff options
| author | Colin Guthrie <cguthrie@mandriva.org> | 2009-02-22 16:42:14 +0000 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2009-02-22 16:42:14 +0000 |
| commit | ec2d521629835830db68e875ce30f0ff72beee08 (patch) | |
| tree | 120fdb3e4fb3d27504166b3ae05ab9b1a091535c | |
| parent | 476091245017a1363d34cad0f64cb0116c0c2d26 (diff) | |
Fix the location of pulseaudio libraries now they are in a versioned subfolder
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 3a06eeb..2975e5f 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,10 @@ PKG_CHECK_MODULES(GUILIBS, [ gtkmm-2.4 libglademm-2.4 sigc++-2.0 gconfmm-2.6]) AC_SUBST(GUILIBS_CFLAGS) AC_SUBST(GUILIBS_LIBS) +PKG_CHECK_MODULES(LIBPULSE, libpulse) +LIBPULSE_MODLIBEXECDIR=`pkg-config libpulse --variable modlibexecdir` +AC_SUBST(LIBPULSE_MODLIBEXECDIR) + # If using GCC specifiy some additional parameters if test "x$GCC" = "xyes" ; then CFLAGS="$CFLAGS -pipe -Wall -W -Wno-unused-parameter" diff --git a/src/Makefile.am b/src/Makefile.am index aefae87..a0f206e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,8 +31,7 @@ paprefs_SOURCES=paprefs.cc paprefs_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) paprefs_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) -paprefs_CXXFLAGS+=-DGLADE_FILE=\"$(gladedir)/paprefs.glade\" -DLOCALEDIR=\"$(localedir)\" -DMODULESDIR=\""${libdir}/pulse-0.9/modules/"\" -DSHREXT=\"$(SHREXT)\" -#paprefs_CXXFLAGS+=-DGLADE_FILE=\"$(gladedir)/paprefs.glade\" -DLOCALEDIR=\"$(localedir)\" -DMODULESDIR=\""/usr/local/lib/pulse-0.9/modules/"\" -DSHREXT=\"$(SHREXT)\" +paprefs_CXXFLAGS+=-DGLADE_FILE=\"$(gladedir)/paprefs.glade\" -DLOCALEDIR=\"$(localedir)\" -DMODULESDIR=\""$(LIBPULSE_MODLIBEXECDIR)"\" -DSHREXT=\"$(SHREXT)\" EXTRA_DIST = $(glade_DATA) $(desktop_in_files) |