bug 1337:

Make it build well on OS-X and take care that correct distribution is made.

SAS/OTDB/configure.in

@@ -53,8 +53,8 @@ dnl
 lofar_GENERAL
 lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypes.h,,)
 lofar_EXTERNAL(boost,1,boost/date_time/date.hpp, boost_date_time)
-lofar_EXTERNAL(pqxx,2.5.5,pqxx/pqxx, pqxx)
-lofar_EXTERNAL(pq,,libpq-fe.h, pq, /usr/local/pgsql)
+lofar_EXTERNAL(pqxx,1,pqxx/pqxx, pqxx)
+lofar_EXTERNAL(pq,1,libpq-fe.h, pq, "/usr/local/pgsql /Library/PostgreSQL/8.3")
 
 dnl
 dnl Output Makefiles

SAS/OTDB/include/OTDB/Makefile.am

@@ -15,9 +15,9 @@ pkginclude_HEADERS 	= Package__Version.h  	Converter.h \
 				misc.h \
 				OTDBconnection.h \
 				TreeMaintenance.h \
-				TreeValue.h
+				TreeValue.h 
 
-NOINSTHDRS 	= 	wSpaceSplit.h\
+noinst_HEADERS	 	= 	wSpaceSplit.h \
 				OTDBaction.h \
 				OTDBactionList.h \
 				OTDBcontrol.h \

SAS/OTDB/test/tConnection.cc

@@ -32,6 +32,7 @@
 #include <OTDB/TreeState.h>
 #include <OTDB/TreeStateConv.h>
 #include <OTDB/TreeMaintenance.h>
+#include <libgen.h>             // for basename
 
 using namespace LOFAR;
 using namespace LOFAR::OTDB;

SAS/OTDB/test/tConverter.cc

@@ -29,6 +29,7 @@
 #include <Common/lofar_datetime.h>
 #include <OTDB/OTDBconnection.h>
 #include <OTDB/ParamTypeConv.h>
+#include <libgen.h>             // for basename
 
 using namespace LOFAR;
 using namespace LOFAR::OTDB;

SAS/OTDB/test/tPICtree.cc

@@ -34,6 +34,7 @@
 #include <OTDB/OTDBparam.h>
 #include <OTDB/TreeStateConv.h>
 #include <OTDB/ClassifConv.h>
+#include <libgen.h>             // for basename
 
 using namespace LOFAR;
 using namespace LOFAR::OTDB;

SAS/OTDB/test/tPICvalue.cc

@@ -35,6 +35,7 @@
 #include <OTDB/TreeTypeConv.h>
 #include <OTDB/TreeStateConv.h>
 #include <OTDB/ClassifConv.h>
+#include <libgen.h>             // for basename
 
 using namespace LOFAR;
 using namespace LOFAR::OTDB;

SAS/OTDB/test/tVHtree.cc

@@ -35,6 +35,7 @@
 #include <OTDB/TreeTypeConv.h>
 #include <OTDB/TreeStateConv.h>
 #include <OTDB/ClassifConv.h>
+#include <libgen.h>             // for basename
 
 using namespace LOFAR;
 using namespace LOFAR::OTDB;

SAS/OTDB/test/tVHvalue.cc

@@ -35,6 +35,7 @@
 #include <OTDB/TreeTypeConv.h>
 #include <OTDB/TreeStateConv.h>
 #include <OTDB/ClassifConv.h>
+#include <libgen.h>             // for basename
 
 using namespace LOFAR;
 using namespace LOFAR::OTDB;

SAS/OTDB/test/tVICcomp.cc

@@ -33,6 +33,7 @@
 #include <OTDB/VICnodeDef.h>
 #include <OTDB/OTDBparam.h>
 #include <OTDB/ClassifConv.h>
+#include <libgen.h>             // for basename
 
 using namespace LOFAR;
 using namespace LOFAR::OTDB;

SAS/OTDB/test/tVTtree.cc

@@ -35,6 +35,7 @@
 #include <OTDB/TreeTypeConv.h>
 #include <OTDB/TreeStateConv.h>
 #include <OTDB/ClassifConv.h>
+#include <libgen.h>             // for basename
 
 using namespace LOFAR;
 using namespace LOFAR::OTDB;