build system changes for newer autotools

* autoconf 2.61 required
* bootstrapping: autoreconf -i
* pkg-config file added

13 files changed, 154 insertions, 40 deletions

diff --git a/orkbasecxx/Makefile.am b/orkbasecxx/Makefile.am
index 8849d23..3087887 100644
--- a/orkbasecxx/Makefile.am
+++ b/orkbasecxx/Makefile.am
@@ -2,10 +2,12 @@
 # have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = foreign 1.4
 
+SUBDIRS			= messages serializers audiofile filters
 
-lib_LTLIBRARIES = liborkbase.la
-liborkbase_la_LDFLAGS =  
-liborkbase_la_SOURCES = Filter.cpp g711.c \
+lib_LTLIBRARIES		= liborkbase.la
+liborkbase_la_LDFLAGS	=  
+liborkbase_la_SOURCES	= \
+			Filter.cpp g711.c \
 			OrkBase.cpp Object.cpp ObjectFactory.cpp \
 			OrkClient.cpp AudioCapture.cpp Utils.cpp  \
 			AudioTape.cpp \
@@ -16,10 +18,43 @@ liborkbase_la_SOURCES = Filter.cpp g711.c \
 			Daemon.cpp ImmediateProcessing.cpp \
 			Reporting.cpp TapeFileNaming.cpp \
 			PartyFilter.cpp EventStreaming.cpp \
-			OrkTrack.cpp
-#INCLUDES = -I/projects/ext/xmlrpc++/xmlrpc++0.7/src
-SUBDIRS = messages serializers audiofile filters
-liborkbase_la_LIBADD = $(top_builddir)/serializers/libserializers.la \
+			OrkTrack.cpp \
+			AudioCapture.h AudioCapturePlugin.h \
+			BatchProcessing.h \
+			CapturePluginProxy.h CapturePort.h \
+			Config.h ConfigManager.h Daemon.h \
+			EventStreaming.h Filter.h ImmediateProcessing.h \
+			LogManager.h MultiThreadedServer.h \
+			Object.h ObjectFactory.h OrkBase.h \
+			OrkClient.h PartyFilter.h Reporting.h \
+			TapeFileNaming.h TapeProcessor.h \
+			Utils.h config.h
+
+nobase_pkginclude_HEADERS	= \
+	audiofile/AudioFile.h \
+	filters/audiogain/AudioGain.h \
+	messages/TapeMsg.h messages/PingMsg.h messages/DeleteTapeMsg.h \
+	messages/CaptureMsg.h messages/TestMsg.h messages/RecordMsg.h \
+	messages/SyncMessage.h messages/AsyncMessage.h \
+	messages/Message.h \
+	serializers/Serializer.h
+pkginclude_HEADERS	= \
+	AudioCapture.h Config.h MultiThreadedServer.h Object.h OrkBase.h \
+	g711.h MemUtils.h dll.h Utils.h \
+	LogManager.h ImmediateProcessing.h BatchProcessing.h Reporting.h \
+	TapeFileNaming.h ConfigManager.h Daemon.h ObjectFactory.h \
+	CapturePluginProxy.h AudioCapturePlugin.h Filter.h \
+	TapeProcessor.h EventStreaming.h \
+	StdString.h ThreadSafeQueue.h AudioTape.h \
+	filters/ilbc/IlbcFilters.h \
+	filters/ilbc/ilbc/iLBC_decode.h \
+	filters/ilbc/ilbc/iLBC_encode.h \
+	filters/ilbc/ilbc/iLBC_define.h \
+	filters/gsm/GsmFilters.h filters/gsm/gsm610/gsm.h \
+	filters/g722codec/G722.h filters/g722codec/G722Codec.h
+
+liborkbase_la_LIBADD	= \
+	$(top_builddir)/serializers/libserializers.la \
 	$(top_builddir)/messages/libmessages.la \
 	$(top_builddir)/audiofile/libaudiofile.la \
         $(top_builddir)/filters/gsm/libgsm.la \
@@ -30,4 +65,6 @@ liborkbase_la_LIBADD = $(top_builddir)/serializers/libserializers.la \
 	$(top_builddir)/filters/g722codec/libg722codec.la
 	-lm
 
-AM_CXXFLAGS = -D_REENTRANT
+AM_CXXFLAGS	= -D_REENTRANT
+pkgconfigdir	= $(libdir)/pkgconfig
+pkgconfig_DATA	= orkbase-1.0.pc
diff --git a/orkbasecxx/audiofile/Makefile.am b/orkbasecxx/audiofile/Makefile.am
index d737e11..c6650b3 100644
--- a/orkbasecxx/audiofile/Makefile.am
+++ b/orkbasecxx/audiofile/Makefile.am
@@ -1,6 +1,10 @@
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libaudiofile.la
-libaudiofile_la_SOURCES = MediaChunkFile.cpp AudioFile.cpp  LibSndFileFile.cpp  PcmFile.cpp
+libaudiofile_la_SOURCES = \
+			MediaChunkFile.cpp AudioFile.cpp \
+			LibSndFileFile.cpp PcmFile.cpp \
+			AudioFile.h LibSndFileFile.h \
+			MediaChunkFile.h PcmFile.h
 AM_CPPFLAGS = -D_REENTRANT
 libaudiofile_la_LIBADD = 
-INCLUDES = -I@top_srcdir@ -I../../orkbasecxx 
+INCLUDES = -I$(top_srcdir) -I../../orkbasecxx 
diff --git a/orkbasecxx/configure.ac b/orkbasecxx/configure.ac
new file mode 100644
index 0000000..f5a14e0
--- /dev/null
+++ b/orkbasecxx/configure.ac
@@ -0,0 +1,60 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.61])
+AC_INIT([orkbase], [1.0], [oreka@orex.com])
+AC_CONFIG_SRCDIR([LogManager.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_AWK
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_RANLIB
+AC_PROG_LIBTOOL
+
+# Checks for libraries.
+AC_CHECK_LIB([m], [cos])
+
+# Checks for header files.
+AC_CHECK_HEADERS([inttypes.h malloc.h memory.h stdlib.h string.h wchar.h wctype.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+AC_C_INLINE
+AC_TYPE_INT16_T
+AC_TYPE_INT32_T
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_UINT8_T
+
+# Checks for library functions.
+AC_FUNC_ALLOCA
+AC_FUNC_CHOWN
+AC_FUNC_ERROR_AT_LINE
+AC_FUNC_FORK
+AC_FUNC_MALLOC
+AC_FUNC_STRTOD
+AC_CHECK_FUNCS([gethrtime localtime_r memchr memmove memset mkdir pow sqrt strchr strerror strncasecmp strstr strtol strtoul])
+
+AC_CONFIG_FILES([Makefile
+                 audiofile/Makefile
+                 filters/Makefile
+                 filters/audiogain/Makefile
+                 filters/g722codec/Makefile
+                 filters/gsm/Makefile
+                 filters/gsm/gsm610/Makefile
+                 filters/ilbc/Makefile
+                 filters/ilbc/ilbc/Makefile
+                 messages/Makefile
+                 serializers/Makefile
+		 orkbase-1.0.pc])
+AC_OUTPUT
diff --git a/orkbasecxx/configure.in b/orkbasecxx/configure.in
deleted file mode 100644
index 9a510f1..0000000
--- a/orkbasecxx/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-AC_INIT(configure.in)
-
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(orkbase, 1.0)
-
-AC_PREFIX_DEFAULT(/usr)
-
-AC_LANG_CPLUSPLUS
-AC_PROG_CXX
-AM_PROG_LIBTOOL
-
-AC_OUTPUT(Makefile messages/Makefile serializers/Makefile audiofile/Makefile filters/Makefile filters/gsm/Makefile filters/gsm/gsm610/Makefile filters/ilbc/Makefile filters/ilbc/ilbc/Makefile filters/audiogain/Makefile filters/g722codec/Makefile)
diff --git a/orkbasecxx/filters/audiogain/Makefile.am b/orkbasecxx/filters/audiogain/Makefile.am
index 2c377b5..2eee8e6 100644
--- a/orkbasecxx/filters/audiogain/Makefile.am
+++ b/orkbasecxx/filters/audiogain/Makefile.am
@@ -1,6 +1,6 @@
-METASOURCES = AUTO
-noinst_LTLIBRARIES = libaudiogain.la
-libaudiogain_la_SOURCES = AudioGain.cpp
+METASOURCES		= AUTO
+noinst_LTLIBRARIES	= libaudiogain.la
+libaudiogain_la_SOURCES	= AudioGain.cpp
 
-INCLUDES = -I@top_srcdir@
-AM_CXXFLAGS = -D_REENTRANT
+AM_CPPFLAGS		= -I$(top_srcdir)
+AM_CXXFLAGS		= -D_REENTRANT
diff --git a/orkbasecxx/filters/g722codec/Makefile.am b/orkbasecxx/filters/g722codec/Makefile.am
index 9ff6ccf..9d9f66d 100644
--- a/orkbasecxx/filters/g722codec/Makefile.am
+++ b/orkbasecxx/filters/g722codec/Makefile.am
@@ -1,7 +1,7 @@
 METASOURCES = AUTO
 SUBDIRS =  
 noinst_LTLIBRARIES = libg722codec.la
-libg722codec_la_SOURCES = G722Codec.cpp
+libg722codec_la_SOURCES = G722Codec.cpp G722.h G722Codec.h
 
-INCLUDES = -I@top_srcdir@ -I../..
+INCLUDES = -I$(top_srcdir) -I../..
 AM_CXXFLAGS = -D_REENTRANT
diff --git a/orkbasecxx/filters/gsm/Makefile.am b/orkbasecxx/filters/gsm/Makefile.am
index 26be37b..03de1a3 100644
--- a/orkbasecxx/filters/gsm/Makefile.am
+++ b/orkbasecxx/filters/gsm/Makefile.am
@@ -1,7 +1,7 @@
 METASOURCES = AUTO
 SUBDIRS = gsm610
 noinst_LTLIBRARIES = libgsm.la
-libgsm_la_SOURCES = GsmFilters.cpp 
+libgsm_la_SOURCES = GsmFilters.cpp GsmFilters.h
 
-INCLUDES = -I@top_srcdir@ -I./gsm610
+INCLUDES = -I$(top_srcdir) -I$(srcdir)/gsm610
 AM_CXXFLAGS = -D_REENTRANT
diff --git a/orkbasecxx/filters/gsm/gsm610/Makefile.am b/orkbasecxx/filters/gsm/gsm610/Makefile.am
index aba1767..6f9490f 100644
--- a/orkbasecxx/filters/gsm/gsm610/Makefile.am
+++ b/orkbasecxx/filters/gsm/gsm610/Makefile.am
@@ -3,7 +3,8 @@ noinst_LTLIBRARIES = libgsm610.la
 libgsm610_la_SOURCES = 	add.c code.c decode.c gsm_create.c gsm_decode.c \
 			gsm_destroy.c gsm_encode.c gsm_option.c \
 			long_term.c lpc.c preprocess.c rpe.c \
-			short_term.c table.c
+			short_term.c table.c \
+			config.h gsm.h gsm610_priv.h
 
-INCLUDES = -I@top_srcdir@
+INCLUDES = -I$(top_srcdir)
 AM_CFLAGS = -D_REENTRANT
diff --git a/orkbasecxx/filters/ilbc/Makefile.am b/orkbasecxx/filters/ilbc/Makefile.am
index c9a8f58..43fb2da 100644
--- a/orkbasecxx/filters/ilbc/Makefile.am
+++ b/orkbasecxx/filters/ilbc/Makefile.am
@@ -1,7 +1,7 @@
 METASOURCES = AUTO
 SUBDIRS = ilbc
 noinst_LTLIBRARIES = libilbc.la
-libilbc_la_SOURCES = IlbcFilters.cpp
+libilbc_la_SOURCES = IlbcFilters.cpp IlbcFilters.h
 
-INCLUDES = -I@top_srcdir@ -I./ilbc
+INCLUDES = -I$(top_srcdir) -I$(srcdir)/ilbc
 AM_CXXFLAGS = -D_REENTRANT
diff --git a/orkbasecxx/filters/ilbc/ilbc/Makefile.am b/orkbasecxx/filters/ilbc/ilbc/Makefile.am
index 3d6a240..ee34f26 100644
--- a/orkbasecxx/filters/ilbc/ilbc/Makefile.am
+++ b/orkbasecxx/filters/ilbc/ilbc/Makefile.am
@@ -4,7 +4,13 @@ libilbcrfc_la_SOURCES =  anaFilter.c iCBSearch.c packing.c \
 	constants.c gainquant.c iLBC_decode.c StateConstructW.c \
 	createCB.c getCBvec.c iLBC_encode.c StateSearchW.c doCPLC.c \
 	helpfun.c syntFilter.c enhancer.c hpInput.c LPCdecode.c \
-	iLBC_filter.c hpOutput.c LPCencode.c FrameClassify.c  iCBConstruct.c lsf.c
+	iLBC_filter.c hpOutput.c LPCencode.c FrameClassify.c \
+	iCBConstruct.c lsf.c \
+	FrameClassify.h LPCdecode.h LPCencode.h StateConstructW.h \
+	StateSearchW.h anaFilter.h constants.h createCB.h doCPLC.h \
+	enhancer.h filter.h gainquant.h getCBvec.h helpfun.h hpInput.h \
+	hpOutput.h iCBConstruct.h iCBSearch.h iLBC_decode.h iLBC_define.h \
+	iLBC_encode.h lsf.h packing.h syntFilter.h
 
-INCLUDES = -I@top_srcdir@
+INCLUDES = -I$(top_srcdir)
 AM_CFLAGS = -D_REENTRANT
diff --git a/orkbasecxx/messages/Makefile.am b/orkbasecxx/messages/Makefile.am
index 7504a1c..4d81cb3 100644
--- a/orkbasecxx/messages/Makefile.am
+++ b/orkbasecxx/messages/Makefile.am
@@ -2,8 +2,12 @@ METASOURCES = AUTO
 noinst_LTLIBRARIES = libmessages.la
 libmessages_la_SOURCES = AsyncMessage.cpp Message.cpp \
 	SyncMessage.cpp CaptureMsg.cpp DeleteTapeMsg.cpp \
-	PingMsg.cpp TapeMsg.cpp RecordMsg.cpp InitMsg.cpp
+	PingMsg.cpp TapeMsg.cpp RecordMsg.cpp InitMsg.cpp \
+	PingMsg.cpp TapeMsg.cpp RecordMsg.cpp \
+	AsyncMessage.h CaptureMsg.h DeleteTapeMsg.h \
+	Message.h PingMsg.h RecordMsg.h SyncMessage.h \
+	TapeMsg.h TestMsg.h
 
 #libmessages_la_LIBADD = -L/projects/ext/xmlrpc++/xmlrpc++0.7/ -lXmlRpc
-INCLUDES = -I@top_srcdir@ -I../../orkaudio
+INCLUDES = -I$(top_srcdir) -I../../orkaudio
 AM_CXXFLAGS = -D_REENTRANT
diff --git a/orkbasecxx/orkbase-1.0.pc.in b/orkbasecxx/orkbase-1.0.pc.in
new file mode 100644
index 0000000..c5f447a
--- /dev/null
+++ b/orkbasecxx/orkbase-1.0.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+pkgincludedir=${includedir}/orkbase
+
+Name:		orkbase
+Description:	Base libraries for Oreka recording system
+Version:	@VERSION@
+URL:		https://oreka.svn.sourceforge.net/svnroot/oreka/trunk/orkbasecxx
+#Requires: ACE	# Don't have pkg-config support yet...
+Libs: -L${libdir} -lACE -lorkbase
+Cflags: -I${pkgincludedir}
+
diff --git a/orkbasecxx/serializers/Makefile.am b/orkbasecxx/serializers/Makefile.am
index 33bd167..b0c29d6 100644
--- a/orkbasecxx/serializers/Makefile.am
+++ b/orkbasecxx/serializers/Makefile.am
@@ -5,6 +5,6 @@ libserializers_la_SOURCES = DomSerializer.cpp DomSerializer.h Serializer.cpp\
 	UrlSerializer.cpp UrlSerializer.h XmlRpcSerializer.cpp\
 	XmlRpcSerializer.h
 #libserializers_la_LIBADD = -L/projects/ext/xmlrpc++/xmlrpc++0.7/ -lXmlRpc
-INCLUDES = -I@top_srcdir@
+INCLUDES = -I$(top_srcdir)
 
 AM_CXXFLAGS = -D_REENTRANT