This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Olena, a generic and efficient image processing platform".
The branch exp/next has been updated
via 00d8fa3b631df334782cc755a0a1bbc3af1e8d35 (commit)
via 6ca68abdb08224a001fbdd838a6bbffb58b902ba (commit)
via a9958fa777ee5686c5a923311aab1caa793ab89a (commit)
via be773a94ff966b4008cb3ce086bdaa3a679cf8a5 (commit)
from 013ef3d7c8f41542dc327c3f86d3741476c61aa5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
00d8fa3 configure.ac: Display a summary of the configuration when the build directory is ready.
6ca68ab configure.ac: Set oln_with_* variables correctly
a9958fa headers.mk: Regen.
be773a9 Regen headers.mk and unit-tests.mk in Scribo.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +++
configure.ac | 95 ++++++++++++++++++++++++++++++++--
milena/ChangeLog | 4 ++
milena/headers.mk | 25 +++++++++
scribo/ChangeLog | 7 +++
scribo/headers.mk | 4 --
scribo/tests/unit_test/unit-tests.mk | 2 +-
7 files changed, 136 insertions(+), 10 deletions(-)
hooks/post-receive
--
Olena, a generic and efficient image processing platform
---
ChangeLog | 4 ++++
configure.ac | 11 +++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0a3e7db..b8a1e37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr>
+ * configure.ac: Set oln_with_* variables correctly.
+
+2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr>
+
* configure.ac: Require Qt 4.x minimum to enable the use of Qt.
2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr>
diff --git a/configure.ac b/configure.ac
index e782d82..9c9e263 100644
--- a/configure.ac
+++ b/configure.ac
@@ -234,7 +234,7 @@ if test "x$with_magickxx" != 'xyes'; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-magickxx=$with_magickxx "
fi
-have_magickxx='no'
+oln_have_magickxx='no'
MAGICKXX_CFLAGS=""
MAGICKXX_LIBS=""
MAGICKXX_PKG=""
@@ -242,11 +242,11 @@ if test "x$with_magickxx" = 'xyes'; then
AC_MSG_RESULT([])
AC_MSG_RESULT([* libMagick++])
AC_MSG_RESULT([---------------])
- PKG_CHECK_MODULES(MAGICKXX,[ImageMagick++], have_magickxx=yes, have_magickxx=no)
+ PKG_CHECK_MODULES(MAGICKXX,[ImageMagick++], oln_have_magickxx=yes, oln_have_magickxx=no)
AC_MSG_RESULT([])
fi
-if test "$have_magickxx" = 'yes'; then
+if test "$oln_have_magickxx" = 'yes'; then
AC_DEFINE([HAVE_MAGICKXX], 1, [Define to 1 if we can use libMagick++])
# Use standard variable names.
MAGICKXX_CPPFLAGS="$MAGICKXX_CFLAGS"
@@ -255,7 +255,7 @@ if test "$have_magickxx" = 'yes'; then
AC_SUBST(MAGICKXX_LDFLAGS)
fi
-AM_CONDITIONAL(HAVE_MAGICKXX, test "x$have_magickxx" = 'xyes')
+AM_CONDITIONAL(HAVE_MAGICKXX, test "x$oln_have_magickxx" = 'xyes')
#------------------------------------------------------------
@@ -292,6 +292,8 @@ OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full], [tesseract],
AC_MSG_RESULT([])
AC_MSG_RESULT([* Qt])
AC_MSG_RESULT([----])
+
+oln_have_qt='no'
AT_WITH_QT([+xml], [], [],
AC_MSG_WARN([Qt dependent programs will be disabled.]))
@@ -299,6 +301,7 @@ if test "x$QT_VERSION_MAJOR" != "x"; then
AT_REQUIRE_QT_VERSION([4], AC_MSG_WARN([Your Qt version is too old! Qt dependent programs will be disabled.]),
AC_DEFINE([HAVE_QT], 1,
[Define to 1 if we can use Qt]))
+ oln_have_qt='yes'
fi
AM_CONDITIONAL([HAVE_QT], [test "x$QT_VERSION_MAJOR" == "x4"])
--
1.5.6.5
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Olena, a generic and efficient image processing platform".
The branch exp/next has been updated
via 013ef3d7c8f41542dc327c3f86d3741476c61aa5 (commit)
via 6793cca44120828368141b44d52d589d47c72f72 (commit)
from f7bc7e130d7cd61342e2a1bd50433caf8dc251e2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
013ef3d configure.ac: Require Qt 4.x minimum to enable the use of Qt.
6793cca m4/autotroll.m4: Fix an invalid generation of configure with autoconf 2.61.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +++++++++
configure.ac | 39 +++++++++++++++++++++++++++++----------
m4/autotroll.m4 | 2 +-
3 files changed, 39 insertions(+), 11 deletions(-)
hooks/post-receive
--
Olena, a generic and efficient image processing platform