From ecf024d66edf10ea6098de1129af08b25e527bb5 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 20 Aug 2004 10:55:54 +0000
Subject: build fixes

git-svn-id: file:///home/lennart/svn/public/paman/trunk@19 cdefa82f-4ce1-0310-97f5-ab6066f37c3c
---
 configure.ac       | 6 +++++-
 doc/README.html.in | 2 +-
 src/Makefile.am    | 4 +++-
 src/paman.hh       | 2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0f1c7aa..d8837ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,10 @@ fi
 
 # Checks for programs.
 AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_LN_S
+AC_TYPE_SIGNAL
+AC_HEADER_STDC
 
 PKG_CHECK_MODULES(GUILIBS, [ gtkmm-2.4 libglademm-2.4 ])
 AC_SUBST(GUILIBS_CFLAGS)
@@ -44,7 +48,7 @@ if test -d ../polypaudio ; then
    POLYP_LIBS='-L$(top_srcdir)/../polypaudio/polyp/.libs -lpolyp -lpolyp-mainloop-glib -lpolyp-mainloop-glib -lpolyp-error'
    echo "*** Found polypaudio in ../polypaudio, using that version ***"
 else
-   PKG_CHECK_MODULES(POLYP, [ polyplib polyplib-mainloop polyplib-mainloop-glib polyplib-error ])
+   PKG_CHECK_MODULES(POLYP, [ polyplib polyplib-mainloop polyplib-glib-mainloop polyplib-error ])
 fi
 
 AC_SUBST(POLYP_LIBS)
diff --git a/doc/README.html.in b/doc/README.html.in
index 63ee6fb..ae8c886 100644
--- a/doc/README.html.in
+++ b/doc/README.html.in
@@ -76,7 +76,7 @@ source code configuration.</p>
 
 <p><tt>paman</tt> requires <a href="http://gtkmm.sf.net/"><tt>gtkmm</tt></a> and <tt>glademmm</tt> installed.</p>
 
-<p>Obviously <tt>paman</tt> requires an installation of <tt>polypaudio</tt>.</p>
+<p>Obviously <tt>paman</tt> requires an installation of <tt>polypaudio</tt> (version 0.2).</p>
  
 <h2><a name="installation">Installation</a></h2>
 
diff --git a/src/Makefile.am b/src/Makefile.am
index d374193..51137a9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,8 @@
 
 bin_PROGRAMS=paman
 
+dist_pkgdata_DATA=paman.glade
+
 paman_SOURCES=MainWindow.cc MainWindow.hh \
 	SinkWindow.cc SinkWindow.hh \
 	SourceWindow.cc SourceWindow.hh \
@@ -14,4 +16,4 @@ paman_SOURCES=MainWindow.cc MainWindow.hh \
 	SampleWindow.cc SampleWindow.hh
 
 paman_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(POLYP_LIBS)
-paman_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(POLYP_CFLAGS) 
+paman_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(POLYP_CFLAGS) -DGLADE_FILE=\"$(pkgdatadir)/paman.glade\"
diff --git a/src/paman.hh b/src/paman.hh
index 05e1815..c80cc42 100644
--- a/src/paman.hh
+++ b/src/paman.hh
@@ -3,7 +3,9 @@
 
 #include "ServerInfoManager.hh"
 
+#ifndef GLADE_FILE
 #define GLADE_FILE "paman.glade"
+#endif
 
 extern ServerInfoManager *serverInfoManager;
 extern MainWindow *mainWindow;
-- 
cgit