|
|
@ -8,17 +8,26 @@ m4_define([mrw_esyscmd_s], [m4_normalize(m4_esyscmd([$1]))]) |
|
|
|
|
|
|
|
|
|
|
|
# define least version number from subversion's revision number: |
|
|
|
# define least version number from subversion's revision number: |
|
|
|
# it is taken modulo 256 due to a bug on Apple's MacOSX |
|
|
|
# it is taken modulo 256 due to a bug on Apple's MacOSX |
|
|
|
m4_define(x_least, mrw_esyscmd_s([ |
|
|
|
m4_define(x_least, m4_ifdef([x_least_diff], mrw_esyscmd_s([ |
|
|
|
SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout" |
|
|
|
SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout" |
|
|
|
for path in . .. ../..; do |
|
|
|
for path in . .. ../..; do |
|
|
|
if svn info $path 2>&1 > /dev/null; then |
|
|
|
if svn info $path 2>&1 > /dev/null; then |
|
|
|
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') |
|
|
|
SVN_REVISION=$(LANG= svn info $path | sed -n 's/^Revision: //p') |
|
|
|
|
|
|
|
break; |
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
done |
|
|
|
|
|
|
|
echo $ECHO_N $(($SVN_REVISION)) |
|
|
|
|
|
|
|
]), mrw_esyscmd_s([ |
|
|
|
|
|
|
|
SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout" |
|
|
|
|
|
|
|
for path in . .. ../..; do |
|
|
|
|
|
|
|
if svn info $path 2>&1 > /dev/null; then |
|
|
|
|
|
|
|
SVN_REVISION=$(LANG= svn info $path | sed -n 's/^Revision: //p') |
|
|
|
break; |
|
|
|
break; |
|
|
|
fi |
|
|
|
fi |
|
|
|
done |
|
|
|
done |
|
|
|
# Mac does not support LEAST > 255 |
|
|
|
# Mac does not support LEAST > 255 |
|
|
|
echo $ECHO_N $(($SVN_REVISION%256)) |
|
|
|
echo $ECHO_N $(($SVN_REVISION%256)) |
|
|
|
])) |
|
|
|
]))) |
|
|
|
# define version number from subversion's revision number: |
|
|
|
# define version number from subversion's revision number: |
|
|
|
# it is taken modulo 256 due to a bug on Apple's MacOSX |
|
|
|
# it is taken modulo 256 due to a bug on Apple's MacOSX |
|
|
|
# add to x_minor if revision number is > 256 |
|
|
|
# add to x_minor if revision number is > 256 |
|
|
@ -26,15 +35,15 @@ m4_define(x_minor_diff, mrw_esyscmd_s([ |
|
|
|
SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout" |
|
|
|
SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout" |
|
|
|
for path in . .. ../..; do |
|
|
|
for path in . .. ../..; do |
|
|
|
if svn info $path 2>&1 > /dev/null; then |
|
|
|
if svn info $path 2>&1 > /dev/null; then |
|
|
|
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') |
|
|
|
SVN_REVISION=$(LANG= svn info $path | sed -n 's/^Revision: //p') |
|
|
|
break; |
|
|
|
break; |
|
|
|
fi; |
|
|
|
fi; |
|
|
|
done |
|
|
|
done |
|
|
|
# Mac does not support LEAST > 255 |
|
|
|
# Mac does not support LEAST > 255 |
|
|
|
echo $ECHO_N $(($SVN_REVISION/256)) |
|
|
|
echo $ECHO_N $(($SVN_REVISION/256)) |
|
|
|
])) |
|
|
|
]))) |
|
|
|
# setup version number |
|
|
|
# setup version number |
|
|
|
m4_define(x_version, [x_major.m4_eval(x_minor+x_minor_diff).x_least]) |
|
|
|
m4_define(x_version, [x_major.m4_ifdef([x_least_diff], x_minor, m4_eval(x_minor+x_minor_diff)).m4_eval(m4_ifdef([x_least_diff], [x_least-x_least_diff], [x_least]))]) |
|
|
|
|
|
|
|
|
|
|
|
## bugreport mail address is taken from <user@host> in first line of AUTHORS |
|
|
|
## bugreport mail address is taken from <user@host> in first line of AUTHORS |
|
|
|
m4_define(x_bugreport, mrw_esyscmd_s([ |
|
|
|
m4_define(x_bugreport, mrw_esyscmd_s([ |
|
|
@ -107,14 +116,27 @@ AC_DEFUN([AX_SUBST], [ |
|
|
|
# |
|
|
|
# |
|
|
|
# configures the basic environment |
|
|
|
# configures the basic environment |
|
|
|
AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ |
|
|
|
AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ |
|
|
|
MINGW=no |
|
|
|
AC_MSG_CHECKING([target platfrom]) |
|
|
|
MAC=no |
|
|
|
UNIX=1 |
|
|
|
case $host in |
|
|
|
MINGW= |
|
|
|
*mingw*) MINGW=yes;; |
|
|
|
MACOSX= |
|
|
|
*darwin* | *rhapsody* | *macosx*) MAC=yes;; |
|
|
|
for h in ${target} ${target_os} ${host} ${host_os} \ |
|
|
|
esac |
|
|
|
${build} ${build_os} $(uname -s 2> /dev/null); do |
|
|
|
AM_CONDITIONAL(MINGW, test "$MINGW" = "yes") |
|
|
|
p="$h is generic Unix" |
|
|
|
AM_CONDITIONAL(MAC, test "$MAC" = "yes") |
|
|
|
case "$h" in |
|
|
|
|
|
|
|
(*mingw*) |
|
|
|
|
|
|
|
UNIX=; MINGW=1; p="MinGW"; break;; |
|
|
|
|
|
|
|
(*Darwin*|*darwin*|*rhapsody*|*macosx*) |
|
|
|
|
|
|
|
UNIX=; MACOSX=1; p="MacOSX"; break;; |
|
|
|
|
|
|
|
esac |
|
|
|
|
|
|
|
done |
|
|
|
|
|
|
|
AC_MSG_RESULT($p) |
|
|
|
|
|
|
|
AM_CONDITIONAL(UNIX, test "$UNIX" = "1") |
|
|
|
|
|
|
|
AM_CONDITIONAL(MINGW, test "$MINGW" = "1") |
|
|
|
|
|
|
|
AM_CONDITIONAL(MACOSX, test "$MACOSX" = "1") |
|
|
|
|
|
|
|
AX_SUBST(UNIX) |
|
|
|
|
|
|
|
AX_SUBST(MINGW) |
|
|
|
|
|
|
|
AX_SUBST(MACOSX) |
|
|
|
AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_TARNAME//[^a-zA-Z0-9]/_}'" |
|
|
|
AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_TARNAME//[^a-zA-Z0-9]/_}'" |
|
|
|
AX_SUBST(NUMBERS) |
|
|
|
AX_SUBST(NUMBERS) |
|
|
|
AX_SUBST(HOME) |
|
|
|
AX_SUBST(HOME) |
|
|
@ -127,7 +149,7 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ |
|
|
|
AUTHOR=$(head -1 AUTHORS) |
|
|
|
AUTHOR=$(head -1 AUTHORS) |
|
|
|
AX_SUBST(AUTHOR) |
|
|
|
AX_SUBST(AUTHOR) |
|
|
|
_AM_SUBST_NOTMAKE([AUTHOR]) |
|
|
|
_AM_SUBST_NOTMAKE([AUTHOR]) |
|
|
|
DISTRO=$(lsb_release -sc) |
|
|
|
DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null) |
|
|
|
AX_SUBST(DISTRO) |
|
|
|
AX_SUBST(DISTRO) |
|
|
|
BUILD_NUMBER=${BUILD_NUMBER:-1} |
|
|
|
BUILD_NUMBER=${BUILD_NUMBER:-1} |
|
|
|
AX_SUBST(BUILD_NUMBER) |
|
|
|
AX_SUBST(BUILD_NUMBER) |
|
|
@ -156,11 +178,24 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ |
|
|
|
- all warnings result in an error |
|
|
|
- all warnings result in an error |
|
|
|
- doxygen warnings are treated as error too]); fi |
|
|
|
- doxygen warnings are treated as error too]); fi |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
AC_ARG_ENABLE(debug, |
|
|
|
|
|
|
|
[AS_HELP_STRING([--enable-debug], |
|
|
|
|
|
|
|
[compile for debugger])], |
|
|
|
|
|
|
|
[have_debug="$enableval"; test "$enableval" = "yes" && \ |
|
|
|
|
|
|
|
AM_CPPFLAGS="${AM_CPPFLAGS} -DDEBUG" && \ |
|
|
|
|
|
|
|
AM_CXXFLAGS="${AM_CXXFLAGS:-} -ggdb3 -O0" && \ |
|
|
|
|
|
|
|
AM_LDFLAGS="${AM_LDFLAGS} -ggdb3 -O0"]) |
|
|
|
|
|
|
|
AM_CONDITIONAL(DEBUG, test "$enableval" = "yes") |
|
|
|
|
|
|
|
if test "$have_debug" == "yes"; then |
|
|
|
|
|
|
|
AC_MSG_NOTICE([Debug compile mode enabled]); |
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
AC_CONFIG_FILES([makefile]) |
|
|
|
AC_CONFIG_FILES([makefile]) |
|
|
|
AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-standard-project-targets], [makefile.in]) |
|
|
|
AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-standard-project-targets], [makefile.in]) |
|
|
|
AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-standard-project-targets], [makefile.in]) |
|
|
|
AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-standard-project-targets], [makefile.in]) |
|
|
|
AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-standard-project-targets], [makefile.in]) |
|
|
|
AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-standard-project-targets], [makefile.in]) |
|
|
|
test -f makefile.in && sed -i '1iEXTRA_DIST = ' makefile.in |
|
|
|
test -f makefile.in && TMP_MAKEFILE="$(<makefile.in)" && \ |
|
|
|
|
|
|
|
(echo "EXTRA_DIST ="; echo "$TMP_MAKEFILE") > makefile.in |
|
|
|
test -f makefile.in && cat >> makefile.in <<EOF |
|
|
|
test -f makefile.in && cat >> makefile.in <<EOF |
|
|
|
#### Begin: Appended by $0 |
|
|
|
#### Begin: Appended by $0 |
|
|
|
EXTRA_DIST += bootstrap.sh |
|
|
|
EXTRA_DIST += bootstrap.sh |
|
|
@ -387,6 +422,8 @@ EOF |
|
|
|
# $2 = module name (optional, if different from id) |
|
|
|
# $2 = module name (optional, if different from id) |
|
|
|
# $3 = a header file to find (optional) |
|
|
|
# $3 = a header file to find (optional) |
|
|
|
# $4 = alternative module names (space separated, optional) |
|
|
|
# $4 = alternative module names (space separated, optional) |
|
|
|
|
|
|
|
# $5 = optional flags: |
|
|
|
|
|
|
|
# manualflags if CXXFLAGS, CPPFLAGS, LIBS should remain unchanged |
|
|
|
# |
|
|
|
# |
|
|
|
# uses PKG_CHECK_MODULES to test for a module |
|
|
|
# uses PKG_CHECK_MODULES to test for a module |
|
|
|
# then, if given, looks for the header file |
|
|
|
# then, if given, looks for the header file |
|
|
@ -395,6 +432,7 @@ EOF |
|
|
|
# fails if not found |
|
|
|
# fails if not found |
|
|
|
AC_DEFUN([AX_PKG_REQUIRE], [ |
|
|
|
AC_DEFUN([AX_PKG_REQUIRE], [ |
|
|
|
PKG_PROG_PKG_CONFIG |
|
|
|
PKG_PROG_PKG_CONFIG |
|
|
|
|
|
|
|
optional_flags="$5" |
|
|
|
$1_found=no |
|
|
|
$1_found=no |
|
|
|
secondpar="m4_default([$2], [$1])" |
|
|
|
secondpar="m4_default([$2], [$1])" |
|
|
|
PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [ |
|
|
|
PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [ |
|
|
@ -474,26 +512,47 @@ AC_DEFUN([AX_PKG_REQUIRE], [ |
|
|
|
AC_MSG_ERROR([Feature $1 not found please install module $secondpar]) |
|
|
|
AC_MSG_ERROR([Feature $1 not found please install module $secondpar]) |
|
|
|
fi |
|
|
|
fi |
|
|
|
fi |
|
|
|
fi |
|
|
|
CPPFLAGS+=" ${$1_CFLAGS}" |
|
|
|
[$1]_CPPFLAGS="${$1_CFLAGS}" |
|
|
|
CXXFLAGS+=" ${$1_CFLAGS}" |
|
|
|
[$1]_CXXFLAGS="${$1_CFLAGS}" |
|
|
|
LIBS+=" ${$1_LIBS}" |
|
|
|
AC_SUBST([$1]_CPPFLAGS) |
|
|
|
|
|
|
|
AC_SUBST([$1]_CXXFLAGS) |
|
|
|
|
|
|
|
if test "${optional_flags/manualflags/}" = "${optional_flags}"; then |
|
|
|
|
|
|
|
CPPFLAGS+=" ${$1_CPPFLAGS}" |
|
|
|
|
|
|
|
CXXFLAGS+=" ${$1_CXXFLAGS}" |
|
|
|
|
|
|
|
LIBS+=" ${$1_LIBS}" |
|
|
|
|
|
|
|
AC_MSG_NOTICE([Adding flags for $1]) |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
AC_MSG_NOTICE([To enable $1, add $1_CPPFLAGS, $1_CXXFLAGS and $1_LIBS]) |
|
|
|
|
|
|
|
fi |
|
|
|
]) |
|
|
|
]) |
|
|
|
|
|
|
|
|
|
|
|
# check if a specific package exists |
|
|
|
# check if a specific package exists |
|
|
|
# - parameter: |
|
|
|
# - parameter: |
|
|
|
# $1 = unique id (no special characters) |
|
|
|
# $1 = unique id (no special characters) |
|
|
|
# $2 = module name (optional, if different from id) |
|
|
|
# $2 = module name (optional, if different from id) |
|
|
|
|
|
|
|
# $3 = optional flags: |
|
|
|
|
|
|
|
# manualflags if CXXFLAGS, CPPFLAGS, LIBS should remain unchanged |
|
|
|
# |
|
|
|
# |
|
|
|
# uses PKG_CHECK_MODULES to test for a module |
|
|
|
# uses PKG_CHECK_MODULES to test for a module |
|
|
|
# sets automake conditional HAVE_$1 to 0 (not found) or 1 (found) |
|
|
|
# sets automake conditional HAVE_$1 to 0 (not found) or 1 (found) |
|
|
|
# sets all flags, so that the module can be used everywhere |
|
|
|
# sets all flags, so that the module can be used everywhere |
|
|
|
AC_DEFUN([AX_PKG_CHECK], [ |
|
|
|
AC_DEFUN([AX_PKG_CHECK], [ |
|
|
|
|
|
|
|
optional_flags="$3" |
|
|
|
PKG_PROG_PKG_CONFIG |
|
|
|
PKG_PROG_PKG_CONFIG |
|
|
|
PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [ |
|
|
|
PKG_CHECK_MODULES([$1], [m4_default([$2], [$1])], [ |
|
|
|
HAVE_$1=1 |
|
|
|
HAVE_$1=1 |
|
|
|
CPPFLAGS+=" ${$1_CFLAGS}" |
|
|
|
[$1]_CPPFLAGS="${$1_CFLAGS}" |
|
|
|
CXXFLAGS+=" ${$1_CFLAGS}" |
|
|
|
[$1]_CXXFLAGS="${$1_CFLAGS}" |
|
|
|
LIBS+=" ${$1_LIBS}" |
|
|
|
AC_SUBST([$1]_CPPFLAGS) |
|
|
|
|
|
|
|
AC_SUBST([$1]_CXXFLAGS) |
|
|
|
|
|
|
|
if test "${optional_flags/manualflags/}" = "${optional_flags}"; then |
|
|
|
|
|
|
|
CPPFLAGS+=" ${$1_CPPFLAGS}" |
|
|
|
|
|
|
|
CXXFLAGS+=" ${$1_CXXFLAGS}" |
|
|
|
|
|
|
|
LIBS+=" ${$1_LIBS}" |
|
|
|
|
|
|
|
AC_MSG_NOTICE([Adding flags for $1]) |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
AC_MSG_NOTICE([To enable $1, add $1_CPPFLAGS, $1_CXXFLAGS and $1_LIBS]) |
|
|
|
|
|
|
|
fi |
|
|
|
if test -z "$PKG_REQUIREMENTS"; then |
|
|
|
if test -z "$PKG_REQUIREMENTS"; then |
|
|
|
PKG_REQUIREMENTS="m4_default([$2], [$1])" |
|
|
|
PKG_REQUIREMENTS="m4_default([$2], [$1])" |
|
|
|
else |
|
|
|
else |
|
|
|