Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Stefan Wahren 2013-03-29 16:51:05 +01:00
commit 80df5ce086

View File

@ -8,12 +8,16 @@ dnl info@rscada.se
dnl dnl
dnl ---------------------------------------------------------------------------- dnl ----------------------------------------------------------------------------
LT_CONFIG_LTDL_DIR([libltdl])
AC_INIT([libmbus], [0.8.0], [info@rscada.se], [libmbus], [http://www.rscada.se/libmbus/]) AC_INIT([libmbus], [0.8.0], [info@rscada.se], [libmbus], [http://www.rscada.se/libmbus/])
AC_CONFIG_AUX_DIR([libltdl/config])
AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_CONFIG_MACRO_DIR([m4])
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
#fix for automake 1.12
m4_pattern_allow([AM_PROG_AR])
AM_PROG_AR
LDFLAGS="$LDFLAGS -version-info 0:8:0" LDFLAGS="$LDFLAGS -version-info 0:8:0"