diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2012-01-16 11:47:10 +0100 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2012-01-16 11:47:10 +0100 |
| commit | f1bffbc1a4b178cb701e51ed1c6caadc71128e95 (patch) | |
| tree | 099e151072aef896a0b03394445c26791c085cad /configure.ac | |
| parent | b240b6d4c4c21479c53da3d9d2cc6e836543845d (diff) | |
| parent | 09ce2bb579dc6d25e1efe9b6bc435f97c2ac322c (diff) | |
Merge commit 'syncevolution-1-2-2'
Conflicts:
Makefile.am
configure-post.in
configure.ac
src/Makefile-gen.am
src/dbus/qt/Makefile.am
src/syncevo-dbus-server.cpp
test/test-dbus.py
Conflicts caused by renaming of files on master. Manually applied the
relevant changes to the renamed files.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 5be479ad..99c51910 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ dnl Invoke autogen.sh to produce a configure script. # # Starting with the 1.1 release cycle, the rpm-style # .99 pseudo-version number is used to mark a pre-release. -AC_INIT([syncevolution], [m4_esyscmd([build/gen-git-version.sh 1.2.1])]) +AC_INIT([syncevolution], [m4_esyscmd([build/gen-git-version.sh 1.2.2])]) # STABLE_VERSION=1.0.1+ AC_SUBST(STABLE_VERSION) @@ -1070,6 +1070,9 @@ SYNCEVOLUTION_LIBS=`pwd`/src/syncevo/libsyncevolution.la AC_SUBST(SYNCEVOLUTION_CFLAGS) AC_SUBST(SYNCEVOLUTION_LIBS) +# invoking syncevolution binary is allowed to fail when cross-compiling +AM_CONDITIONAL([COND_CROSS_COMPILING], [test "$cross_compiling" = "yes"]) + AC_CONFIG_FILES([ Makefile src/syncevo/syncevolution.pc |