|
|
|
|
@ -3,45 +3,46 @@ |
|
|
|
|
## 1 2 3 4 5 6 7 8 |
|
|
|
|
## 45678901234567890123456789012345678901234567890123456789012345678901234567890 |
|
|
|
|
|
|
|
|
|
# m4_esyscmd_s does not exist on centos 5 and 6 |
|
|
|
|
m4_define([mrw_esyscmd_s], [m4_normalize(m4_esyscmd([$1]))]) |
|
|
|
|
|
|
|
|
|
# define least version number from subversion's revision number: |
|
|
|
|
# it is taken modulo 256 due to a bug on Apple's MacOSX |
|
|
|
|
m4_define(x_least, m4_esyscmd_s( |
|
|
|
|
m4_define(x_least, 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/Last Changed Rev: //p') |
|
|
|
|
(cd $path && svn2cl) |
|
|
|
|
break; |
|
|
|
|
fi |
|
|
|
|
done |
|
|
|
|
# Mac does not support LEAST > 255 |
|
|
|
|
echo $ECHO_N $(($SVN_REVISION%256)) |
|
|
|
|
)) |
|
|
|
|
])) |
|
|
|
|
# define version number from subversion's revision number: |
|
|
|
|
# it is taken modulo 256 due to a bug on Apple's MacOSX |
|
|
|
|
# add to x_minor if revision number is > 256 |
|
|
|
|
m4_define(x_minor_fixed, m4_esyscmd_s( |
|
|
|
|
m4_define(x_minor_fixed, 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/Last Changed Rev: //p') |
|
|
|
|
(cd $path && svn2cl) |
|
|
|
|
break; |
|
|
|
|
fi |
|
|
|
|
done |
|
|
|
|
# Mac does not support LEAST > 255 |
|
|
|
|
echo $ECHO_N $((x_minor+$SVN_REVISION/256)) |
|
|
|
|
)) |
|
|
|
|
])) |
|
|
|
|
# setup version number |
|
|
|
|
m4_define(x_version, m4_esyscmd_s( |
|
|
|
|
m4_define(x_version, mrw_esyscmd_s([ |
|
|
|
|
echo $ECHO_N x_major.x_minor_fixed.x_least |
|
|
|
|
)) |
|
|
|
|
])) |
|
|
|
|
|
|
|
|
|
## bugreport mail address is taken from <user@host> in first line of AUTHORS |
|
|
|
|
m4_define(x_bugreport, m4_esyscmd_s( |
|
|
|
|
m4_define(x_bugreport, mrw_esyscmd_s([ |
|
|
|
|
head -1 AUTHORS | \ |
|
|
|
|
sed -n 's,.*<\([-_.a-z0-9A-Z]*@[-_.a-z0-9A-Z]*\)>.*,\1,gp' |
|
|
|
|
)) |
|
|
|
|
])) |
|
|
|
|
|
|
|
|
|
m4_include(ax_check_qt.m4) |
|
|
|
|
|
|
|
|
|
@ -84,7 +85,7 @@ AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [ |
|
|
|
|
# $1 = variable name |
|
|
|
|
AC_DEFUN([AX_SUBST], [ |
|
|
|
|
AC_SUBST([$1]) |
|
|
|
|
tmp_var=$(echo "${$1}" | awk 1 ORS='\\n') |
|
|
|
|
tmp_var=$(echo "${$1}" | awk 1 ORS='\\n' | sed 's,\\n$,,') |
|
|
|
|
tmp_var=${tmp_var//\"/\\\"} |
|
|
|
|
tmp_var=${tmp_var//\'/\'\"\'\"\'} |
|
|
|
|
tmp_var=${tmp_var//#/\\#} |
|
|
|
|
@ -116,7 +117,7 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ |
|
|
|
|
esac |
|
|
|
|
AM_CONDITIONAL(MINGW, test "$MINGW" = "yes") |
|
|
|
|
AM_CONDITIONAL(MAC, test "$MAC" = "yes") |
|
|
|
|
AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_NAME//-/_}'" |
|
|
|
|
AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_TARNAME//[^a-zA-Z0-9]/_}'" |
|
|
|
|
AX_SUBST(NUMBERS) |
|
|
|
|
AX_SUBST(HOME) |
|
|
|
|
README=$(tail -n +3 README) |
|
|
|
|
@ -164,7 +165,6 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ |
|
|
|
|
test -f makefile.in && cat >> makefile.in <<EOF |
|
|
|
|
#### Begin: Appended by $0 |
|
|
|
|
EXTRA_DIST = bootstrap.sh |
|
|
|
|
doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog |
|
|
|
|
clean-standard-project-targets: |
|
|
|
|
-rm -rf \${PACKAGE_NAME}-\${PACKAGE_VERSION} |
|
|
|
|
-rm \${PACKAGE_TARNAME}-\${PACKAGE_VERSION}.tar.gz |
|
|
|
|
@ -190,8 +190,9 @@ AC_DEFUN([AX_USE_CXX], [ |
|
|
|
|
AM_CPPFLAGS+=' -I ${top_srcdir}/src -I ${top_builddir}/src -I ${srcdir} -I ${builddir}' |
|
|
|
|
AM_LDFLAGS+=' -L ${top_srcdir}/src -L ${top_builddir}/src' |
|
|
|
|
|
|
|
|
|
# Get rid of that stupid -O2 -g opions! |
|
|
|
|
CXXFLAGS="${CXXFLAGS:-}" |
|
|
|
|
# Get rid of those stupid -g -O2 options! |
|
|
|
|
CXXFLAGS="${CXXFLAGS//-g -O2/}" |
|
|
|
|
CFLAGS="${CFLAGS//-g -O2/}" |
|
|
|
|
|
|
|
|
|
# pass compile flags to make distcheck |
|
|
|
|
AM_DISTCHECK_CONFIGURE_FLAGS="CXXFLAGS='${CXXFLAGS}' CPPFLAGS='${CPPFLAGS}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" |
|
|
|
|
@ -311,14 +312,16 @@ EOF |
|
|
|
|
|
|
|
|
|
# use this in configure.ac to support RPM packages |
|
|
|
|
AC_DEFUN([AX_USE_RPM_PACKAGING], [ |
|
|
|
|
# m4_include(ax_rpm_rules.m4) |
|
|
|
|
AC_CONFIG_FILES([${PACKAGE_NAME}.spec]) |
|
|
|
|
#AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-debian-targets], [makefile.in]) |
|
|
|
|
AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [rpm], [makefile.in]) |
|
|
|
|
#AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-rpm-targets], [makefile.in]) |
|
|
|
|
AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-rpm-targets], [makefile.in]) |
|
|
|
|
test -f makefile.in && cat >> makefile.in <<EOF |
|
|
|
|
#### Begin: Appended by $0 |
|
|
|
|
EXTRA_DIST += \${PACKAGE_NAME}.spec.in |
|
|
|
|
rpm: dist |
|
|
|
|
rpmbuild -ba --define "_topdir \$(pwd)" --define "_sourcedir \$(pwd)" \${PACKAGE_NAME}.spec |
|
|
|
|
rpmbuild -ba --define "_topdir \$\$(pwd)" --define "_sourcedir \$\$(pwd)" \${PACKAGE_NAME}.spec |
|
|
|
|
distclean-rpm-targets: |
|
|
|
|
-rm \${PACKAGE_NAME}.spec |
|
|
|
|
#### End: $0 |
|
|
|
|
EOF |
|
|
|
|
]) |
|
|
|
|
@ -364,7 +367,7 @@ doc: doxyfile |
|
|
|
|
clean-documentation: |
|
|
|
|
-rm doxygen.errors @PDF_DOC@ |
|
|
|
|
distclean-documentation: |
|
|
|
|
-rm -r html latex |
|
|
|
|
-rm -r html |
|
|
|
|
-rm @PACKAGE_NAME@.doxytag |
|
|
|
|
maintainer-clean-documentation: |
|
|
|
|
-rm makefile.in |
|
|
|
|
@ -374,7 +377,7 @@ install-data-documentation: |
|
|
|
|
cp -r html \$(DESTDIR)\${docdir}/ |
|
|
|
|
uninstall-documentation: |
|
|
|
|
-chmod -R u+w \$(DESTDIR)\${docdir} |
|
|
|
|
-rm -rf \$(DESTDIR)\${docdir}/* |
|
|
|
|
-rm -rf \$(DESTDIR)\${docdir}/html |
|
|
|
|
#### End: $0 |
|
|
|
|
EOF |
|
|
|
|
]) |
|
|
|
|
@ -415,8 +418,12 @@ AC_DEFUN([AX_PKG_REQUIRE], [ |
|
|
|
|
AC_SUBST(CPPFLAGS) |
|
|
|
|
AC_SUBST(CXXFLAGS) |
|
|
|
|
AC_SUBST(PKG_REQUIREMENTS) |
|
|
|
|
if test -n "$3" -a "${$1_found}" != "no"; then |
|
|
|
|
if test -n "$3"; then |
|
|
|
|
if test "${$1_found}" = "no"; then |
|
|
|
|
tmp_package="yes" |
|
|
|
|
else |
|
|
|
|
tmp_package=${$1_found} |
|
|
|
|
fi |
|
|
|
|
$1_found=no |
|
|
|
|
old_CPPFLAGS=${CPPFLAGS} |
|
|
|
|
CPPFLAGS=" ${$1_CFLAGS} ${CPPFLAGS}" |
|
|
|
|
|
Marc Wäckerlin
10 years ago