From b1150713a2a05da325573692965820664a8aea25 Mon Sep 17 00:00:00 2001 From: Gerber van der Graaf Date: Wed, 20 May 2009 15:48:56 +0200 Subject: [PATCH] bugfix to load image, cleanup building system. --- Makefile.in | 7 +- aclocal.m4 | 35 ++++-- configure | 308 +++++++++++++++++++++++++++------------------- configure.in | 52 +++----- doc/C/Makefile.in | 11 +- doc/C/figures/Makefile.in | 9 +- doc/Makefile.in | 11 +- man/Makefile.in | 13 +- pixmaps/Makefile.in | 9 +- src/Makefile.in | 11 +- src/piveval_interrogate.c | 40 +++--- 11 files changed, 277 insertions(+), 229 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7aa2ff2..4d36fd8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -95,6 +95,7 @@ EGREP = @EGREP@ ENABLE_CAM = @ENABLE_CAM@ ENABLE_DAC = @ENABLE_DAC@ ENABLE_MPI = @ENABLE_MPI@ +ENABLE_MPI_RR = @ENABLE_MPI_RR@ ENABLE_TRIG = @ENABLE_TRIG@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -102,8 +103,6 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GPIV_CFLAGS = @GPIV_CFLAGS@ GPIV_LIBS = @GPIV_LIBS@ -GPIV_PRINT_CFLAGS = @GPIV_PRINT_CFLAGS@ -GPIV_PRINT_LIBS = @GPIV_PRINT_LIBS@ GPIV_UI_CFLAGS = @GPIV_UI_CFLAGS@ GPIV_UI_LIBS = @GPIV_UI_LIBS@ GREP = @GREP@ @@ -320,7 +319,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff --git a/aclocal.m4 b/aclocal.m4 index 626799c..421abf0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- +# generated automatically by aclocal 1.10.2 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -13,7 +13,7 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.63],, +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, [m4_warning([this file was generated for autoconf 2.63. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. @@ -836,7 +836,7 @@ else fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -851,7 +851,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.1], [], +m4_if([$1], [1.10.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -865,12 +865,12 @@ m4_define([_AM_AUTOCONF_VERSION], []) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.1])dnl +[AM_AUTOMAKE_VERSION([1.10.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -1143,19 +1143,28 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 3 +#serial 4 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do +[# Autoconf 2.62 quotes --file arguments for eval, but not when files +# are listed without --file. Let's play safe and only enable the eval +# if we detect the quoting. +case $CONFIG_FILES in +*\'*) eval set x "$CONFIG_FILES" ;; +*) set x $CONFIG_FILES ;; +esac +shift +for mf +do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. @@ -1516,13 +1525,13 @@ esac # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -1539,7 +1548,7 @@ AC_DEFUN([_AM_SET_OPTION], # ---------------------------------- # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # ------------------------------------------- diff --git a/configure b/configure index 9342479..9fccbd3 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.63 for gpiv 0.6.0. +# Generated by GNU Autoconf 2.63 for gpiv 0.6.1. # # Report bugs to . # @@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='gpiv' PACKAGE_TARNAME='gpiv' -PACKAGE_VERSION='0.6.0' -PACKAGE_STRING='gpiv 0.6.0' +PACKAGE_VERSION='0.6.1' +PACKAGE_STRING='gpiv 0.6.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gpiv' # Factoring default headers for most tests. @@ -652,6 +652,7 @@ ENABLE_TRIG ENABLE_CAM RR MPIRUN +ENABLE_MPI_RR ENABLE_MPI ALL_LINGUAS INTLTOOL_PERL @@ -697,8 +698,6 @@ USE_NLS GETTEXT_PACKAGE GPIV_LIBS GPIV_CFLAGS -GPIV_PRINT_LIBS -GPIV_PRINT_CFLAGS GPIV_UI_LIBS GPIV_UI_CFLAGS PKG_CONFIG @@ -791,6 +790,7 @@ enable_maintainer_mode enable_dependency_tracking enable_nls enable_mpi +enable_rr enable_cam enable_trig enable_rta @@ -812,8 +812,6 @@ CPP PKG_CONFIG GPIV_UI_CFLAGS GPIV_UI_LIBS -GPIV_PRINT_CFLAGS -GPIV_PRINT_LIBS GPIV_CFLAGS GPIV_LIBS' @@ -1368,7 +1366,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 gpiv 0.6.0 to adapt to many kinds of systems. +\`configure' configures gpiv 0.6.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1434,7 +1432,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gpiv 0.6.0:";; + short | recursive ) echo "Configuration of gpiv 0.6.1:";; esac cat <<\_ACEOF @@ -1448,6 +1446,7 @@ Optional Features: --enable-dependency-tracking do not reject slow dependency extractors --disable-nls do not use Native Language Support --enable-mpi enable Message Protocol Interface (MPI) + --enable-rr checks also for MPI-enabled gpiv_rr --enable-cam enable data acquisition --enable-trig enable (realtime) triggering --enable-rta=RTA_DIR place where the RTAI code resides @@ -1475,10 +1474,6 @@ Some influential environment variables: C compiler flags for GPIV_UI, overriding pkg-config GPIV_UI_LIBS linker flags for GPIV_UI, overriding pkg-config - GPIV_PRINT_CFLAGS - C compiler flags for GPIV_PRINT, overriding pkg-config - GPIV_PRINT_LIBS - linker flags for GPIV_PRINT, overriding pkg-config GPIV_CFLAGS C compiler flags for GPIV, overriding pkg-config GPIV_LIBS linker flags for GPIV, overriding pkg-config @@ -1548,7 +1543,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gpiv configure 0.6.0 +gpiv configure 0.6.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1562,7 +1557,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 gpiv $as_me 0.6.0, which was +It was created by gpiv $as_me 0.6.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2278,7 +2273,7 @@ fi # Define the identity of the package. PACKAGE=gpiv - VERSION=0.6.0 + VERSION=0.6.1 cat >>confdefs.h <<_ACEOF @@ -5779,17 +5774,6 @@ fi GNOME_COMPILE_WARNINGS -#------------------------------------------------------------------------------ -# From gpaint: -# The gnomeui library is required but the gnomeprint and gnomeprintui libraries -# are optional. First we verify the gnomeui library is present. Then we check -# for the presence of the gnomeprint libraries and set a flag to indicate the -# print libraries are present. Finally, we run pkg-config to get the compile and -# link flags for the combined set of libraries to eliminate duplications in -# the CFLAGS. -## GNOME_MODULES="libgnomeui-2 >= 2.0.0" -GNOME_PRINT="libgnomeprint-2.2 >= 2.2.0 libgnomeprintui-2.2 >=2.2.0" - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then @@ -6018,90 +6002,7 @@ else $as_echo "yes" >&6; } : fi - -pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for GPIV_PRINT" >&5 -$as_echo_n "checking for GPIV_PRINT... " >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$GPIV_PRINT_CFLAGS"; then - pkg_cv_GPIV_PRINT_CFLAGS="$GPIV_PRINT_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprint-2.2 libgnomeprintui-2.2\"") >&5 - ($PKG_CONFIG --exists --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GPIV_PRINT_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprint-2.2 libgnomeprintui-2.2" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$GPIV_PRINT_LIBS"; then - pkg_cv_GPIV_PRINT_LIBS="$GPIV_PRINT_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprint-2.2 libgnomeprintui-2.2\"") >&5 - ($PKG_CONFIG --exists --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GPIV_PRINT_LIBS=`$PKG_CONFIG --libs "libgnomeprint-2.2 libgnomeprintui-2.2" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -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 - GPIV_PRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2"` - else - GPIV_PRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2"` - fi - # Put the nasty error message in config.log where it belongs - echo "$GPIV_PRINT_PKG_ERRORS" >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - echo "gnomeprint libraries are not available." -elif test $pkg_failed = untried; then - echo "gnomeprint libraries are not available." -else - GPIV_PRINT_CFLAGS=$pkg_cv_GPIV_PRINT_CFLAGS - GPIV_PRINT_LIBS=$pkg_cv_GPIV_PRINT_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - gpiv_have_gnome_print=1 -fi - -if test "x$gpiv_have_gnome_print" = "x1"; then - echo "gnomeprint IS available" - cat >>confdefs.h <<\_ACEOF -#define HAVE_GNOME_PRINT "1" -_ACEOF - - GPIV_GNOME_LIBS="libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2" -else - echo "gnomeprint NOT available" GPIV_GNOME_LIBS="libgnomeui-2.0" -fi - echo "configuring with libraries: " $gpiv_gnome_libs pkg_failed=no @@ -8905,8 +8806,158 @@ fi +# Check whether --enable-rr was given. +if test "${enable_rr+set}" = set; then + enableval=$enable_rr; ENABLE_MPI_RR="-DENABLE_MPI_RR" + +fi + + + if test "${ENABLE_MPI}" == '-DENABLE_MPI'; then + if test "${ac_cv_header_mpi_mpi_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for mpi/mpi.h" >&5 +$as_echo_n "checking for mpi/mpi.h... " >&6; } +if test "${ac_cv_header_mpi_mpi_h+set}" = set; then + $as_echo_n "(cached) " >&6 +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mpi_mpi_h" >&5 +$as_echo "$ac_cv_header_mpi_mpi_h" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking mpi/mpi.h usability" >&5 +$as_echo_n "checking mpi/mpi.h usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking mpi/mpi.h presence" >&5 +$as_echo_n "checking mpi/mpi.h presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: mpi/mpi.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: mpi/mpi.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mpi/mpi.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: mpi/mpi.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: mpi/mpi.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: mpi/mpi.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mpi/mpi.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: mpi/mpi.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mpi/mpi.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: mpi/mpi.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mpi/mpi.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: mpi/mpi.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mpi/mpi.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: mpi/mpi.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mpi/mpi.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: mpi/mpi.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ------------------------------------------------------------------- ## +## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gpiv ## +## ------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for mpi/mpi.h" >&5 +$as_echo_n "checking for mpi/mpi.h... " >&6; } +if test "${ac_cv_header_mpi_mpi_h+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_header_mpi_mpi_h=$ac_header_preproc +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mpi_mpi_h" >&5 +$as_echo "$ac_cv_header_mpi_mpi_h" >&6; } + +fi +if test "x$ac_cv_header_mpi_mpi_h" = x""yes; then + : +else + { { $as_echo "$as_me:$LINENO: error: \"mpi.h is not installed\"" >&5 +$as_echo "$as_me: error: \"mpi.h is not installed\"" >&2;} + { (exit 1); exit 1; }; } +fi + + + # Extract the first word of "mpirun", so it can be a program name with args. set dummy mpirun; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -8953,7 +9004,8 @@ Needed by gpiv when --enable-mpi\"" >&2;} { (exit 1); exit 1; }; } fi - # Extract the first word of "gpiv_rr", so it can be a program name with args. + if test "${ENABLE_MPI_RR}" == '-DENABLE_MPI_RR'; then + # Extract the first word of "gpiv_rr", so it can be a program name with args. set dummy gpiv_rr; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -8991,12 +9043,15 @@ $as_echo "no" >&6; } fi - if test x$RR = xfalse ; then - { { $as_echo "$as_me:$LINENO: error: \"missing mpi-enabled gpiv_rr from gpivtools. \ -Needed by gpiv when --enable-mpi\"" >&5 + if test x$RR = xfalse ; then + { { $as_echo "$as_me:$LINENO: error: \"missing mpi-enabled gpiv_rr from gpivtools. \ +Needed by gpiv when --enable-mpi.\"" >&5 $as_echo "$as_me: error: \"missing mpi-enabled gpiv_rr from gpivtools. \ -Needed by gpiv when --enable-mpi\"" >&2;} +Needed by gpiv when --enable-mpi.\"" >&2;} { (exit 1); exit 1; }; } + fi + else + echo "WARNING: Not checking on MPI-enabled gpiv_rr" fi @@ -10569,7 +10624,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gpiv $as_me 0.6.0, which was +This file was extended by gpiv $as_me 0.6.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10623,7 +10678,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -gpiv config.status 0.6.0 +gpiv config.status 0.6.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -11224,7 +11279,16 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files +# are listed without --file. Let's play safe and only enable the eval +# if we detect the quoting. +case $CONFIG_FILES in +*\'*) eval set x "$CONFIG_FILES" ;; +*) set x $CONFIG_FILES ;; +esac +shift +for mf +do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. @@ -11418,11 +11482,6 @@ fi echo "====================================================================" echo "Configuration succesfully finished" - if test $HAVE_GNOME_PRINT; then - echo "with gnomeprint" - else - echo "without gnomeprint" - fi if test $ENABLE_CAM; then echo "with (IEEE-1394) camera enabled" @@ -11440,8 +11499,9 @@ echo "Configuration succesfully finished" fi if test $ENABLE_MPI; then - echo "Using Message Passing Interface (MPI)" + echo "Using Message Passing Interface (MPI)." echo "for processing on distributed memory systems" + echo "MPI-enabled gpivtools package is needed for correct funtioning" fi echo "Type 'make' and 'make install' to build and install gpiv" diff --git a/configure.in b/configure.in index 9d1e711..be2e2b3 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. dnl =========== Initialization -AC_INIT(gpiv, 0.6.0, http://bugzilla.gnome.org/enter_bug.cgi?product=gpiv) +AC_INIT(gpiv, 0.6.1, http://bugzilla.gnome.org/enter_bug.cgi?product=gpiv) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_MAINTAINER_MODE @@ -21,30 +21,8 @@ dnl ========== Export Compiler/linker options GNOME_COMPILE_WARNINGS - -#------------------------------------------------------------------------------ -# From gpaint: -# The gnomeui library is required but the gnomeprint and gnomeprintui libraries -# are optional. First we verify the gnomeui library is present. Then we check -# for the presence of the gnomeprint libraries and set a flag to indicate the -# print libraries are present. Finally, we run pkg-config to get the compile and -# link flags for the combined set of libraries to eliminate duplications in -# the CFLAGS. -## GNOME_MODULES="libgnomeui-2 >= 2.0.0" -GNOME_PRINT="libgnomeprint-2.2 >= 2.2.0 libgnomeprintui-2.2 >=2.2.0" PKG_CHECK_MODULES(GPIV_UI, libgnomeui-2.0) -PKG_CHECK_MODULES(GPIV_PRINT, libgnomeprint-2.2 libgnomeprintui-2.2, -gpiv_have_gnome_print=1, echo "gnomeprint libraries are not available.") - -if test "x$gpiv_have_gnome_print" = "x1"; then - echo "gnomeprint IS available" - AC_DEFINE(HAVE_GNOME_PRINT,"1") - GPIV_GNOME_LIBS="libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2" -else - echo "gnomeprint NOT available" GPIV_GNOME_LIBS="libgnomeui-2.0" -fi - echo "configuring with libraries: " $gpiv_gnome_libs PKG_CHECK_MODULES(GPIV, $GPIV_GNOME_LIBS) AC_SUBST(GPIV_CFLAGS) @@ -93,20 +71,32 @@ AC_ARG_ENABLE(mpi, ) AC_SUBST(ENABLE_MPI) +AC_ARG_ENABLE(rr, + [ --enable-rr checks also for MPI-enabled gpiv_rr ], + [ENABLE_MPI_RR="-DENABLE_MPI_RR"] + ) +AC_SUBST(ENABLE_MPI_RR) + if test "${ENABLE_MPI}" == '-DENABLE_MPI'; then dnl ACX_MPI(AC_MSG_WARN("libmpi HAS BEEN installed"), dnl AC_MSG_ERROR("libmpi IS NOT installed")) + AC_CHECK_HEADER(mpi/mpi.h, ,AC_MSG_ERROR("mpi.h is not installed")) + AC_CHECK_PROG(MPIRUN, mpirun, true, false) if test x$MPIRUN = xfalse ; then AC_MSG_ERROR("missing mpirun \ Needed by gpiv when --enable-mpi") fi - AC_CHECK_PROG(RR, gpiv_rr, true, false) - if test x$RR = xfalse ; then - AC_MSG_ERROR("missing mpi-enabled gpiv_rr from gpivtools. \ -Needed by gpiv when --enable-mpi") + if test "${ENABLE_MPI_RR}" == '-DENABLE_MPI_RR'; then + AC_CHECK_PROG(RR, gpiv_rr, true, false) + if test x$RR = xfalse ; then + AC_MSG_ERROR("missing mpi-enabled gpiv_rr from gpivtools. \ +Needed by gpiv when --enable-mpi.") + fi + else + echo "WARNING: Not checking on MPI-enabled gpiv_rr" fi AC_CHECK_LIB(gpiv_mpi, gpiv_piv_mpi_bcast_pivpar, , @@ -239,11 +229,6 @@ AC_OUTPUT([ echo "====================================================================" echo "Configuration succesfully finished" - if test $HAVE_GNOME_PRINT; then - echo "with gnomeprint" - else - echo "without gnomeprint" - fi if test $ENABLE_CAM; then echo "with (IEEE-1394) camera enabled" @@ -261,8 +246,9 @@ echo "Configuration succesfully finished" fi if test $ENABLE_MPI; then - echo "Using Message Passing Interface (MPI)" + echo "Using Message Passing Interface (MPI)." echo "for processing on distributed memory systems" + echo "MPI-enabled gpivtools package is needed for correct funtioning" fi echo "Type 'make' and 'make install' to build and install gpiv" diff --git a/doc/C/Makefile.in b/doc/C/Makefile.in index 6b8745f..841e075 100644 --- a/doc/C/Makefile.in +++ b/doc/C/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -90,6 +90,7 @@ EGREP = @EGREP@ ENABLE_CAM = @ENABLE_CAM@ ENABLE_DAC = @ENABLE_DAC@ ENABLE_MPI = @ENABLE_MPI@ +ENABLE_MPI_RR = @ENABLE_MPI_RR@ ENABLE_TRIG = @ENABLE_TRIG@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -97,8 +98,6 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GPIV_CFLAGS = @GPIV_CFLAGS@ GPIV_LIBS = @GPIV_LIBS@ -GPIV_PRINT_CFLAGS = @GPIV_PRINT_CFLAGS@ -GPIV_PRINT_LIBS = @GPIV_PRINT_LIBS@ GPIV_UI_CFLAGS = @GPIV_UI_CFLAGS@ GPIV_UI_LIBS = @GPIV_UI_LIBS@ GREP = @GREP@ @@ -208,8 +207,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -326,7 +325,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff --git a/doc/C/figures/Makefile.in b/doc/C/figures/Makefile.in index e0962a7..a4f5be0 100644 --- a/doc/C/figures/Makefile.in +++ b/doc/C/figures/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -78,6 +78,7 @@ EGREP = @EGREP@ ENABLE_CAM = @ENABLE_CAM@ ENABLE_DAC = @ENABLE_DAC@ ENABLE_MPI = @ENABLE_MPI@ +ENABLE_MPI_RR = @ENABLE_MPI_RR@ ENABLE_TRIG = @ENABLE_TRIG@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -85,8 +86,6 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GPIV_CFLAGS = @GPIV_CFLAGS@ GPIV_LIBS = @GPIV_LIBS@ -GPIV_PRINT_CFLAGS = @GPIV_PRINT_CFLAGS@ -GPIV_PRINT_LIBS = @GPIV_PRINT_LIBS@ GPIV_UI_CFLAGS = @GPIV_UI_CFLAGS@ GPIV_UI_LIBS = @GPIV_UI_LIBS@ GREP = @GREP@ @@ -200,8 +199,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff --git a/doc/Makefile.in b/doc/Makefile.in index de6e739..7461515 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -80,6 +80,7 @@ EGREP = @EGREP@ ENABLE_CAM = @ENABLE_CAM@ ENABLE_DAC = @ENABLE_DAC@ ENABLE_MPI = @ENABLE_MPI@ +ENABLE_MPI_RR = @ENABLE_MPI_RR@ ENABLE_TRIG = @ENABLE_TRIG@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -87,8 +88,6 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GPIV_CFLAGS = @GPIV_CFLAGS@ GPIV_LIBS = @GPIV_LIBS@ -GPIV_PRINT_CFLAGS = @GPIV_PRINT_CFLAGS@ -GPIV_PRINT_LIBS = @GPIV_PRINT_LIBS@ GPIV_UI_CFLAGS = @GPIV_UI_CFLAGS@ GPIV_UI_LIBS = @GPIV_UI_LIBS@ GREP = @GREP@ @@ -190,8 +189,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -291,7 +290,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff --git a/man/Makefile.in b/man/Makefile.in index 5899398..0ea9ffe 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -72,6 +72,7 @@ EGREP = @EGREP@ ENABLE_CAM = @ENABLE_CAM@ ENABLE_DAC = @ENABLE_DAC@ ENABLE_MPI = @ENABLE_MPI@ +ENABLE_MPI_RR = @ENABLE_MPI_RR@ ENABLE_TRIG = @ENABLE_TRIG@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -79,8 +80,6 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GPIV_CFLAGS = @GPIV_CFLAGS@ GPIV_LIBS = @GPIV_LIBS@ -GPIV_PRINT_CFLAGS = @GPIV_PRINT_CFLAGS@ -GPIV_PRINT_LIBS = @GPIV_PRINT_LIBS@ GPIV_UI_CFLAGS = @GPIV_UI_CFLAGS@ GPIV_UI_LIBS = @GPIV_UI_LIBS@ GREP = @GREP@ @@ -182,8 +181,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -218,8 +217,8 @@ install-man1: $(man1_MANS) $(man_MANS) esac; \ done; \ for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ + if test -f $$i; then file=$$i; \ + else file=$(srcdir)/$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ case "$$ext" in \ 1*) ;; \ diff --git a/pixmaps/Makefile.in b/pixmaps/Makefile.in index df669f0..212a332 100644 --- a/pixmaps/Makefile.in +++ b/pixmaps/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -78,6 +78,7 @@ EGREP = @EGREP@ ENABLE_CAM = @ENABLE_CAM@ ENABLE_DAC = @ENABLE_DAC@ ENABLE_MPI = @ENABLE_MPI@ +ENABLE_MPI_RR = @ENABLE_MPI_RR@ ENABLE_TRIG = @ENABLE_TRIG@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -85,8 +86,6 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GPIV_CFLAGS = @GPIV_CFLAGS@ GPIV_LIBS = @GPIV_LIBS@ -GPIV_PRINT_CFLAGS = @GPIV_PRINT_CFLAGS@ -GPIV_PRINT_LIBS = @GPIV_PRINT_LIBS@ GPIV_UI_CFLAGS = @GPIV_UI_CFLAGS@ GPIV_UI_LIBS = @GPIV_UI_LIBS@ GREP = @GREP@ @@ -190,8 +189,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ diff --git a/src/Makefile.in b/src/Makefile.in index 0cef68b..9cc2a7b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -101,6 +101,7 @@ EGREP = @EGREP@ ENABLE_CAM = @ENABLE_CAM@ ENABLE_DAC = @ENABLE_DAC@ ENABLE_MPI = @ENABLE_MPI@ +ENABLE_MPI_RR = @ENABLE_MPI_RR@ ENABLE_TRIG = @ENABLE_TRIG@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -108,8 +109,6 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GPIV_CFLAGS = @GPIV_CFLAGS@ GPIV_LIBS = @GPIV_LIBS@ -GPIV_PRINT_CFLAGS = @GPIV_PRINT_CFLAGS@ -GPIV_PRINT_LIBS = @GPIV_PRINT_LIBS@ GPIV_UI_CFLAGS = @GPIV_UI_CFLAGS@ GPIV_UI_LIBS = @GPIV_UI_LIBS@ GREP = @GREP@ @@ -273,8 +272,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -386,7 +385,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff --git a/src/piveval_interrogate.c b/src/piveval_interrogate.c index 7739b05..b3e7278 100644 --- a/src/piveval_interrogate.c +++ b/src/piveval_interrogate.c @@ -28,13 +28,13 @@ /* $Log: piveval_interrogate.c,v $ /* Revision 1.4 2008-10-09 15:19:03 gerber -/* Release 0.6.0 using parallelized code +/* Release 0.6.0 using paralellized code /* /* Revision 1.3 2008-10-09 14:43:37 gerber /* paralellized with OMP and MPI /* /* Revision 1.2 2008-09-25 13:32:22 gerber -/* Adapted for use on cluster (using MPI/OMP) parallelised gpiv_rr from gpivtools) +/* Adapted for use on cluster (using MPI/OMP) paralellised gpiv_rr from gpivtools) /* /* Revision 1.1 2008-09-16 10:17:36 gerber /* added piveval_interrogate routines @@ -924,11 +924,23 @@ exec_piv_mpi (GpivImage *image, FILE *fp = NULL; gchar *command = NULL; const gchar *tmp_dir = g_get_tmp_dir (); - const gchar *user_name = g_get_user_name (); - const gchar *basename = "gpiv_mpi"; + const gchar *username = g_get_user_name (); + const gchar *basename = g_get_prgname (); gchar progress_string[GPIV_MAX_CHARS]; + /* + * Save image at tmp directory + */ + gchar *image_name = + g_strdup_printf ("%s/%s__%s%s" , tmp_dir, basename, username, + GPIV_EXT_PNG_IMAGE); + gchar *pivdata_name = + g_strdup_printf ("%s/%s__%s%s" , tmp_dir, basename, username, + GPIV_EXT_PIV); + gchar *par_name = + g_strdup_printf ("%s/%s__%s%s" , tmp_dir, basename, username, + GPIV_EXT_PAR); /* * prints to message console bar @@ -942,30 +954,17 @@ exec_piv_mpi (GpivImage *image, /* (GNOME_APPBAR (gpiv->appbar))), */ /* progress_value); */ - /* - * Save image at tmp/ - */ - gchar *image_name = - g_strdup_printf ("%s/%s/%s.png" ,tmp_dir, - user_name, basename); - gchar *pivdata_name = - g_strdup_printf ("%s/%s/%s.piv" ,tmp_dir, - user_name, basename); - gchar *par_name = - g_strdup_printf ("%s/%s/%s.par" ,tmp_dir, - user_name, basename); - if (gpiv_par->verbose) g_message ("exec_piv_mpi: image name = %s, piv name = %s", image_name, pivdata_name); - if ((fp = fopen (image_name, "w")) == NULL) { - warning_gpiv ("exec_piv_mpi: failing fopen %s", image_name); + if ((fp = fopen (image_name, "wb")) == NULL) { + error_gpiv ("exec_piv_mpi: failing fopen %s\n probably user directory under %s does not exist", tmp_dir, image_name); } gpiv_write_png_image (fp, image, FALSE); fclose (fp); /* - * Run parallellised gpiv_rr + * Run MPI-paralellised gpiv_rr */ command = g_strdup_printf ("%s %d gpiv_rr -p \ @@ -1013,6 +1012,7 @@ exec_piv_mpi (GpivImage *image, g_free (command); g_free (image_name); g_free (pivdata_name); + g_free (par_name); return pd; } #endif /* ENABLE_MPI */ -- 2.11.4.GIT