|
|
|
|
@ -12,7 +12,7 @@ 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" |
|
|
|
|
for path in . .. ../..; do |
|
|
|
|
if svn info $path 2>&1 > /dev/null; then |
|
|
|
|
SVN_REVISION=$(LANG= svn info $path | sed -n 's/^Revision: //p') |
|
|
|
|
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') |
|
|
|
|
break; |
|
|
|
|
fi |
|
|
|
|
done |
|
|
|
|
@ -21,7 +21,7 @@ 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" |
|
|
|
|
for path in . .. ../..; do |
|
|
|
|
if svn info $path 2>&1 > /dev/null; then |
|
|
|
|
SVN_REVISION=$(LANG= svn info $path | sed -n 's/^Revision: //p') |
|
|
|
|
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') |
|
|
|
|
break; |
|
|
|
|
fi |
|
|
|
|
done |
|
|
|
|
@ -35,7 +35,7 @@ m4_define(x_minor_diff, 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') |
|
|
|
|
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') |
|
|
|
|
break; |
|
|
|
|
fi; |
|
|
|
|
done |
|
|
|
|
@ -151,6 +151,15 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ |
|
|
|
|
_AM_SUBST_NOTMAKE([AUTHOR]) |
|
|
|
|
DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null) |
|
|
|
|
AX_SUBST(DISTRO) |
|
|
|
|
DISTRIBUTOR=$(lsb_release -si 2>/dev/null || uname -s 2>/dev/null) |
|
|
|
|
case "${DISTRIBUTOR// /-}" in |
|
|
|
|
(Ubuntu) UBUNTU=1; AX_SUBST(UBUNTU);; |
|
|
|
|
(Debian) DEBIAN=1; AX_SUBST(DEBIAN);; |
|
|
|
|
(SUSE-LINUX) SUSE=1; AX_SUBST(SUSE);; |
|
|
|
|
(Fedora) FEDORA=1; AX_SUBST(FEDORA);; |
|
|
|
|
(Centos) CENTOS=1; AX_SUBST(CENTOS);; |
|
|
|
|
esac |
|
|
|
|
AX_SUBST(DISTRIBUTOR) |
|
|
|
|
BUILD_NUMBER=${BUILD_NUMBER:-1} |
|
|
|
|
AX_SUBST(BUILD_NUMBER) |
|
|
|
|
BUILD_DATE=$(LANG= date +"%a, %d %b %Y %H:%M:%S %z") |
|
|
|
|
@ -181,13 +190,15 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ |
|
|
|
|
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"]) |
|
|
|
|
[have_debug="$enableval"], [have_debug="no"]) |
|
|
|
|
AM_CONDITIONAL(DEBUG, test "$enableval" = "yes") |
|
|
|
|
if test "$have_debug" == "yes"; then |
|
|
|
|
AC_MSG_NOTICE([Debug compile mode enabled]); |
|
|
|
|
AM_CPPFLAGS="${AM_CPPFLAGS} -DDEBUG" |
|
|
|
|
AM_CXXFLAGS="${AM_CXXFLAGS:-} -ggdb3 -O0" |
|
|
|
|
AM_LDFLAGS="${AM_LDFLAGS} -ggdb3 -O0" |
|
|
|
|
else |
|
|
|
|
AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_DEBUG_OUTPUT -DQT_NO_DEBUG" |
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
AC_CONFIG_FILES([makefile]) |
|
|
|
|
@ -196,13 +207,16 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ |
|
|
|
|
AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-standard-project-targets], [makefile.in]) |
|
|
|
|
test -f makefile.in && cat >> makefile.in <<EOF |
|
|
|
|
#### Begin: Appended by $0 |
|
|
|
|
EXTRA_DIST += bootstrap.sh |
|
|
|
|
EXTRA_DIST += bootstrap.sh ax_init_standard_project.m4 ax_cxx_compile_stdcxx_11.m4 \ |
|
|
|
|
ax_check_qt.m4 resolve-debbuilddeps.sh resolve-rpmbuilddeps.sh \ |
|
|
|
|
build-resource-file.sh mac-create-app-bundle.sh |
|
|
|
|
|
|
|
|
|
clean-standard-project-targets: |
|
|
|
|
-rm -rf \${PACKAGE_NAME}-\${PACKAGE_VERSION} |
|
|
|
|
-rm \${PACKAGE_TARNAME}-\${PACKAGE_VERSION}.tar.gz |
|
|
|
|
distclean-standard-project-targets: |
|
|
|
|
-rm -r autom4te.cache |
|
|
|
|
-rm aclocal.m4 config.guess config.sub configure depcomp compile install-sh ltmain.sh makefile missing mkinstalldirs |
|
|
|
|
-rm aclocal.m4 config.guess config.sub configure depcomp compile install-sh ltmain.sh makefile missing mkinstalldirs test-driver |
|
|
|
|
maintainer-clean-standard-project-targets: |
|
|
|
|
-rm makefile.in |
|
|
|
|
#### End: $0 |
|
|
|
|
|
Marc Wäckerlin
9 years ago