Merge pull request #55 from tango-controls/debian-build-fixes

Various build fixes

Author: t-b

assets/Makefile.am

@@ -28,7 +28,6 @@ AUX_DIST_EXTRA = m4/ac_cxx_have_strstream.m4       \
                  m4/RSSH_ENABLE_PTHREADS.m4        \
                  m4/ac_path_mysqlclient.m4         \
                  m4/ac_prog_mysql.m4               \
-                 m4/check_zlib.m4                  \
                  m4/gcc_release.m4                 \
                  m4/java_release.m4	               \
                  m4/mysql_release.m4               \

assets/configure.ac

@@ -75,6 +75,8 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
+AM_PROG_AR
+
 # Check gcc release
 
  if test "$CXX" = "c++" -o "$CXX" = "g++"
@@ -176,7 +178,7 @@ AM_CONDITIONAL(TANGO_DOC_ENABLED, test x"$LYX" != x"false" && test x"$FIG2DEV" !
 LT_INIT()
 
 # check for the presence of zlib
-CHECK_ZLIB
+PKG_CHECK_MODULES([ZLIB], [zlib >= 1])
 
 # This macro checks for omniorb and sets various defines, please
 # consult config/RSSH_CHECK_OMNIORB for more details

assets/lib/cpp/log4tango/src/Makefile.am

@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = liblog4tangointernal.la
 
-INCLUDES = -I../include -I$(top_srcdir)/include
+AM_CPPFLAGS = -I../include -I$(top_srcdir)/include
 
 noinst_HEADERS = snprintf.c
 

assets/lib/cpp/log4tango/tests/Makefile.am

@@ -8,7 +8,7 @@ check_PROGRAMS = $(TESTS)
 
 #noinst_PROGRAMS =
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 
 test_log4tango_SOURCES = test_log4tango.cpp
 test_log4tango_LDADD = $(top_builddir)/src/liblog4tango.la

assets/m4/check_zlib.m4

@@ -8,9 +8,9 @@ rest-server-root-repo=https://github.com/tango-controls/rest-server/releases
 #current = tango lib major + $age
 #revision = tango lib patch
 #age = tango lib minor
-version-info=12:3:4
+version-info=12:4:3
 #lib
-cppTango=9.3.4-rc1
+cppTango=9.3.4-rc2
 JTango-ver=9.5.17
 tango-idl=5.0.1
 jive-ver=7.22
@@ -26,9 +26,9 @@ rest-server-ver=1.14
 #tool_panels=
 #cppserver
 TangoTest=TangoTest-Release-2.1
-TangoDatabase=Database-Release-5.13
+TangoDatabase=Database-Release-5.14
 TangoAccessControl=TangoAccessControl-Release-2.14
-starter=Starter-7.2
+starter=Starter-7.3
 #utils
 tango_admin=Release_1.14
 #mtangorest.server=rc4-2.9