build system changes for newer autotools: orkaudio

* autoconf 2.61 required
* bootstrapping: autoreconf -i

8 files changed, 96 insertions, 48 deletions

diff --git a/orkaudio/Makefile.am b/orkaudio/Makefile.am
index c475d4c..aa8fe77 100644
--- a/orkaudio/Makefile.am
+++ b/orkaudio/Makefile.am
@@ -3,23 +3,24 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-sbin_PROGRAMS = orkaudio
-orkaudio_LDADD =
-orkaudio_LDFLAGS = -lACE -lxerces-c -llog4cxx -lorkbase -lsndfile
-orkaudio_SOURCES = 	OrkAudio.cpp
-AM_CPPFLAGS = -D_REENTRANT
-INCLUDES = -I@top_srcdir@ -I../orkbasecxx -I../orkbasecxx/filters/gsm -I../orkbasecxx/filters/gsm/gsm610 -I../orkbasecxx/filters/ilbc -I../orkbasecxx/filters/ilbc/ilbc -I../orkbasecxx/filters/audiogain -I../orkbasecxx/filters/g722codec
-SUBDIRS = audiocaptureplugins filters
+sbin_PROGRAMS		= orkaudio
+orkaudio_LDADD		=
+orkaudio_LDFLAGS	= $(ORKBASE_LIBS) -lxerces-c -llog4cxx -lsndfile
+orkaudio_SOURCES	= OrkAudio.cpp OrkAudio.h App.h
+AM_CPPFLAGS = -D_REENTRANT -I$(top_srcdir) $(ORKBASE_CFLAGS)
+SUBDIRS		= audiocaptureplugins filters
+#DIST_SUBDIRS	= messages
 #orkaudio_LDADD = $(top_builddir)/messages/libmessages.la 
 
-orkaudioconfdir = /etc/orkaudio
+orkaudioconfdir = $(sysconfdir)/orkaudio
 orkaudioconf_DATA = \
 	logging-linux-template.properties \
 	config-linux-template.xml
-install-orkaudioconfDATA:
-	mkdir -p /etc/orkaudio
-	cp logging-linux-template.properties /etc/orkaudio/logging.properties
-	cp config-linux-template.xml /etc/orkaudio/config.xml
-	mkdir -p /var/log/orkaudio
 
+EXTRA_DIST	= $(orkaudioconf_DATA)
+
+orkaudiologdir = /var/log/orkaudio
+
+install-exec-hook:
+	mkdir -p $(DESTDIR)/$(orkaudiologdir)
 
diff --git a/orkaudio/audiocaptureplugins/Makefile.am b/orkaudio/audiocaptureplugins/Makefile.am
index bc31197..0ac6a45 100644
--- a/orkaudio/audiocaptureplugins/Makefile.am
+++ b/orkaudio/audiocaptureplugins/Makefile.am
@@ -1,2 +1,4 @@
 METASOURCES = AUTO
 SUBDIRS = generator voip
+
+EXTRA_DIST	= common/AudioCapturePluginCommon.h
diff --git a/orkaudio/audiocaptureplugins/generator/Makefile.am b/orkaudio/audiocaptureplugins/generator/Makefile.am
index 44624f8..0cf4ae5 100644
--- a/orkaudio/audiocaptureplugins/generator/Makefile.am
+++ b/orkaudio/audiocaptureplugins/generator/Makefile.am
@@ -1,10 +1,11 @@
 METASOURCES = AUTO
-lib_LTLIBRARIES = libgenerator.la
+plugindir		= @ORKAUDIO_PLUGINS_DIR@
+plugin_LTLIBRARIES	= libgenerator.la
 libgenerator_la_SOURCES = GeneratorConfig.cpp Generator.cpp \
-	AudioCapturePluginCommon.cpp
-libgenerator_la_LDFLAGS = -module
+	AudioCapturePluginCommon.cpp GeneratorConfig.h
+libgenerator_la_LDFLAGS = -module -avoid-version
 AM_CPPFLAGS = -D_REENTRANT
-libgenerator_la_LIBADD = -lACE -lxerces-c -llog4cxx -lorkbase 
-INCLUDES = -I@top_srcdir@ -I../../../orkbasecxx -I../common
+libgenerator_la_LIBADD = $(ORKBASE_LIBS) -lxerces-c -llog4cxx
+INCLUDES = -I$(top_srcdir) $(ORKBASE_CFLAGS) -I$(srcdir)/../common
 AudioCapturePluginCommon.cpp:
-	ln -s ../common/AudioCapturePluginCommon.cpp AudioCapturePluginCommon.cpp
+	ln -s $(srcdir)/../common/AudioCapturePluginCommon.cpp AudioCapturePluginCommon.cpp
diff --git a/orkaudio/audiocaptureplugins/voip/Makefile.am b/orkaudio/audiocaptureplugins/voip/Makefile.am
index a415ade..3fe1e6c 100644
--- a/orkaudio/audiocaptureplugins/voip/Makefile.am
+++ b/orkaudio/audiocaptureplugins/voip/Makefile.am
@@ -1,10 +1,13 @@
-METASOURCES = AUTO
-lib_LTLIBRARIES = libvoip.la
-libvoip_la_SOURCES = VoIpConfig.cpp VoIp.cpp Rtp.cpp Iax2Session.cpp RtpSession.cpp \
-	SipTcp.cpp AudioCapturePluginCommon.cpp PacketHeaderDefs.cpp
-libvoip_la_LDFLAGS = -module
-AM_CPPFLAGS = -D_REENTRANT
-libvoip_la_LIBADD = -lACE -lxerces-c -llog4cxx -lorkbase -lpcap
-INCLUDES = -I@top_srcdir@ -I../../../orkbasecxx -I../common
+METASOURCES		= AUTO
+plugindir		= @ORKAUDIO_PLUGINS_DIR@
+plugin_LTLIBRARIES	= libvoip.la
+libvoip_la_SOURCES	= VoIpConfig.cpp VoIp.cpp Rtp.cpp Iax2Session.cpp RtpSession.cpp \
+	SipTcp.cpp AudioCapturePluginCommon.cpp PacketHeaderDefs.cpp \
+	Iax2Session.h PacketHeaderDefs.h Rtp.h RtpSession.h SipTcp.h VoIpConfig.h
+libvoip_la_LDFLAGS	= -module -avoid-version
+AM_CPPFLAGS		= -D_REENTRANT
+libvoip_la_LIBADD	= $(ORKBASE_LIBS) -lxerces-c -llog4cxx -lpcap
+
+INCLUDES		= -I$(top_srcdir) $(ORKBASE_CFLAGS) -I$(srcdir)/../common
 AudioCapturePluginCommon.cpp:
-	ln -s ../common/AudioCapturePluginCommon.cpp AudioCapturePluginCommon.cpp
+	ln -s $(srcdir)/../common/AudioCapturePluginCommon.cpp AudioCapturePluginCommon.cpp
diff --git a/orkaudio/configure.ac b/orkaudio/configure.ac
new file mode 100644
index 0000000..4925a03
--- /dev/null
+++ b/orkaudio/configure.ac
@@ -0,0 +1,54 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.61])
+AC_INIT([orkaudio], [1.0], [oreka@orex.com])
+AC_CONFIG_SRCDIR([OrkAudio.cpp])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_AUX_DIR([autotools])
+AM_INIT_AUTOMAKE
+
+AC_PREFIX_DEFAULT([/usr])
+
+# Checks for programs.
+AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_LN_S
+AC_PROG_LIBTOOL
+
+# Checks for libraries.
+PKG_CHECK_MODULES([ORKBASE], [orkbase-1.0])
+# FIXME: Replace `main' with a function in `-lACE':
+AC_CHECK_LIB([ACE], [main])
+# FIXME: Replace `main' with a function in `-llog4cxx':
+AC_CHECK_LIB([log4cxx], [main])
+# FIXME: Replace `main' with a function in `-lpcap':
+AC_CHECK_LIB([pcap], [main])
+# FIXME: Replace `main' with a function in `-lsndfile':
+AC_CHECK_LIB([sndfile], [main])
+
+# Checks for header files.
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+AC_C_INLINE
+AC_TYPE_SIZE_T
+
+# Checks for library functions.
+AC_FUNC_ERROR_AT_LINE
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
+AC_CHECK_FUNCS([gettimeofday localtime_r memchr memset strchr strncasecmp strstr])
+
+AC_CONFIG_FILES([Makefile
+                 audiocaptureplugins/Makefile
+                 audiocaptureplugins/generator/Makefile
+                 audiocaptureplugins/voip/Makefile
+                 filters/Makefile
+                 filters/rtpmixer/Makefile
+                 ])
+
+ORKAUDIO_PLUGINS_DIR=${libdir}/orkaudio/plugins
+AC_SUBST(ORKAUDIO_PLUGINS_DIR)
+
+AC_OUTPUT
diff --git a/orkaudio/configure.in b/orkaudio/configure.in
deleted file mode 100644
index ab8d145..0000000
--- a/orkaudio/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-AC_INIT(configure.in)
-
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(orkaudio, 1.0)
-
-AC_LANG_CPLUSPLUS
-AC_PROG_CXX
-AM_PROG_LIBTOOL
-
-AC_PREFIX_DEFAULT(/usr)
-
-AC_OUTPUT(Makefile audiocaptureplugins/Makefile audiocaptureplugins/generator/Makefile audiocaptureplugins/voip/Makefile filters/Makefile filters/rtpmixer/Makefile)
diff --git a/orkaudio/filters/rtpmixer/Makefile.am b/orkaudio/filters/rtpmixer/Makefile.am
index a5dffcc..e797c9b 100644
--- a/orkaudio/filters/rtpmixer/Makefile.am
+++ b/orkaudio/filters/rtpmixer/Makefile.am
@@ -1,10 +1,9 @@
 METASOURCES = AUTO
-plugindir= $(prefix)/lib/orkaudio/plugins
+plugindir = @ORKAUDIO_PLUGINS_DIR@
 plugin_LTLIBRARIES = librtpmixer.la
 librtpmixer_la_SOURCES = RtpMixer.cpp 
-librtpmixer_la_LDFLAGS = -module
+librtpmixer_la_LDFLAGS = -module -avoid-version
 AM_CPPFLAGS = -D_REENTRANT
-librtpmixer_la_LIBADD = -lACE -lxerces-c -llog4cxx -lorkbase
-INCLUDES = -I@top_srcdir@ -I../../../orkbasecxx -I../common
-all-local: librtpmixer.la
-	cp .libs/librtpmixer.so.0.0.0 ../../plugins/librtpmixer.so
+librtpmixer_la_LIBADD = $(ORKBASE_LIBS) -lxerces-c -llog4cxx
+
+INCLUDES = -I$(top_srcdir) $(ORKBASE_CFLAGS) -I../common
diff --git a/orkaudio/messages/Makefile.am b/orkaudio/messages/Makefile.am
index f6c5305..e3c2225 100644
--- a/orkaudio/messages/Makefile.am
+++ b/orkaudio/messages/Makefile.am
@@ -3,5 +3,5 @@ noinst_LTLIBRARIES = libmessages.la
 libmessages_la_SOURCES = CaptureMsg.cpp  DeleteTapeMsg.cpp  PingMsg.cpp  \
 			TapeMsg.cpp TestMsg.cpp RecordMsg.cpp
 AM_CPPFLAGS = -D_REENTRANT
-libmessages_la_LIBADD = -L../../orkbasecxx/ -lorkbase
-INCLUDES = -I@top_srcdir@ -I../../orkbasecxx
+libmessages_la_LIBADD = $(ORKBASE_LIBS)
+INCLUDES = -I$(top_srcdir) $(ORKBASE_CFLAGS)