[med-svn] [miaviewit] 02/05: Imported Upstream version 1.0.4
Gert Wollny
gert-guest at moszumanska.debian.org
Mon Aug 22 11:07:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository miaviewit.
commit c118cbf826489d4d5055eed61dc4654d7db7a868
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Mon Aug 22 11:01:01 2016 +0000
Imported Upstream version 1.0.4
---
ChangeLog | 19 +
Makefile.in | 15 +-
aclocal.m4 | 3 -
config.guess | 17 +-
config.h.in | 15 +-
config.sub | 19 +-
configure | 1346 +++++++++++++++--------------------------------
configure.ac | 31 +-
gui/Makefile.in | 15 +-
gui/pixmaps/Makefile.in | 15 +-
gui/src/Makefile.am | 2 +-
gui/src/Makefile.in | 17 +-
gui/src/userini.cc | 23 +-
m4/ax_boost_base.m4 | 275 ----------
m4/ax_boost_system.m4 | 120 -----
m4/ax_boost_thread.m4 | 149 ------
viewit/Makefile.am | 2 +-
viewit/Makefile.in | 17 +-
viewit/cp_draw.cc | 11 +-
viewit/snapshot.cc | 77 ++-
viewit/snapshot.hh | 21 +-
viewit/vistaloader.cc | 8 +
22 files changed, 603 insertions(+), 1614 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1d590c4..11f4bcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2016-07-24 Gert Wollny <gw.fossdev at gmail.com>
+
+ * version bump to 1.0.4
+ * Enable compiling against libxml++-3.0
+ * Enable compiling against mia-2.4
+
+2016-02-28 Gert Wollny <gw.fossdev at gmail.com>
+
+ * version bump to 1.0.3
+ * replace BOOST-threads by c++11 threads (Closes: #4)
+ * correct SO-name handling
+
+2015-10-21 Gert Wollny <gw.fossdev at gmail.com>
+
+ * version bump to 1.0.2
+ * fix link dependencies with latest mia-2.2 release
+ * fix link dependencies on BOOST
+
+
2014-09-09 Gert Wollny <gw.fossdev at gmail.com>
* version bump to 1.0.1
diff --git a/Makefile.in b/Makefile.in
index 702389f..dd0b677 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,13 +76,10 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
depcomp install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
- $(top_srcdir)/m4/ax_boost_system.m4 \
- $(top_srcdir)/m4/ax_boost_thread.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -190,10 +187,6 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
diff --git a/aclocal.m4 b/aclocal.m4
index 88e068f..51e700d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1032,9 +1032,6 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-m4_include([m4/ax_boost_base.m4])
-m4_include([m4/ax_boost_system.m4])
-m4_include([m4/ax_boost_thread.m4])
m4_include([m4/libtool.m4])
m4_include([m4/ltoptions.m4])
m4_include([m4/ltsugar.m4])
diff --git a/config.guess b/config.guess
index 8a5d3f4..6f790d6 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2015-03-04'
+timestamp='2015-12-14'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -221,7 +221,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
release='-gnu'
;;
*)
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
@@ -249,6 +249,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
exit ;;
+ *:Sortix:*:*)
+ echo ${UNAME_MACHINE}-unknown-sortix
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -962,6 +965,9 @@ EOF
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
+ k1om:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
m32r*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
@@ -1049,7 +1055,7 @@ EOF
X86_64_ABI=x32
fi
fi
- echo x86_64-unknown-linux-gnu${X86_64_ABI}
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}${X86_64_ABI}
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1128,7 +1134,7 @@ EOF
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
- # prints for the "djgpp" host, or else GDB configury will decide that
+ # prints for the "djgpp" host, or else GDB configure will decide that
# this is a cross-build.
echo i586-pc-msdosdjgpp
exit ;;
@@ -1398,6 +1404,9 @@ EOF
x86_64:VMkernel:*:*)
echo ${UNAME_MACHINE}-unknown-esx
exit ;;
+ amd64:Isilon\ OneFS:*:*)
+ echo x86_64-unknown-onefs
+ exit ;;
esac
cat >&2 <<EOF
diff --git a/config.h.in b/config.h.in
index 0e67912..f1a8313 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,14 +1,5 @@
/* config.h.in. Generated from configure.ac by autoheader. */
-/* define if the Boost library is available */
-#undef HAVE_BOOST
-
-/* define if the Boost::System library is available */
-#undef HAVE_BOOST_SYSTEM
-
-/* define if the Boost::Thread library is available */
-#undef HAVE_BOOST_THREAD
-
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@@ -76,9 +67,15 @@
/* Define to 1 if this is an unstable version of the libviewit */
#undef LIBVIEWIT_UNSTABLE
+/* used libxml++ version */
+#undef LIBXMLMM_VERSION
+
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
+/* used MIA version */
+#undef MIA_VERSION
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
diff --git a/config.sub b/config.sub
index 430106a..a16cc4d 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2015-03-08'
+timestamp='2015-12-14'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -53,8 +53,7 @@ timestamp='2015-03-08'
me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
- $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
Canonicalize a configuration name.
@@ -255,6 +254,7 @@ case $basic_machine in
| arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
+ | ba \
| be32 | be64 \
| bfin \
| c4x | c8051 | clipper \
@@ -305,7 +305,7 @@ case $basic_machine in
| riscv32 | riscv64 \
| rl78 | rx \
| score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -376,6 +376,7 @@ case $basic_machine in
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
+ | ba-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
@@ -428,12 +429,13 @@ case $basic_machine in
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
+ | riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile*-* \
@@ -518,7 +520,7 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
- asmjs)
+ asmjs)
basic_machine=asmjs-unknown
;;
aux)
@@ -1394,7 +1396,7 @@ case $os in
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* | -cloudabi* \
+ | -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1414,7 +1416,8 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+ | -onefs* | -tirtos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
diff --git a/configure b/configure
index 729fe40..8191b5d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for miaviewit 1.0.2.
+# Generated by GNU Autoconf 2.69 for miaviewit 1.0.4.
#
# Report bugs to <gw.fossdev at gmail.com>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='miaviewit'
PACKAGE_TARNAME='miaviewit'
-PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='miaviewit 1.0.2'
+PACKAGE_VERSION='1.0.4'
+PACKAGE_STRING='miaviewit 1.0.4'
PACKAGE_BUGREPORT='gw.fossdev at gmail.com'
PACKAGE_URL=''
@@ -636,10 +636,6 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
-BOOST_THREAD_LIB
-BOOST_SYSTEM_LIB
-BOOST_LDFLAGS
-BOOST_CPPFLAGS
OGSL_VOLUMERENDERER_FALSE
OGSL_VOLUMERENDERER_TRUE
GTKGLEXTMM_LIBS
@@ -805,10 +801,6 @@ with_gnu_ld
with_sysroot
enable_libtool_lock
enable_volrenderer
-with_boost
-with_boost_libdir
-with_boost_system
-with_boost_thread
'
ac_precious_vars='build_alias
host_alias
@@ -1377,7 +1369,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures miaviewit 1.0.2 to adapt to many kinds of systems.
+\`configure' configures miaviewit 1.0.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1447,7 +1439,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of miaviewit 1.0.2:";;
+ short | recursive ) echo "Configuration of miaviewit 1.0.4:";;
esac
cat <<\_ACEOF
@@ -1478,23 +1470,6 @@ Optional Packages:
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot[=DIR] Search for dependent libraries within DIR (or the
compiler's sysroot if not specified).
- --with-boost[=ARG] use Boost library from a standard location
- (ARG=yes), from the specified location (ARG=<path>),
- or disable it (ARG=no) [ARG=yes]
- --with-boost-libdir=LIB_DIR
- Force given directory for boost libraries. Note that
- this will override library path detection, so use
- this parameter only if default library detection
- fails and you know exactly where your boost
- libraries are located.
- --with-boost-system[=special-lib]
- use the System library from boost - it is possible
- to specify a certain library for the linker e.g.
- --with-boost-system=boost_system-gcc-mt
- --with-boost-thread[=special-lib]
- use the Thread library from boost - it is possible
- to specify a certain library for the linker e.g.
- --with-boost-thread=boost_thread-gcc-mt
Some influential environment variables:
CXX C++ compiler command
@@ -1598,7 +1573,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-miaviewit configure 1.0.2
+miaviewit configure 1.0.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2188,7 +2163,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by miaviewit $as_me 1.0.2, which was
+It was created by miaviewit $as_me 1.0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3005,7 +2980,7 @@ fi
# Define the identity of the package.
PACKAGE='miaviewit'
- VERSION='1.0.2'
+ VERSION='1.0.4'
# Some tools Automake needs.
@@ -3041,10 +3016,10 @@ ac_config_headers="$ac_config_headers config.h"
LIBVIEWIT_MAJOR_VERSION=1
LIBVIEWIT_MINOR_VERSION=0
-LIBVIEWIT_MICRO_VERSION=2
-LIBVIEWIT_INTERFACE_AGE=2
-LIBVIEWIT_BINARY_AGE=2
-LIBVIEWIT_VERSION=1.0.2
+LIBVIEWIT_MICRO_VERSION=4
+LIBVIEWIT_INTERFACE_AGE=4
+LIBVIEWIT_BINARY_AGE=4
+LIBVIEWIT_VERSION=1.0.4
LIBVIEWIT_UNSTABLE=no
@@ -3069,9 +3044,9 @@ fi
LT_RELEASE=1.0
LT_CURRENT=0
-LT_REVISION=2
+LT_REVISION=4
LT_AGE=0
-LT_VERSION_INFO="0:2:0"
+LT_VERSION_INFO="0:4:0"
@@ -17112,6 +17087,7 @@ SAVE_LIBS=$LIBS
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -17234,12 +17210,152 @@ if test -n "$MIA_CFLAGS"; then
pkg_cv_MIA_CFLAGS="$MIA_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"miamesh-2.2 >= 2.2.5\""; } >&5
- ($PKG_CONFIG --exists --print-errors "miamesh-2.2 >= 2.2.5") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"miamesh-2.4 >= 2.4.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "miamesh-2.4 >= 2.4.2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MIA_CFLAGS=`$PKG_CONFIG --cflags "miamesh-2.4 >= 2.4.2" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$MIA_LIBS"; then
+ pkg_cv_MIA_LIBS="$MIA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"miamesh-2.4 >= 2.4.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "miamesh-2.4 >= 2.4.2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MIA_LIBS=`$PKG_CONFIG --libs "miamesh-2.4 >= 2.4.2" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ MIA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "miamesh-2.4 >= 2.4.2" 2>&1`
+ else
+ MIA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "miamesh-2.4 >= 2.4.2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MIA_PKG_ERRORS" >&5
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MIA" >&5
+$as_echo_n "checking for MIA... " >&6; }
+
+if test -n "$MIA_CFLAGS"; then
+ pkg_cv_MIA_CFLAGS="$MIA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"miamesh-2.2 >= 2.2.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "miamesh-2.2 >= 2.2.7") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MIA_CFLAGS=`$PKG_CONFIG --cflags "miamesh-2.2 >= 2.2.7" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$MIA_LIBS"; then
+ pkg_cv_MIA_LIBS="$MIA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"miamesh-2.2 >= 2.2.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "miamesh-2.2 >= 2.2.7") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MIA_LIBS=`$PKG_CONFIG --libs "miamesh-2.2 >= 2.2.7" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ MIA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "miamesh-2.2 >= 2.2.7" 2>&1`
+ else
+ MIA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "miamesh-2.2 >= 2.2.7" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MIA_PKG_ERRORS" >&5
+
+ as_fn_error $? "Unable to find mia >= 2.2.7" "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ as_fn_error $? "Unable to find mia >= 2.2.7" "$LINENO" 5
+else
+ MIA_CFLAGS=$pkg_cv_MIA_CFLAGS
+ MIA_LIBS=$pkg_cv_MIA_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+
+$as_echo "#define MIA_VERSION 020200" >>confdefs.h
+
+
+fi
+
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MIA" >&5
+$as_echo_n "checking for MIA... " >&6; }
+
+if test -n "$MIA_CFLAGS"; then
+ pkg_cv_MIA_CFLAGS="$MIA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"miamesh-2.2 >= 2.2.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "miamesh-2.2 >= 2.2.7") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_MIA_CFLAGS=`$PKG_CONFIG --cflags "miamesh-2.2 >= 2.2.5" 2>/dev/null`
+ pkg_cv_MIA_CFLAGS=`$PKG_CONFIG --cflags "miamesh-2.2 >= 2.2.7" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17251,12 +17367,12 @@ if test -n "$MIA_LIBS"; then
pkg_cv_MIA_LIBS="$MIA_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"miamesh-2.2 >= 2.2.5\""; } >&5
- ($PKG_CONFIG --exists --print-errors "miamesh-2.2 >= 2.2.5") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"miamesh-2.2 >= 2.2.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "miamesh-2.2 >= 2.2.7") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_MIA_LIBS=`$PKG_CONFIG --libs "miamesh-2.2 >= 2.2.5" 2>/dev/null`
+ pkg_cv_MIA_LIBS=`$PKG_CONFIG --libs "miamesh-2.2 >= 2.2.7" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17277,26 +17393,43 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- MIA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "miamesh-2.2 >= 2.2.5" 2>&1`
+ MIA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "miamesh-2.2 >= 2.2.7" 2>&1`
else
- MIA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "miamesh-2.2 >= 2.2.5" 2>&1`
+ MIA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "miamesh-2.2 >= 2.2.7" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$MIA_PKG_ERRORS" >&5
- as_fn_error $? "Unable to find MIA >= 2.2.5" "$LINENO" 5
+ as_fn_error $? "Unable to find mia >= 2.2.7" "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- as_fn_error $? "Unable to find MIA >= 2.2.5" "$LINENO" 5
+ as_fn_error $? "Unable to find mia >= 2.2.7" "$LINENO" 5
+else
+ MIA_CFLAGS=$pkg_cv_MIA_CFLAGS
+ MIA_LIBS=$pkg_cv_MIA_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+
+$as_echo "#define MIA_VERSION 020200" >>confdefs.h
+
+
+fi
+
else
MIA_CFLAGS=$pkg_cv_MIA_CFLAGS
MIA_LIBS=$pkg_cv_MIA_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+
+$as_echo "#define MIA_VERSION 020400" >>confdefs.h
+
+
fi
+
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VISTAIO" >&5
$as_echo_n "checking for VISTAIO... " >&6; }
@@ -17376,12 +17509,12 @@ if test -n "$XMLMM_CFLAGS"; then
pkg_cv_XMLMM_CFLAGS="$XMLMM_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml++-2.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libxml++-2.6") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml++-3.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libxml++-3.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_XMLMM_CFLAGS=`$PKG_CONFIG --cflags "libxml++-2.6" 2>/dev/null`
+ pkg_cv_XMLMM_CFLAGS=`$PKG_CONFIG --cflags "libxml++-3.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17393,12 +17526,12 @@ if test -n "$XMLMM_LIBS"; then
pkg_cv_XMLMM_LIBS="$XMLMM_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml++-2.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libxml++-2.6") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml++-3.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libxml++-3.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_XMLMM_LIBS=`$PKG_CONFIG --libs "libxml++-2.6" 2>/dev/null`
+ pkg_cv_XMLMM_LIBS=`$PKG_CONFIG --libs "libxml++-3.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17419,43 +17552,29 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XMLMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml++-2.6" 2>&1`
+ XMLMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml++-3.0" 2>&1`
else
- XMLMM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml++-2.6" 2>&1`
+ XMLMM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml++-3.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$XMLMM_PKG_ERRORS" >&5
- as_fn_error $? "Unable to find libxml++" "$LINENO" 5
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error $? "Unable to find libxml++" "$LINENO" 5
-else
- XMLMM_CFLAGS=$pkg_cv_XMLMM_CFLAGS
- XMLMM_LIBS=$pkg_cv_XMLMM_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIBMM" >&5
-$as_echo_n "checking for GLIBMM... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XMLMM" >&5
+$as_echo_n "checking for XMLMM... " >&6; }
-if test -n "$GLIBMM_CFLAGS"; then
- pkg_cv_GLIBMM_CFLAGS="$GLIBMM_CFLAGS"
+if test -n "$XMLMM_CFLAGS"; then
+ pkg_cv_XMLMM_CFLAGS="$XMLMM_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glibmm-2.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glibmm-2.4") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml++-2.6\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libxml++-2.6") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GLIBMM_CFLAGS=`$PKG_CONFIG --cflags "glibmm-2.4" 2>/dev/null`
+ pkg_cv_XMLMM_CFLAGS=`$PKG_CONFIG --cflags "libxml++-2.6" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17463,16 +17582,16 @@ fi
else
pkg_failed=untried
fi
-if test -n "$GLIBMM_LIBS"; then
- pkg_cv_GLIBMM_LIBS="$GLIBMM_LIBS"
+if test -n "$XMLMM_LIBS"; then
+ pkg_cv_XMLMM_LIBS="$XMLMM_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glibmm-2.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glibmm-2.4") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml++-2.6\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libxml++-2.6") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GLIBMM_LIBS=`$PKG_CONFIG --libs "glibmm-2.4" 2>/dev/null`
+ pkg_cv_XMLMM_LIBS=`$PKG_CONFIG --libs "libxml++-2.6" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17493,64 +17612,49 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GLIBMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glibmm-2.4" 2>&1`
+ XMLMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml++-2.6" 2>&1`
else
- GLIBMM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glibmm-2.4" 2>&1`
+ XMLMM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml++-2.6" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$GLIBMM_PKG_ERRORS" >&5
-
- as_fn_error $? "Package requirements (glibmm-2.4) were not met:
-
-$GLIBMM_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+ echo "$XMLMM_PKG_ERRORS" >&5
-Alternatively, you may set the environment variables GLIBMM_CFLAGS
-and GLIBMM_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+ as_fn_error $? "Unable to find libxml++" "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GLIBMM_CFLAGS
-and GLIBMM_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+ as_fn_error $? "Unable to find libxml++" "$LINENO" 5
else
- GLIBMM_CFLAGS=$pkg_cv_GLIBMM_CFLAGS
- GLIBMM_LIBS=$pkg_cv_GLIBMM_LIBS
+ XMLMM_CFLAGS=$pkg_cv_XMLMM_CFLAGS
+ XMLMM_LIBS=$pkg_cv_XMLMM_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-fi
+$as_echo "#define LIBXMLMM_VERSION 2" >>confdefs.h
+fi
+
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKGLEXTMM" >&5
-$as_echo_n "checking for GTKGLEXTMM... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XMLMM" >&5
+$as_echo_n "checking for XMLMM... " >&6; }
-if test -n "$GTKGLEXTMM_CFLAGS"; then
- pkg_cv_GTKGLEXTMM_CFLAGS="$GTKGLEXTMM_CFLAGS"
+if test -n "$XMLMM_CFLAGS"; then
+ pkg_cv_XMLMM_CFLAGS="$XMLMM_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkglextmm-1.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtkglextmm-1.2") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml++-2.6\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libxml++-2.6") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GTKGLEXTMM_CFLAGS=`$PKG_CONFIG --cflags "gtkglextmm-1.2" 2>/dev/null`
+ pkg_cv_XMLMM_CFLAGS=`$PKG_CONFIG --cflags "libxml++-2.6" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17558,16 +17662,16 @@ fi
else
pkg_failed=untried
fi
-if test -n "$GTKGLEXTMM_LIBS"; then
- pkg_cv_GTKGLEXTMM_LIBS="$GTKGLEXTMM_LIBS"
+if test -n "$XMLMM_LIBS"; then
+ pkg_cv_XMLMM_LIBS="$XMLMM_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkglextmm-1.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtkglextmm-1.2") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml++-2.6\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libxml++-2.6") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GTKGLEXTMM_LIBS=`$PKG_CONFIG --libs "gtkglextmm-1.2" 2>/dev/null`
+ pkg_cv_XMLMM_LIBS=`$PKG_CONFIG --libs "libxml++-2.6" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17588,16 +17692,201 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTKGLEXTMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtkglextmm-1.2" 2>&1`
+ XMLMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml++-2.6" 2>&1`
else
- GTKGLEXTMM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtkglextmm-1.2" 2>&1`
+ XMLMM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml++-2.6" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$GTKGLEXTMM_PKG_ERRORS" >&5
-
- as_fn_error $? "Package requirements (gtkglextmm-1.2) were not met:
+ echo "$XMLMM_PKG_ERRORS" >&5
-$GTKGLEXTMM_PKG_ERRORS
+ as_fn_error $? "Unable to find libxml++" "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ as_fn_error $? "Unable to find libxml++" "$LINENO" 5
+else
+ XMLMM_CFLAGS=$pkg_cv_XMLMM_CFLAGS
+ XMLMM_LIBS=$pkg_cv_XMLMM_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+
+$as_echo "#define LIBXMLMM_VERSION 2" >>confdefs.h
+
+
+fi
+
+else
+ XMLMM_CFLAGS=$pkg_cv_XMLMM_CFLAGS
+ XMLMM_LIBS=$pkg_cv_XMLMM_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+
+$as_echo "#define LIBXMLMM_VERSION 3" >>confdefs.h
+
+
+fi
+
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIBMM" >&5
+$as_echo_n "checking for GLIBMM... " >&6; }
+
+if test -n "$GLIBMM_CFLAGS"; then
+ pkg_cv_GLIBMM_CFLAGS="$GLIBMM_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glibmm-2.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glibmm-2.4") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GLIBMM_CFLAGS=`$PKG_CONFIG --cflags "glibmm-2.4" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GLIBMM_LIBS"; then
+ pkg_cv_GLIBMM_LIBS="$GLIBMM_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glibmm-2.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glibmm-2.4") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GLIBMM_LIBS=`$PKG_CONFIG --libs "glibmm-2.4" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GLIBMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glibmm-2.4" 2>&1`
+ else
+ GLIBMM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glibmm-2.4" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GLIBMM_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (glibmm-2.4) were not met:
+
+$GLIBMM_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GLIBMM_CFLAGS
+and GLIBMM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GLIBMM_CFLAGS
+and GLIBMM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ GLIBMM_CFLAGS=$pkg_cv_GLIBMM_CFLAGS
+ GLIBMM_LIBS=$pkg_cv_GLIBMM_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKGLEXTMM" >&5
+$as_echo_n "checking for GTKGLEXTMM... " >&6; }
+
+if test -n "$GTKGLEXTMM_CFLAGS"; then
+ pkg_cv_GTKGLEXTMM_CFLAGS="$GTKGLEXTMM_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkglextmm-1.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtkglextmm-1.2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTKGLEXTMM_CFLAGS=`$PKG_CONFIG --cflags "gtkglextmm-1.2" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GTKGLEXTMM_LIBS"; then
+ pkg_cv_GTKGLEXTMM_LIBS="$GTKGLEXTMM_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkglextmm-1.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtkglextmm-1.2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTKGLEXTMM_LIBS=`$PKG_CONFIG --libs "gtkglextmm-1.2" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GTKGLEXTMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtkglextmm-1.2" 2>&1`
+ else
+ GTKGLEXTMM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtkglextmm-1.2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTKGLEXTMM_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (gtkglextmm-1.2) were not met:
+
+$GTKGLEXTMM_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
@@ -17938,801 +18227,6 @@ $as_echo "#define VOLUME_RENDERER 1" >>confdefs.h
fi
-
-
-
-# Check whether --with-boost was given.
-if test "${with_boost+set}" = set; then :
- withval=$with_boost;
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ac_boost_path=""
- else
- want_boost="yes"
- ac_boost_path="$withval"
- fi
-
-else
- want_boost="yes"
-fi
-
-
-
-
-# Check whether --with-boost-libdir was given.
-if test "${with_boost_libdir+set}" = set; then :
- withval=$with_boost_libdir;
- if test -d "$withval"
- then
- ac_boost_lib_path="$withval"
- else
- as_fn_error $? "--with-boost-libdir expected directory name" "$LINENO" 5
- fi
-
-else
- ac_boost_lib_path=""
-
-fi
-
-
-if test "x$want_boost" = "xyes"; then
- boost_lib_version_req=1.46
- boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([0-9]*\.[0-9]*\)'`
- boost_lib_version_req_major=`expr $boost_lib_version_req : '\([0-9]*\)'`
- boost_lib_version_req_minor=`expr $boost_lib_version_req : '[0-9]*\.\([0-9]*\)'`
- boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
- if test "x$boost_lib_version_req_sub_minor" = "x" ; then
- boost_lib_version_req_sub_minor="0"
- fi
- WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boostlib >= $boost_lib_version_req" >&5
-$as_echo_n "checking for boostlib >= $boost_lib_version_req... " >&6; }
- succeeded=no
-
- libsubdirs="lib"
- ax_arch=`uname -m`
- case $ax_arch in
- x86_64)
- libsubdirs="lib64 libx32 lib lib64"
- ;;
- ppc64|s390x|sparc64|aarch64|ppc64le)
- libsubdirs="lib64 lib lib64 ppc64le"
- ;;
- esac
-
-
- libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
-
- case ${host_cpu} in
- i?86)
- libsubdirs="lib/i386-${host_os} $libsubdirs"
- ;;
- esac
-
- if test "$ac_boost_path" != ""; then
- BOOST_CPPFLAGS="-I$ac_boost_path/include"
- for ac_boost_path_tmp in $libsubdirs; do
- if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
- BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
- break
- fi
- done
- elif test "$cross_compiling" != yes; then
- for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
- if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
- for libsubdir in $libsubdirs ; do
- if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
- done
- BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"
- BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
- break;
- fi
- done
- fi
-
- if test "$ac_boost_lib_path" != ""; then
- BOOST_LDFLAGS="-L$ac_boost_lib_path"
- fi
-
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
-
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
-
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <boost/version.hpp>
-
-int
-main ()
-{
-
- #if BOOST_VERSION >= $WANT_BOOST_VERSION
- // Everything is okay
- #else
- # error Boost version is too old
- #endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- succeeded=yes
- found_system=yes
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
- if test "x$succeeded" != "xyes"; then
- _version=0
- if test "$ac_boost_path" != ""; then
- if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
- for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
- _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
- V_CHECK=`expr $_version_tmp \> $_version`
- if test "$V_CHECK" = "1" ; then
- _version=$_version_tmp
- fi
- VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
- BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
- done
- fi
- else
- if test "$cross_compiling" != yes; then
- for ac_boost_path in /usr /usr/local /opt /opt/local ; do
- if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
- for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
- _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
- V_CHECK=`expr $_version_tmp \> $_version`
- if test "$V_CHECK" = "1" ; then
- _version=$_version_tmp
- best_path=$ac_boost_path
- fi
- done
- fi
- done
-
- VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
- BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
- if test "$ac_boost_lib_path" = ""; then
- for libsubdir in $libsubdirs ; do
- if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
- done
- BOOST_LDFLAGS="-L$best_path/$libsubdir"
- fi
- fi
-
- if test "x$BOOST_ROOT" != "x"; then
- for libsubdir in $libsubdirs ; do
- if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
- done
- if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then
- version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
- stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
- stage_version_shorten=`expr $stage_version : '\([0-9]*\.[0-9]*\)'`
- V_CHECK=`expr $stage_version_shorten \>\= $_version`
- if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: We will use a staged boost library from $BOOST_ROOT" >&5
-$as_echo "$as_me: We will use a staged boost library from $BOOST_ROOT" >&6;}
- BOOST_CPPFLAGS="-I$BOOST_ROOT"
- BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
- fi
- fi
- fi
- fi
-
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <boost/version.hpp>
-
-int
-main ()
-{
-
- #if BOOST_VERSION >= $WANT_BOOST_VERSION
- // Everything is okay
- #else
- # error Boost version is too old
- #endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- succeeded=yes
- found_system=yes
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- fi
-
- if test "$succeeded" != "yes" ; then
- if test "$_version" = "0" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation." >&5
-$as_echo "$as_me: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation." >&6;}
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: Your boost libraries seems to old (version $_version)." >&5
-$as_echo "$as_me: Your boost libraries seems to old (version $_version)." >&6;}
- fi
- # execute ACTION-IF-NOT-FOUND (if present):
- :
- else
-
-
-
-$as_echo "#define HAVE_BOOST /**/" >>confdefs.h
-
- # execute ACTION-IF-FOUND (if present):
- :
- fi
-
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
-fi
-
-
-CXXFLAGS="$CXXFLAGS $BOOST_CPPFLAGS"
-
-
-
-# Check whether --with-boost-system was given.
-if test "${with_boost_system+set}" = set; then :
- withval=$with_boost_system;
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ax_boost_user_system_lib=""
- else
- want_boost="yes"
- ax_boost_user_system_lib="$withval"
- fi
-
-else
- want_boost="yes"
-
-fi
-
-
- if test "x$want_boost" = "xyes"; then
-
-
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
-
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::System library is available" >&5
-$as_echo_n "checking whether the Boost::System library is available... " >&6; }
-if ${ax_cv_boost_system+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- CXXFLAGS_SAVE=$CXXFLAGS
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <boost/system/error_code.hpp>
-int
-main ()
-{
-boost::system::system_category
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ax_cv_boost_system=yes
-else
- ax_cv_boost_system=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS=$CXXFLAGS_SAVE
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_system" >&5
-$as_echo "$ax_cv_boost_system" >&6; }
- if test "x$ax_cv_boost_system" = "xyes"; then
-
-
-
-$as_echo "#define HAVE_BOOST_SYSTEM /**/" >>confdefs.h
-
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'`
-
- LDFLAGS_SAVE=$LDFLAGS
- if test "x$ax_boost_user_system_lib" = "x"; then
- for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
- ax_lib=${libextension}
- as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-$as_echo_n "checking for exit in -l$ax_lib... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$ax_lib $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char exit ();
-int
-main ()
-{
-return exit ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
-else
- eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break
-else
- link_system="no"
-fi
-
- done
- if test "x$link_system" != "xyes"; then
- for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
- ax_lib=${libextension}
- as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-$as_echo_n "checking for exit in -l$ax_lib... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$ax_lib $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char exit ();
-int
-main ()
-{
-return exit ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
-else
- eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break
-else
- link_system="no"
-fi
-
- done
- fi
-
- else
- for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
- as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-$as_echo_n "checking for exit in -l$ax_lib... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$ax_lib $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char exit ();
-int
-main ()
-{
-return exit ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
-else
- eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break
-else
- link_system="no"
-fi
-
- done
-
- fi
- if test "x$ax_lib" = "x"; then
- as_fn_error $? "Could not find a version of the library!" "$LINENO" 5
- fi
- if test "x$link_system" = "xno"; then
- as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5
- fi
- fi
-
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
-
-
-
-# Check whether --with-boost-thread was given.
-if test "${with_boost_thread+set}" = set; then :
- withval=$with_boost_thread;
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ax_boost_user_thread_lib=""
- else
- want_boost="yes"
- ax_boost_user_thread_lib="$withval"
- fi
-
-else
- want_boost="yes"
-
-fi
-
-
- if test "x$want_boost" = "xyes"; then
-
-
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
-
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Thread library is available" >&5
-$as_echo_n "checking whether the Boost::Thread library is available... " >&6; }
-if ${ax_cv_boost_thread+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- CXXFLAGS_SAVE=$CXXFLAGS
-
- if test "x$host_os" = "xsolaris" ; then
- CXXFLAGS="-pthreads $CXXFLAGS"
- elif test "x$host_os" = "xmingw32" ; then
- CXXFLAGS="-mthreads $CXXFLAGS"
- else
- CXXFLAGS="-pthread $CXXFLAGS"
- fi
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <boost/thread/thread.hpp>
-int
-main ()
-{
-boost::thread_group thrds;
- return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ax_cv_boost_thread=yes
-else
- ax_cv_boost_thread=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS=$CXXFLAGS_SAVE
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_thread" >&5
-$as_echo "$ax_cv_boost_thread" >&6; }
- if test "x$ax_cv_boost_thread" = "xyes"; then
- if test "x$host_os" = "xsolaris" ; then
- BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
- elif test "x$host_os" = "xmingw32" ; then
- BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
- else
- BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
- fi
-
-
-
-
-$as_echo "#define HAVE_BOOST_THREAD /**/" >>confdefs.h
-
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'`
-
- LDFLAGS_SAVE=$LDFLAGS
- case "x$host_os" in
- *bsd* )
- LDFLAGS="-pthread $LDFLAGS"
- break;
- ;;
- esac
- if test "x$ax_boost_user_thread_lib" = "x"; then
- for libextension in `ls -r $BOOSTLIBDIR/libboost_thread* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'`; do
- ax_lib=${libextension}
- as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-$as_echo_n "checking for exit in -l$ax_lib... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$ax_lib $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char exit ();
-int
-main ()
-{
-return exit ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
-else
- eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- BOOST_THREAD_LIB="-l$ax_lib"; link_thread="yes"; break
-else
- link_thread="no"
-fi
-
- done
- if test "x$link_thread" != "xyes"; then
- for libextension in `ls -r $BOOSTLIBDIR/boost_thread* 2>/dev/null | sed 's,.*/,,' | sed 's,\..*,,'`; do
- ax_lib=${libextension}
- as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-$as_echo_n "checking for exit in -l$ax_lib... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$ax_lib $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char exit ();
-int
-main ()
-{
-return exit ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
-else
- eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- BOOST_THREAD_LIB="-l$ax_lib"; link_thread="yes"; break
-else
- link_thread="no"
-fi
-
- done
- fi
-
- else
- for ax_lib in $ax_boost_user_thread_lib boost_thread-$ax_boost_user_thread_lib; do
- as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-$as_echo_n "checking for exit in -l$ax_lib... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$ax_lib $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char exit ();
-int
-main ()
-{
-return exit ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
-else
- eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- BOOST_THREAD_LIB="-l$ax_lib"; link_thread="yes"; break
-else
- link_thread="no"
-fi
-
- done
-
- fi
- if test "x$ax_lib" = "x"; then
- as_fn_error $? "Could not find a version of the library!" "$LINENO" 5
- fi
- if test "x$link_thread" = "xno"; then
- as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5
- else
- case "x$host_os" in
- *bsd* )
- BOOST_LDFLAGS="-pthread $BOOST_LDFLAGS"
- break;
- ;;
- esac
-
- fi
- fi
-
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
-
-
# Checks for library functions.
for ac_header in stdlib.h
do :
@@ -19464,7 +18958,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by miaviewit $as_me 1.0.2, which was
+This file was extended by miaviewit $as_me 1.0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19530,7 +19024,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-miaviewit config.status 1.0.2
+miaviewit config.status 1.0.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index de6a02f..d48ccf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,10 +36,10 @@ AC_CONFIG_MACRO_DIR([m4])
m4_define([libviewit_major_version], [1])
m4_define([libviewit_minor_version], [0])
-m4_define([libviewit_micro_version], [2])
+m4_define([libviewit_micro_version], [4])
m4_define([libviewit_current_interface], [0])
-m4_define([libviewit_interface_age], [2])
-m4_define([libviewit_binary_age], [2])
+m4_define([libviewit_interface_age], [4])
+m4_define([libviewit_binary_age], [4])
@@ -147,9 +147,23 @@ AC_SEARCH_LIBS([sqrtf], [m])
#check for MIA and VISTAIO
SAVE_LIBS=$LIBS
-PKG_CHECK_MODULES(MIA, miamesh-2.2 >= 2.2.5,, [AC_MSG_ERROR(Unable to find MIA >= 2.2.5)])
+
+PKG_CHECK_MODULES(MIA, miamesh-2.4 >= 2.4.2,[
+ AC_DEFINE(MIA_VERSION, 020400, [used MIA version])
+], [
+ PKG_CHECK_MODULES(MIA, miamesh-2.2 >= 2.2.7,[
+ AC_DEFINE(MIA_VERSION, 020200, [used MIA version])
+ ], [AC_MSG_ERROR(Unable to find mia >= 2.2.7)])
+])
+
PKG_CHECK_MODULES(VISTAIO, libvistaio >= 1.2.14 ,, [AC_MSG_ERROR(Unable to find vistaio >= 1.2.14)])
-PKG_CHECK_MODULES(XMLMM, libxml++-2.6,, [AC_MSG_ERROR(Unable to find libxml++)])
+PKG_CHECK_MODULES(XMLMM, libxml++-3.0, [
+ AC_DEFINE(LIBXMLMM_VERSION, 3, [used libxml++ version])
+], [
+ PKG_CHECK_MODULES(XMLMM, libxml++-2.6,[
+ AC_DEFINE(LIBXMLMM_VERSION, 2, [used libxml++ version])
+ ], [AC_MSG_ERROR(Unable to find libxml++)])
+])
AC_SUBST(XMLMM_LIBS)
AC_SUBST(XMLMM_INCLUDES)
@@ -206,13 +220,6 @@ if test x$support_ogls = xyes ; then
AC_DEFINE(VOLUME_RENDERER, 1, [enable volume renderer])
fi
-
-AX_BOOST_BASE([1.46])
-CXXFLAGS="$CXXFLAGS $BOOST_CPPFLAGS"
-
-AX_BOOST_SYSTEM
-AX_BOOST_THREAD
-
# Checks for library functions.
AC_FUNC_MALLOC
AC_FUNC_SELECT_ARGTYPES
diff --git a/gui/Makefile.in b/gui/Makefile.in
index d0987f8..5057e10 100644
--- a/gui/Makefile.in
+++ b/gui/Makefile.in
@@ -71,13 +71,10 @@ host_triplet = @host@
subdir = gui
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
- $(top_srcdir)/m4/ax_boost_system.m4 \
- $(top_srcdir)/m4/ax_boost_thread.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -139,10 +136,6 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
diff --git a/gui/pixmaps/Makefile.in b/gui/pixmaps/Makefile.in
index 06965ac..e88ec1c 100644
--- a/gui/pixmaps/Makefile.in
+++ b/gui/pixmaps/Makefile.in
@@ -71,13 +71,10 @@ host_triplet = @host@
subdir = gui/pixmaps
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
- $(top_srcdir)/m4/ax_boost_system.m4 \
- $(top_srcdir)/m4/ax_boost_thread.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -99,10 +96,6 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
diff --git a/gui/src/Makefile.am b/gui/src/Makefile.am
index 583cf1a..3272cba 100644
--- a/gui/src/Makefile.am
+++ b/gui/src/Makefile.am
@@ -94,7 +94,7 @@ noinst_HEADERS = \
AM_CXXFLAGS = @CXXFLAGS@ @GTKGLEXTMM_CFLAGS@ @XMLMM_CFLAGS@
-mia_viewitgui_LDADD = ../../viewit/libmiaviewit.la @MIA_LIBS@ @XMLMM_LIBS@ @GTKGLEXTMM_LIBS@ @BOOST_SYSTEM_LIB@
+mia_viewitgui_LDADD = ../../viewit/libmiaviewit.la @MIA_LIBS@ @XMLMM_LIBS@ @GTKGLEXTMM_LIBS@
man1_MANS = mia-viewitgui.1
diff --git a/gui/src/Makefile.in b/gui/src/Makefile.in
index 1fe5ec2..54f795a 100644
--- a/gui/src/Makefile.in
+++ b/gui/src/Makefile.in
@@ -75,13 +75,10 @@ subdir = gui/src
DIST_COMMON = $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
- $(top_srcdir)/m4/ax_boost_system.m4 \
- $(top_srcdir)/m4/ax_boost_thread.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -191,10 +188,6 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -404,7 +397,7 @@ noinst_HEADERS = \
progress_window.hh $(volrend_HEADER)
AM_CXXFLAGS = @CXXFLAGS@ @GTKGLEXTMM_CFLAGS@ @XMLMM_CFLAGS@
-mia_viewitgui_LDADD = ../../viewit/libmiaviewit.la @MIA_LIBS@ @XMLMM_LIBS@ @GTKGLEXTMM_LIBS@ @BOOST_SYSTEM_LIB@
+mia_viewitgui_LDADD = ../../viewit/libmiaviewit.la @MIA_LIBS@ @XMLMM_LIBS@ @GTKGLEXTMM_LIBS@
man1_MANS = mia-viewitgui.1
EXTRA_DIST = mia-viewitgui.1
all: all-am
diff --git a/gui/src/userini.cc b/gui/src/userini.cc
index 9be5581..476acda 100644
--- a/gui/src/userini.cc
+++ b/gui/src/userini.cc
@@ -29,9 +29,10 @@
#include <libxml++/libxml++.h>
-#ifdef LIBXML_OLD_VERSION
-#define add_child_text add_content
-#define get_child_text get_child_content
+#if LIBXMLMM_VERSION < 3
+#define add_child_element add_child
+#define remove_node remove_child
+#define get_first_child_text get_child_text
#endif
XMLini::XMLini()
@@ -87,8 +88,8 @@ void XMLini::set_value(std::string const §ion, std::string const &key, std::
// if the desired section was not found -> create it
if (ibeg == iend) {
- xmlpp::Element* nodeChild = nodeRoot->add_child(section);
- nodeChild = nodeChild->add_child(key);
+ xmlpp::Element* nodeChild = nodeRoot->add_child_element(section);
+ nodeChild = nodeChild->add_child_element(key);
nodeChild->add_child_text(value);
} else {
xmlpp::Element *nodeSection = dynamic_cast<xmlpp::Element*>(*ibeg);
@@ -101,12 +102,12 @@ void XMLini::set_value(std::string const §ion, std::string const &key, std::
// if the desired key was not found -> create it
if (ibeg == iend) {
- xmlpp::Element* nodeChild = nodeSection->add_child(key);
+ xmlpp::Element* nodeChild = nodeSection->add_child_element(key);
nodeChild->add_child_text(value);
} else {
xmlpp::Element *el = dynamic_cast<xmlpp::Element *>(*ibeg);
- if (el->get_child_text())
- el->remove_child(el->get_child_text());
+ if (el->get_first_child_text())
+ el->remove_node(el->get_first_child_text());
el->add_child_text(value);
}
@@ -136,8 +137,8 @@ bool XMLini::get_value(std::string §ion, std::string &key, std::string &valu
if (ibeg == iend) return false;
- if (dynamic_cast<xmlpp::Element*>(*ibeg)->get_child_text())
- value = dynamic_cast<xmlpp::Element*>(*ibeg)->get_child_text()->get_content();
+ if (dynamic_cast<xmlpp::Element*>(*ibeg)->get_first_child_text())
+ value = dynamic_cast<xmlpp::Element*>(*ibeg)->get_first_child_text()->get_content();
else
return false;
@@ -157,7 +158,7 @@ bool XMLini::remove_section(const std::string §ion)
if (ibeg == iend) return false;
- nodeRoot->remove_child(*ibeg);
+ nodeRoot->remove_node(*ibeg);
return true;
}
diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4
deleted file mode 100644
index d7c9d0d..0000000
--- a/m4/ax_boost_base.m4
+++ /dev/null
@@ -1,275 +0,0 @@
-# ===========================================================================
-# http://www.gnu.org/software/autoconf-archive/ax_boost_base.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-# AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# DESCRIPTION
-#
-# Test for the Boost C++ libraries of a particular version (or newer)
-#
-# If no path to the installed boost library is given the macro searchs
-# under /usr, /usr/local, /opt and /opt/local and evaluates the
-# $BOOST_ROOT environment variable. Further documentation is available at
-# <http://randspringer.de/boost/index.html>.
-#
-# This macro calls:
-#
-# AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
-#
-# And sets:
-#
-# HAVE_BOOST
-#
-# LICENSE
-#
-# Copyright (c) 2008 Thomas Porschberg <thomas at randspringer.de>
-# Copyright (c) 2009 Peter Adolphs
-#
-# Copying and distribution of this file, with or without modification, are
-# permitted in any medium without royalty provided the copyright notice
-# and this notice are preserved. This file is offered as-is, without any
-# warranty.
-
-#serial 25
-
-AC_DEFUN([AX_BOOST_BASE],
-[
-AC_ARG_WITH([boost],
- [AS_HELP_STRING([--with-boost@<:@=ARG@:>@],
- [use Boost library from a standard location (ARG=yes),
- from the specified location (ARG=<path>),
- or disable it (ARG=no)
- @<:@ARG=yes@:>@ ])],
- [
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ac_boost_path=""
- else
- want_boost="yes"
- ac_boost_path="$withval"
- fi
- ],
- [want_boost="yes"])
-
-
-AC_ARG_WITH([boost-libdir],
- AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
- [Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
- [
- if test -d "$withval"
- then
- ac_boost_lib_path="$withval"
- else
- AC_MSG_ERROR(--with-boost-libdir expected directory name)
- fi
- ],
- [ac_boost_lib_path=""]
-)
-
-if test "x$want_boost" = "xyes"; then
- boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
- boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
- boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
- boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
- boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
- if test "x$boost_lib_version_req_sub_minor" = "x" ; then
- boost_lib_version_req_sub_minor="0"
- fi
- WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
- AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
- succeeded=no
-
- dnl On 64-bit systems check for system libraries in both lib64 and lib.
- dnl The former is specified by FHS, but e.g. Debian does not adhere to
- dnl this (as it rises problems for generic multi-arch support).
- dnl The last entry in the list is chosen by default when no libraries
- dnl are found, e.g. when only header-only libraries are installed!
- libsubdirs="lib"
- ax_arch=`uname -m`
- case $ax_arch in
- x86_64)
- libsubdirs="lib64 libx32 lib lib64"
- ;;
- ppc64|s390x|sparc64|aarch64|ppc64le)
- libsubdirs="lib64 lib lib64 ppc64le"
- ;;
- esac
-
- dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
- dnl them priority over the other paths since, if libs are found there, they
- dnl are almost assuredly the ones desired.
- AC_REQUIRE([AC_CANONICAL_HOST])
- libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
-
- case ${host_cpu} in
- i?86)
- libsubdirs="lib/i386-${host_os} $libsubdirs"
- ;;
- esac
-
- dnl first we check the system location for boost libraries
- dnl this location ist chosen if boost libraries are installed with the --layout=system option
- dnl or if you install boost with RPM
- if test "$ac_boost_path" != ""; then
- BOOST_CPPFLAGS="-I$ac_boost_path/include"
- for ac_boost_path_tmp in $libsubdirs; do
- if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
- BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
- break
- fi
- done
- elif test "$cross_compiling" != yes; then
- for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
- if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
- for libsubdir in $libsubdirs ; do
- if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
- done
- BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"
- BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
- break;
- fi
- done
- fi
-
- dnl overwrite ld flags if we have required special directory with
- dnl --with-boost-libdir parameter
- if test "$ac_boost_lib_path" != ""; then
- BOOST_LDFLAGS="-L$ac_boost_lib_path"
- fi
-
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
-
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- AC_REQUIRE([AC_PROG_CXX])
- AC_LANG_PUSH(C++)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- @%:@include <boost/version.hpp>
- ]], [[
- #if BOOST_VERSION >= $WANT_BOOST_VERSION
- // Everything is okay
- #else
- # error Boost version is too old
- #endif
- ]])],[
- AC_MSG_RESULT(yes)
- succeeded=yes
- found_system=yes
- ],[
- ])
- AC_LANG_POP([C++])
-
-
-
- dnl if we found no boost with system layout we search for boost libraries
- dnl built and installed without the --layout=system option or for a staged(not installed) version
- if test "x$succeeded" != "xyes"; then
- _version=0
- if test "$ac_boost_path" != ""; then
- if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
- for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
- _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
- V_CHECK=`expr $_version_tmp \> $_version`
- if test "$V_CHECK" = "1" ; then
- _version=$_version_tmp
- fi
- VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
- BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
- done
- fi
- else
- if test "$cross_compiling" != yes; then
- for ac_boost_path in /usr /usr/local /opt /opt/local ; do
- if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
- for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
- _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
- V_CHECK=`expr $_version_tmp \> $_version`
- if test "$V_CHECK" = "1" ; then
- _version=$_version_tmp
- best_path=$ac_boost_path
- fi
- done
- fi
- done
-
- VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
- BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
- if test "$ac_boost_lib_path" = ""; then
- for libsubdir in $libsubdirs ; do
- if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
- done
- BOOST_LDFLAGS="-L$best_path/$libsubdir"
- fi
- fi
-
- if test "x$BOOST_ROOT" != "x"; then
- for libsubdir in $libsubdirs ; do
- if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
- done
- if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then
- version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
- stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
- stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
- V_CHECK=`expr $stage_version_shorten \>\= $_version`
- if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
- AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
- BOOST_CPPFLAGS="-I$BOOST_ROOT"
- BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
- fi
- fi
- fi
- fi
-
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- AC_LANG_PUSH(C++)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- @%:@include <boost/version.hpp>
- ]], [[
- #if BOOST_VERSION >= $WANT_BOOST_VERSION
- // Everything is okay
- #else
- # error Boost version is too old
- #endif
- ]])],[
- AC_MSG_RESULT(yes)
- succeeded=yes
- found_system=yes
- ],[
- ])
- AC_LANG_POP([C++])
- fi
-
- if test "$succeeded" != "yes" ; then
- if test "$_version" = "0" ; then
- AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
- else
- AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
- fi
- # execute ACTION-IF-NOT-FOUND (if present):
- ifelse([$3], , :, [$3])
- else
- AC_SUBST(BOOST_CPPFLAGS)
- AC_SUBST(BOOST_LDFLAGS)
- AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
- # execute ACTION-IF-FOUND (if present):
- ifelse([$2], , :, [$2])
- fi
-
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
-fi
-
-])
diff --git a/m4/ax_boost_system.m4 b/m4/ax_boost_system.m4
deleted file mode 100644
index c4c4555..0000000
--- a/m4/ax_boost_system.m4
+++ /dev/null
@@ -1,120 +0,0 @@
-# ===========================================================================
-# http://www.gnu.org/software/autoconf-archive/ax_boost_system.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-# AX_BOOST_SYSTEM
-#
-# DESCRIPTION
-#
-# Test for System library from the Boost C++ libraries. The macro requires
-# a preceding call to AX_BOOST_BASE. Further documentation is available at
-# <http://randspringer.de/boost/index.html>.
-#
-# This macro calls:
-#
-# AC_SUBST(BOOST_SYSTEM_LIB)
-#
-# And sets:
-#
-# HAVE_BOOST_SYSTEM
-#
-# LICENSE
-#
-# Copyright (c) 2008 Thomas Porschberg <thomas at randspringer.de>
-# Copyright (c) 2008 Michael Tindal
-# Copyright (c) 2008 Daniel Casimiro <dan.casimiro at gmail.com>
-#
-# Copying and distribution of this file, with or without modification, are
-# permitted in any medium without royalty provided the copyright notice
-# and this notice are preserved. This file is offered as-is, without any
-# warranty.
-
-#serial 17
-
-AC_DEFUN([AX_BOOST_SYSTEM],
-[
- AC_ARG_WITH([boost-system],
- AS_HELP_STRING([--with-boost-system@<:@=special-lib@:>@],
- [use the System library from boost - it is possible to specify a certain library for the linker
- e.g. --with-boost-system=boost_system-gcc-mt ]),
- [
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ax_boost_user_system_lib=""
- else
- want_boost="yes"
- ax_boost_user_system_lib="$withval"
- fi
- ],
- [want_boost="yes"]
- )
-
- if test "x$want_boost" = "xyes"; then
- AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([AC_CANONICAL_BUILD])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
-
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- AC_CACHE_CHECK(whether the Boost::System library is available,
- ax_cv_boost_system,
- [AC_LANG_PUSH([C++])
- CXXFLAGS_SAVE=$CXXFLAGS
-
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]],
- [[boost::system::system_category]])],
- ax_cv_boost_system=yes, ax_cv_boost_system=no)
- CXXFLAGS=$CXXFLAGS_SAVE
- AC_LANG_POP([C++])
- ])
- if test "x$ax_cv_boost_system" = "xyes"; then
- AC_SUBST(BOOST_CPPFLAGS)
-
- AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library is available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-
- LDFLAGS_SAVE=$LDFLAGS
- if test "x$ax_boost_user_system_lib" = "x"; then
- for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
- [link_system="no"])
- done
- if test "x$link_system" != "xyes"; then
- for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
- [link_system="no"])
- done
- fi
-
- else
- for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
- [link_system="no"])
- done
-
- fi
- if test "x$ax_lib" = "x"; then
- AC_MSG_ERROR(Could not find a version of the library!)
- fi
- if test "x$link_system" = "xno"; then
- AC_MSG_ERROR(Could not link against $ax_lib !)
- fi
- fi
-
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
-])
diff --git a/m4/ax_boost_thread.m4 b/m4/ax_boost_thread.m4
deleted file mode 100644
index 79e12cd..0000000
--- a/m4/ax_boost_thread.m4
+++ /dev/null
@@ -1,149 +0,0 @@
-# ===========================================================================
-# http://www.gnu.org/software/autoconf-archive/ax_boost_thread.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-# AX_BOOST_THREAD
-#
-# DESCRIPTION
-#
-# Test for Thread library from the Boost C++ libraries. The macro requires
-# a preceding call to AX_BOOST_BASE. Further documentation is available at
-# <http://randspringer.de/boost/index.html>.
-#
-# This macro calls:
-#
-# AC_SUBST(BOOST_THREAD_LIB)
-#
-# And sets:
-#
-# HAVE_BOOST_THREAD
-#
-# LICENSE
-#
-# Copyright (c) 2009 Thomas Porschberg <thomas at randspringer.de>
-# Copyright (c) 2009 Michael Tindal
-#
-# Copying and distribution of this file, with or without modification, are
-# permitted in any medium without royalty provided the copyright notice
-# and this notice are preserved. This file is offered as-is, without any
-# warranty.
-
-#serial 27
-
-AC_DEFUN([AX_BOOST_THREAD],
-[
- AC_ARG_WITH([boost-thread],
- AS_HELP_STRING([--with-boost-thread@<:@=special-lib@:>@],
- [use the Thread library from boost - it is possible to specify a certain library for the linker
- e.g. --with-boost-thread=boost_thread-gcc-mt ]),
- [
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ax_boost_user_thread_lib=""
- else
- want_boost="yes"
- ax_boost_user_thread_lib="$withval"
- fi
- ],
- [want_boost="yes"]
- )
-
- if test "x$want_boost" = "xyes"; then
- AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([AC_CANONICAL_BUILD])
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
-
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- AC_CACHE_CHECK(whether the Boost::Thread library is available,
- ax_cv_boost_thread,
- [AC_LANG_PUSH([C++])
- CXXFLAGS_SAVE=$CXXFLAGS
-
- if test "x$host_os" = "xsolaris" ; then
- CXXFLAGS="-pthreads $CXXFLAGS"
- elif test "x$host_os" = "xmingw32" ; then
- CXXFLAGS="-mthreads $CXXFLAGS"
- else
- CXXFLAGS="-pthread $CXXFLAGS"
- fi
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/thread/thread.hpp>]],
- [[boost::thread_group thrds;
- return 0;]])],
- ax_cv_boost_thread=yes, ax_cv_boost_thread=no)
- CXXFLAGS=$CXXFLAGS_SAVE
- AC_LANG_POP([C++])
- ])
- if test "x$ax_cv_boost_thread" = "xyes"; then
- if test "x$host_os" = "xsolaris" ; then
- BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
- elif test "x$host_os" = "xmingw32" ; then
- BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
- else
- BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
- fi
-
- AC_SUBST(BOOST_CPPFLAGS)
-
- AC_DEFINE(HAVE_BOOST_THREAD,,[define if the Boost::Thread library is available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-
- LDFLAGS_SAVE=$LDFLAGS
- case "x$host_os" in
- *bsd* )
- LDFLAGS="-pthread $LDFLAGS"
- break;
- ;;
- esac
- if test "x$ax_boost_user_thread_lib" = "x"; then
- for libextension in `ls -r $BOOSTLIBDIR/libboost_thread* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'`; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
- [link_thread="no"])
- done
- if test "x$link_thread" != "xyes"; then
- for libextension in `ls -r $BOOSTLIBDIR/boost_thread* 2>/dev/null | sed 's,.*/,,' | sed 's,\..*,,'`; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
- [link_thread="no"])
- done
- fi
-
- else
- for ax_lib in $ax_boost_user_thread_lib boost_thread-$ax_boost_user_thread_lib; do
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
- [link_thread="no"])
- done
-
- fi
- if test "x$ax_lib" = "x"; then
- AC_MSG_ERROR(Could not find a version of the library!)
- fi
- if test "x$link_thread" = "xno"; then
- AC_MSG_ERROR(Could not link against $ax_lib !)
- else
- case "x$host_os" in
- *bsd* )
- BOOST_LDFLAGS="-pthread $BOOST_LDFLAGS"
- break;
- ;;
- esac
-
- fi
- fi
-
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
-])
diff --git a/viewit/Makefile.am b/viewit/Makefile.am
index c7b5f4a..15bffe9 100644
--- a/viewit/Makefile.am
+++ b/viewit/Makefile.am
@@ -58,7 +58,7 @@ libmiaviewit_la_SOURCES = glerror.cc voxelmove.cc \
libmiaviewit_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) --as-needed
-libmiaviewit_la_LIBADD = @GLIBMM_LIBS@ @MIA_LIBS@ @VISTAIO_LIBS@ @BOOST_THREAD_LIB@ -lgle -lGLU -lGL -lm
+libmiaviewit_la_LIBADD = @GLIBMM_LIBS@ @MIA_LIBS@ @VISTAIO_LIBS@ -lgle -lGLU -lGL -lm
EXTRA_DIST=libviewit-config.hh.in $(volrend_DIST)
diff --git a/viewit/Makefile.in b/viewit/Makefile.in
index be249b5..e266bb7 100644
--- a/viewit/Makefile.in
+++ b/viewit/Makefile.in
@@ -74,13 +74,10 @@ subdir = viewit
DIST_COMMON = $(am__libmiaviewit_HEADERS_DIST) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/libviewit-config.hh.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
- $(top_srcdir)/m4/ax_boost_system.m4 \
- $(top_srcdir)/m4/ax_boost_thread.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -187,10 +184,6 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-BOOST_LDFLAGS = @BOOST_LDFLAGS@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -369,7 +362,7 @@ libmiaviewit_la_SOURCES = glerror.cc voxelmove.cc \
libmiaviewit_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) --as-needed
-libmiaviewit_la_LIBADD = @GLIBMM_LIBS@ @MIA_LIBS@ @VISTAIO_LIBS@ @BOOST_THREAD_LIB@ -lgle -lGLU -lGL -lm
+libmiaviewit_la_LIBADD = @GLIBMM_LIBS@ @MIA_LIBS@ @VISTAIO_LIBS@ -lgle -lGLU -lGL -lm
EXTRA_DIST = libviewit-config.hh.in $(volrend_DIST)
all: all-am
diff --git a/viewit/cp_draw.cc b/viewit/cp_draw.cc
index 88f1570..1989404 100644
--- a/viewit/cp_draw.cc
+++ b/viewit/cp_draw.cc
@@ -20,6 +20,10 @@
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <viewit/cp_draw.hh>
#include <iostream>
@@ -155,9 +159,14 @@ TCPAppearance::TCPAppearance(const C3DCriticalPointEigen& in):
else
e3c = attract_color;
}else{
+
+#if MIA_VERSION < 020400
r2 = ev2 * in.get_evect2();
+#else
+ r2 = ev2 * in.get_real_evect2();
+#endif
+
r3 = r2;
-
if (in.get_eval2() > 0)
e3c = e2c = compl_repell_color;
diff --git a/viewit/snapshot.cc b/viewit/snapshot.cc
index 14f051b..63cd7a8 100644
--- a/viewit/snapshot.cc
+++ b/viewit/snapshot.cc
@@ -30,8 +30,11 @@
#include <GL/gl.h>
#include <mia.hh>
#include <queue>
-//#include <atomic>
-#include <tbb/atomic.h>
+#include <atomic>
+#include <thread>
+#include <mutex>
+#include <condition_variable>
+#include <chrono>
using namespace std;
using namespace mia;
@@ -48,8 +51,8 @@ public:
bool empty();
private:
queue<std::shared_ptr<CRGB2DImage> > m_queue;
- boost::mutex m_mutex;
- boost::condition_variable m_cond;
+ std::mutex m_mutex;
+ std::condition_variable m_cond;
};
CSnapshotQueue::CSnapshotQueue()
@@ -58,7 +61,7 @@ CSnapshotQueue::CSnapshotQueue()
void CSnapshotQueue::push(CRGB2DImage *foto)
{
- boost::unique_lock<boost::mutex> lock(m_mutex);
+ std::unique_lock<std::mutex> lock(m_mutex);
const bool was_empty=m_queue.empty();
m_queue.push(std::shared_ptr<CRGB2DImage>(foto));
lock.unlock();
@@ -70,7 +73,7 @@ void CSnapshotQueue::push(CRGB2DImage *foto)
std::shared_ptr<CRGB2DImage> CSnapshotQueue::top_and_pop()
{
- boost::unique_lock<boost::mutex> lock(m_mutex);
+ std::unique_lock<std::mutex> lock(m_mutex);
assert(!m_queue.empty());
auto retval = m_queue.front();
m_queue.pop();
@@ -83,16 +86,17 @@ bool CSnapshotQueue::empty()
// if the queue is empty, then we wait for some time
// we do not completely block the thread in order to enable it
// to cleanly exit
- boost::unique_lock<boost::mutex> lock(m_mutex);
- const boost::posix_time::time_duration dt = boost::posix_time::microseconds(100);
+ std::unique_lock<std::mutex> lock(m_mutex);
+ std::chrono::milliseconds dt(10);
if (m_queue.empty())
- m_cond.timed_wait(lock, dt);
+ m_cond.wait_for(lock, dt);
return m_queue.empty();
}
class CSnapshotServer {
public:
- CSnapshotServer(CSnapshotQueue& queue);
+ CSnapshotServer(CSnapshotQueue& queue);
+ CSnapshotServer(const CSnapshotServer& orig);
void stop();
void operator() ();
@@ -101,7 +105,7 @@ private:
size_t m_id;
// this should be atomic
- tbb::atomic<bool> m_run;
+ std::atomic<bool> m_run;
};
CSnapshotServer::CSnapshotServer(CSnapshotQueue& queue):
@@ -111,6 +115,13 @@ CSnapshotServer::CSnapshotServer(CSnapshotQueue& queue):
m_run = true;
}
+CSnapshotServer::CSnapshotServer(const CSnapshotServer& orig):
+ m_queue(orig.m_queue),
+ m_id(orig.m_id)
+{
+ m_run = true;
+}
+
void CSnapshotServer::stop()
{
cvdebug() << "stop snapshot server\n";
@@ -136,20 +147,32 @@ void CSnapshotServer::operator() ()
cvdebug() << "Exit snapshot server\n";
}
-CSnapshotClient::CSnapshotClient():
- m_queue(new CSnapshotQueue),
- m_server(new CSnapshotServer(*m_queue)),
- m_server_thread(boost::ref(*m_server))
+struct CSnapshotClientImpl {
+ CSnapshotClientImpl();
+ ~CSnapshotClientImpl();
+ void foto(const C2DBounds& camera);
+
+ CSnapshotQueue m_queue;
+ CSnapshotServer m_server;
+ std::thread m_server_thread;
+ CThreadMsgStream thread_stream;
+};
+
+
+CSnapshotClientImpl::CSnapshotClientImpl():
+ m_queue(),
+ m_server(m_queue),
+ m_server_thread(m_server)
{
}
-CSnapshotClient::~CSnapshotClient()
+CSnapshotClientImpl::~CSnapshotClientImpl()
{
- m_server->stop();
+ m_server.stop();
m_server_thread.join();
}
-void CSnapshotClient::foto(const C2DBounds& viewport)
+void CSnapshotClientImpl::foto(const C2DBounds& viewport)
{
cvdebug() << "Take picture of size " << viewport << "\n";
@@ -170,5 +193,21 @@ void CSnapshotClient::foto(const C2DBounds& viewport)
for (auto y = 0u; y < viewport.y; ++y, b += stride, p -= stride)
copy(b, b+stride, p);
- m_queue->push(image);
+ m_queue.push(image);
+}
+
+CSnapshotClient::CSnapshotClient()
+{
+ pimpl = new CSnapshotClientImpl();
+}
+
+CSnapshotClient::~CSnapshotClient()
+{
+ delete pimpl;
+}
+
+
+void CSnapshotClient::foto(const C2DBounds& viewport)
+{
+ pimpl->foto(viewport);
}
diff --git a/viewit/snapshot.hh b/viewit/snapshot.hh
index e857574..765848b 100644
--- a/viewit/snapshot.hh
+++ b/viewit/snapshot.hh
@@ -28,18 +28,7 @@
#define __shapshot_hh
-#include <mia.hh>
-using namespace mia;
-
-#include <string>
-#include <boost/thread.hpp>
-#include <mia/core/threadedmsg.hh>
-
-using namespace std;
-
-/// a class to link the snapshot server to its client
-class CSnapshotQueue;
-class CSnapshotServer;
+#include <mia/2d/vector.hh>
/// a class to make a snapshot of the current image and sent it to the saver queue
class CSnapshotClient {
@@ -52,13 +41,9 @@ public:
/** takes a snapshot of the current OpenGL-backbuffer
\param camera describes the size of the image
*/
- void foto(const C2DBounds& camera);
+ void foto(const mia::C2DBounds& camera);
private:
- CThreadMsgStream thread_stream;
- /// construction is private and can only be done by a server
- std::unique_ptr<CSnapshotQueue> m_queue;
- std::unique_ptr<CSnapshotServer> m_server;
- boost::thread m_server_thread;
+ struct CSnapshotClientImpl *pimpl;
};
#endif
diff --git a/viewit/vistaloader.cc b/viewit/vistaloader.cc
index b32f223..660d744 100644
--- a/viewit/vistaloader.cc
+++ b/viewit/vistaloader.cc
@@ -19,6 +19,10 @@
* along with viewitgui; if not, see <http://www.gnu.org/licenses/>.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <viewit/vistaloader.hh>
@@ -96,7 +100,11 @@ TSmarties* create_smarties_from_tensorimage(VistaIOImage image, const std::strin
tensor.eigenvalue = evals.x;
if (fabs(tensor.eigenvalue) > 1e-2) {
+#if MIA_VERSION < 020400
tensor.evec = tensor.matrix.get_eigenvector(0) / tensor.evec.norm();
+#else
+ tensor.evec = tensor.matrix.get_real_eigenvector(0) / tensor.evec.norm();
+#endif
tensor.matrix *= 300.0;
PPOrder.push(tensor);
if (PPOrder.size() > max_smarties)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/miaviewit.git
More information about the debian-med-commit
mailing list