- Olena-patches

last-svn-commit-182-gc690496 Have AC_PROG_SWIG be more flexible w.r.t. major/minor version numbers.
by Roland Levillain 16 Aug '10

16 Aug '10

* m4/swig.m4: Here. --- ChangeLog | 6 ++++++ m4/swig.m4 | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44386d3..fb2a38a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-06-29 Roland Levillain <roland(a)lrde.epita.fr> + + Have AC_PROG_SWIG be more flexible w.r.t. major/minor version numbers. + + * m4/swig.m4: Here. + 2010-06-24 Roland Levillain <roland(a)lrde.epita.fr> Add `mesh-segm-skel' to the branches to be uploaded (as snapshot). diff --git a/m4/swig.m4 b/m4/swig.m4 index ad0ee3b..46672c5 100644 --- a/m4/swig.m4 +++ b/m4/swig.m4 @@ -61,9 +61,12 @@ AC_DEFUN([AC_PROG_SWIG],[ if test -z "$available_patch" ; then [available_patch=0] fi - if test $available_major -ne $required_major \ - -o $available_minor -ne $required_minor \ - -o $available_patch -lt $required_patch ; then + if test \ + $available_major -lt $required_major \ + -o $ $available_major -eq $required_major \ + -a \( $available_minor -lt $required_minor \ + -o \( $available_minor -eq $required_minor \ + -a $available_patch -lt $required_patch $ \) \) ; then AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org] SWIG='echo "Error: SWIG version >= $1 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false' else -- 1.5.6.5

1 0

branch next updated: last-svn-commit-182-gc690496
by git＠lrde.epita.fr 16 Aug '10

16 Aug '10

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 next has been updated via c6904964636040aa2cf81dbe4f0c9f26078e8fac (commit) from 565a8acd20101cf22d58b674d4d1695d8e9926c6 (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 ----------------------------------------------------------------- c690496 Have AC_PROG_SWIG be more flexible w.r.t. major/minor version numbers. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 ++++++ m4/swig.m4 | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch fix-scribo-lib-deps deleted: last-svn-commit-181-g565a8ac
by git＠lrde.epita.fr 16 Aug '10

16 Aug '10

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 fix-scribo-lib-deps has been deleted was 565a8acd20101cf22d58b674d4d1695d8e9926c6 ----------------------------------------------------------------------- 565a8acd20101cf22d58b674d4d1695d8e9926c6 Fix Scribo's dependencies w.r.t. libraries. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch exp/next-build-ok updated: last-svn-commit-480-g7aad3ee
by lazzara＠lrde.epita.fr 13 Aug '10

13 Aug '10

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-build-ok has been updated via 7aad3ee217c527eef754831822f2067fad7c3adb (commit) via 38c94688a42d132ad9b2b8d5b2ff8a7914e1f8cd (commit) from 79263eb8957ea0cc946d73fc71cfdfd9f6b31abe (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 ----------------------------------------------------------------- 7aad3ee src/Makefile.am: Remove useless flags. Aesthetic changes. 38c9468 configure.ac: Handle ImageMagick++ dependency with both dpk-config and OLN_WITH_LIB. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++++ configure.ac | 47 ++++++++++++++++++++++++++++++----------------- scribo/ChangeLog | 4 ++++ scribo/src/Makefile.am | 21 +++++++++------------ 4 files changed, 48 insertions(+), 29 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-480-g7aad3ee src/Makefile.am: Remove useless flags. Aesthetic changes.
by Guillaume Lazzara 13 Aug '10

13 Aug '10

--- scribo/ChangeLog | 4 ++++ scribo/src/Makefile.am | 21 +++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 2dd5cb4..ebaa322 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-08-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/Makefile.am: Remove useless flags. Aesthetic changes. + +2010-08-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/debug/text_areas_image.hh: Add a typedef to help g++-3.3. 2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index b1a29e8..52df66d 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -37,35 +37,32 @@ bin_PROGRAMS = if HAVE_TESSERACT - bin_PROGRAMS += pbm_text_in_doc - pbm_text_in_doc_CPPFLAGS = $(AM_CPPFLAGS) -g -ggdb \ + bin_PROGRAMS += pbm_text_in_doc + pbm_text_in_doc_SOURCES = pbm_text_in_doc.cc + pbm_text_in_doc_CPPFLAGS = $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ $(TIFF_CPPFLAGS) - pbm_text_in_doc_LDFLAGS = $(AM_LDFLAGS) -g -ggdb\ + pbm_text_in_doc_LDFLAGS = $(AM_LDFLAGS) \ $(TESSERACT_LDFLAGS) \ $(TIFF_LDFLAGS) \ -lpthread - pbm_text_in_doc_SOURCES = pbm_text_in_doc.cc - endif HAVE_TESSERACT if HAVE_MAGICKXX - bin_PROGRAMS += text_in_doc_preprocess + bin_PROGRAMS += text_in_doc_preprocess + text_in_doc_preprocess_SOURCES = text_in_doc_preprocess.cc text_in_doc_preprocess_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) text_in_doc_preprocess_LDFLAGS = $(AM_LDFLAGS) \ -lpthread \ $(MAGICKXX_LDFLAGS) - text_in_doc_preprocess_SOURCES = text_in_doc_preprocess.cc - - - bin_PROGRAMS += text_in_picture - text_in_picture_SOURCES = text_in_picture.cc + bin_PROGRAMS += text_in_picture + text_in_picture_SOURCES = text_in_picture.cc text_in_picture_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) text_in_picture_LDFLAGS = $(AM_LDFLAGS) \ @@ -74,7 +71,7 @@ if HAVE_MAGICKXX if HAVE_TESSERACT - bin_PROGRAMS += text_recognition_in_picture + bin_PROGRAMS += text_recognition_in_picture text_recognition_in_picture_SOURCES = text_recognition_in_picture.cc text_recognition_in_picture_CPPFLAGS = $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ -- 1.5.6.5

1 0

last-svn-commit-479-g38c9468 configure.ac: Handle ImageMagick++ dependency with both dpk-config and OLN_WITH_LIB.
by Guillaume Lazzara 13 Aug '10

13 Aug '10

--- ChangeLog | 5 +++++ configure.ac | 47 ++++++++++++++++++++++++++++++----------------- 2 files changed, 35 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00d8c12..10249a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-08-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Handle ImageMagick++ dependency with both + dpk-config and OLN_WITH_LIB. + +2010-08-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Make Boost dependency optional. 2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index ce1a5a2..5ea0ac8 100644 --- a/configure.ac +++ b/configure.ac @@ -267,7 +267,7 @@ OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) # FIXME: We should handle Magick++ both with Magick++-config and # pkg-config? instead of OLN_WITH_LIB. See how other projects handle # this. -#OLN_WITH_LIB([Magick++], [Magick++.h], [Magick++], [magickxx], [MAGICKXX]) + AC_ARG_WITH([magickxx], [AC_HELP_STRING([--with-magickxx], @@ -276,26 +276,39 @@ AC_ARG_WITH([magickxx], [with_magickxx='yes']) oln_have_magickxx=no -MAGICKXX_CFLAGS="" -MAGICKXX_LIBS="" -MAGICKXX_PKG="" if test "x$with_magickxx" != xno; then AC_MSG_RESULT([]) AC_MSG_RESULT([* libMagick++]) AC_MSG_RESULT([---------------]) - PKG_CHECK_MODULES(MAGICKXX,[ImageMagick++], oln_have_magickxx=yes, oln_have_magickxx=no) - AC_MSG_RESULT([]) - - 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" - MAGICKXX_LDFLAGS="$MAGICKXX_LIBS" - AC_SUBST(MAGICKXX_CPPFLAGS) - AC_SUBST(MAGICKXX_LDFLAGS) - fi + # Try to use ImageMagick from a specified path. + if test "x$with_magickxx" != xyes; then + AC_MSG_CHECKING([with given path $with_magickxx]) + AC_MSG_RESULT([]) + OLN_WITH_LIB([Magick++], [Magick++.h], [Magick++], [magickxx], + [MAGICKXX]) + fi + + # Check with pkg-config if previous test failed or if no path have + # been passed through --with-magickxx argument. + if test "x$oln_have_magickxx" = xno; then + AC_MSG_CHECKING([with pkg-config]) + AC_MSG_RESULT([]) + PKG_CHECK_MODULES(MAGICKXX,[ImageMagick++], oln_have_magickxx=yes, + oln_have_magickxx=no) + AC_MSG_RESULT([]) + + if test "x$oln_have_magickxx" = xyes; then + AC_DEFINE([HAVE_MAGICKXX], 1, + [Define to 1 if we can use libMagick++]) + # Use standard variable names. + MAGICKXX_CPPFLAGS="$MAGICKXX_CFLAGS" + MAGICKXX_LDFLAGS="$MAGICKXX_LIBS" + AC_SUBST(MAGICKXX_CPPFLAGS) + AC_SUBST(MAGICKXX_LDFLAGS) + fi + fi fi AM_CONDITIONAL(HAVE_MAGICKXX, test "x$oln_have_magickxx" = xyes) @@ -802,8 +815,8 @@ Options used to compile and link: UIC = $UIC RCC = $RCC BOOST_ROOT = $BOOST_ROOT - MAGICKXX_CFLAGS = $MAGICKXX_CFLAGS - MAGICKXX_LIBS = $MAGICKXX_LIBS + MAGICKXX_CFLAGS = $MAGICKXX_CPPFLAGS + MAGICKXX_LIBS = $MAGICKXX_LDFLAGS SCRIBO_CXXFLAGS = $SCRIBO_CXXFLAGS APPS_CXXFLAGS = $APPS_CXXFLAGS TOOLS_CXXFLAGS = $TOOLS_CXXFLAGS -- 1.5.6.5

1 0

branch exp/next-build-ok updated: last-svn-commit-478-g79263eb
by lazzara＠lrde.epita.fr 13 Aug '10

13 Aug '10

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-build-ok has been updated via 79263eb8957ea0cc946d73fc71cfdfd9f6b31abe (commit) from 53a57b1d3275c5b9fb41db4b706342d6a7df992d (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 ----------------------------------------------------------------- 79263eb configure.ac: Make Boost dependency optional. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ configure.ac | 36 ++++++++++++++++++++++-------------- 2 files changed, 26 insertions(+), 14 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-478-g79263eb configure.ac: Make Boost dependency optional.
by Guillaume Lazzara 13 Aug '10

13 Aug '10

--- ChangeLog | 4 ++++ configure.ac | 36 ++++++++++++++++++++++-------------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 301ed5d..00d8c12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-08-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Make Boost dependency optional. + 2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> * build-aux/build_unit_test.sh: Handle composed dependency names diff --git a/configure.ac b/configure.ac index 108b827..ce1a5a2 100644 --- a/configure.ac +++ b/configure.ac @@ -215,20 +215,28 @@ if test "x$with_boost" != xno; then AC_MSG_RESULT([* Boost]) AC_MSG_RESULT([-------]) - # Preprocessor - BOOST_FIND_HEADER([boost/preprocessor/repetition/repeat.hpp], - oln_have_boost_preprocessor="no", - oln_have_boost_preprocessor="yes") - if test "x$oln_have_boost_preprocessor" = xyes; then - AC_DEFINE([HAVE_BOOST_PREPROCESSOR], 1, [Define to 1 if we can use Boost Preprocessor.]) - fi + # Is Boost installed? + BOOST_REQUIRE([], oln_have_boost=no) + + if test "x$oln_have_boost" != xno; then + + # Preprocessor + BOOST_FIND_HEADER([boost/preprocessor/repetition/repeat.hpp], + oln_have_boost_preprocessor=no, + oln_have_boost_preprocessor=yes) + if test "x$oln_have_boost_preprocessor" = xyes; then + AC_DEFINE([HAVE_BOOST_PREPROCESSOR], 1, + [Define to 1 if we can use Boost Preprocessor.]) + fi - # Tuple - BOOST_FIND_HEADER([boost/tuple/tuple.hpp], - oln_have_boost_tuple=no, - oln_have_boost_tuple=yes) - if test "x$oln_have_boost_tuple" = xyes; then - AC_DEFINE([HAVE_BOOST_TUPLE], 1, [Define to 1 if we can use Boost Tuple.]) + # Tuple + BOOST_FIND_HEADER([boost/tuple/tuple.hpp], + oln_have_boost_tuple=no, + oln_have_boost_tuple=yes) + if test "x$oln_have_boost_tuple" = xyes; then + AC_DEFINE([HAVE_BOOST_TUPLE], 1, + [Define to 1 if we can use Boost Tuple.]) + fi fi fi -- 1.5.6.5

1 0

branch exp/next deleted: last-svn-commit-477-g53a57b1
by lazzara＠lrde.epita.fr 13 Aug '10

13 Aug '10

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 deleted was 53a57b1d3275c5b9fb41db4b706342d6a7df992d ----------------------------------------------------------------------- 53a57b1d3275c5b9fb41db4b706342d6a7df992d Fix compilation with g++-3.3 in Milena. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch exp/milena-z deleted: last-svn-commit-477-g53a57b1
by lazzara＠lrde.epita.fr 13 Aug '10

13 Aug '10

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/milena-z has been deleted was 53a57b1d3275c5b9fb41db4b706342d6a7df992d ----------------------------------------------------------------------- 53a57b1d3275c5b9fb41db4b706342d6a7df992d Fix compilation with g++-3.3 in Milena. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0