From 1bc4b653a47e8cdecc27ee7b70151fa3b86a3abe Mon Sep 17 00:00:00 2001 From: Gerber van der Graaf Date: Tue, 17 Mar 2009 17:08:50 +0100 Subject: [PATCH] bug repairs and update for libgpiv3 interface --- ChangeLog | 4 + Makefile.in | 146 ++++++------ aclocal.m4 | 234 +++++++++++-------- configure | 564 +++++++++++++++++++++++----------------------- configure.in | 71 +++--- doc/C/Makefile.in | 125 +++++----- doc/C/figures/Makefile.in | 79 ++++--- doc/Makefile.in | 115 +++++----- man/Makefile.in | 80 ++++--- mkinstalldirs | 0 pixmaps/Makefile.am | 7 + po/Makefile.in.in | 8 +- po/ca.gmo | Bin 25331 -> 0 bytes po/de.gmo | Bin 12954 -> 0 bytes po/nl.gmo | Bin 25664 -> 0 bytes src/Makefile.in | 105 +++++---- src/dac.c | 20 +- src/dac_cam.c | 368 +++++++++++++++--------------- src/dac_interface.c | 122 +++++----- 19 files changed, 1081 insertions(+), 967 deletions(-) mode change 100644 => 100755 mkinstalldirs create mode 100644 pixmaps/Makefile.am delete mode 100644 po/ca.gmo delete mode 100644 po/de.gmo delete mode 100644 po/nl.gmo diff --git a/ChangeLog b/ChangeLog index 3c52b01..aac78b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-01-12 Thomas Huxhorn + * src/cam.c, src/cam_interface.c, src/dac.c: bug repairs and update for + new libgpiv3 interface + 2008-25-9 Gerber Van der Graaf * Adapted for use on cluster using (MPI/OMP) parallelised gpiv_rr from gpivtools. diff --git a/Makefile.in b/Makefile.in index 7317ab9..0bf8f6d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -35,26 +31,29 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure ABOUT-NLS \ - AUTHORS COPYING ChangeLog INSTALL NEWS acconfig.h config.guess \ - config.rpath config.sub depcomp install-sh missing \ - mkinstalldirs + $(srcdir)/Makefile.in $(top_srcdir)/configure \ + $(top_srcdir)/pixmaps/Makefile.in ABOUT-NLS AUTHORS COPYING \ + ChangeLog INSTALL NEWS acconfig.h config.sub depcomp \ + install-sh missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = pixmaps/Makefile SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -71,8 +70,6 @@ distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -111,8 +108,7 @@ GPIV_PRINT_LIBS = @GPIV_PRINT_LIBS@ GPIV_UI_CFLAGS = @GPIV_UI_CFLAGS@ GPIV_UI_LIBS = @GPIV_UI_LIBS@ GREP = @GREP@ -HAVE_CONTROL_FALSE = @HAVE_CONTROL_FALSE@ -HAVE_CONTROL_TRUE = @HAVE_CONTROL_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -148,9 +144,8 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MPIRUN = @MPIRUN@ MSGFMT = @MSGFMT@ @@ -179,9 +174,11 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -189,6 +186,7 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -212,8 +210,11 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = src man doc po pixmaps EXTRA_DIST = \ autogen.sh \ @@ -262,7 +263,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -uninstall-info-am: +pixmaps/Makefile: $(top_builddir)/config.status $(top_srcdir)/pixmaps/Makefile.in + cd $(top_builddir) && $(SHELL) ./config.status $@ # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -295,8 +297,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -340,8 +341,8 @@ 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; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -366,8 +367,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -377,13 +378,12 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(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; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -398,24 +398,22 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/po - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -429,7 +427,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -437,6 +435,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -444,7 +444,7 @@ distdir: $(DISTFILES) -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -454,6 +454,10 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -480,6 +484,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -519,7 +525,7 @@ distcheck: dist $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -589,12 +595,20 @@ info-am: install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -615,23 +629,25 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-recursive ctags \ - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ - dist-tarZ dist-zip distcheck distclean distclean-generic \ - distclean-recursive distclean-tags distcleancheck distdir \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ + dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/aclocal.m4 b/aclocal.m4 index 88388f1..ebdee2c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 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, # with or without modifications, as long as this notice is preserved. @@ -11,6 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +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. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) + # Copyright (C) 1995-2002 Free Software Foundation, Inc. # Copyright (C) 2001-2003,2004 Red Hat, Inc. # @@ -447,8 +455,9 @@ fi]) dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) # serial 40 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], -[AC_PREREQ([2.50])dnl +AC_DEFUN([IT_PROG_INTLTOOL], [ +AC_PREREQ([2.50])dnl +AC_REQUIRE([AM_NLS])dnl case "$am__api_version" in 1.[01234]) @@ -521,6 +530,7 @@ AC_SUBST(INTLTOOL_POLICY_RULE) AC_PATH_PROG(XGETTEXT, xgettext) AC_PATH_PROG(MSGMERGE, msgmerge) AC_PATH_PROG(MSGFMT, msgfmt) +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) fi @@ -592,6 +602,9 @@ dnl The following CONFIG_COMMANDS should be exetuted at the very end dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then + AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) + fi rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" >"$1/stamp-it.tmp" [sed '/^#/d @@ -600,28 +613,55 @@ AC_CONFIG_COMMANDS_PRE([ '"s|^| $ac_top_srcdir/|" \ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" ] - if test ! -f "$1/Makefile"; then - AC_MSG_ERROR([$1/Makefile is not ready.]) - fi - mv "$1/Makefile" "$1/Makefile.tmp" [sed '/^POTFILES =/,/[^\\]$/ { /^POTFILES =/!d r $1/POTFILES } - ' "$1/Makefile.tmp" >"$1/Makefile"] + ' "$1/Makefile.in" >"$1/Makefile"] rm -f "$1/Makefile.tmp" mv "$1/stamp-it.tmp" "$1/stamp-it" ]) ])dnl ]) - # deprecated macros AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) # A hint is needed for aclocal from Automake <= 1.9.4: # AC_DEFUN([AC_PROG_INTLTOOL], ...) +# nls.m4 serial 3 (gettext-0.15) +dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +AC_PREREQ(2.50) + +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) +]) + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # # Copyright © 2004 Scott James Remnant . @@ -780,7 +820,7 @@ else fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -790,14 +830,31 @@ fi[]dnl # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) +# (This private macro should not be called outside this file.) +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], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -877,14 +934,14 @@ AU_DEFUN([fp_PROG_CC_STDC]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 # 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 7 +# serial 8 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -893,8 +950,10 @@ AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -908,15 +967,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 # 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 8 +# serial 9 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -944,6 +1002,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -1009,6 +1068,7 @@ AC_CACHE_CHECK([dependency style of $depcc], depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -1061,7 +1121,8 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -1086,8 +1147,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -1134,14 +1196,14 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 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 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -1158,16 +1220,20 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl +[AC_PREREQ([2.60])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi fi # test whether we have cygpath @@ -1187,6 +1253,9 @@ m4_ifval([$2], AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl @@ -1222,6 +1291,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX], [_AM_DEPENDENCIES(CXX)], [define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) ]) @@ -1235,16 +1308,17 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX], # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -1257,7 +1331,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -1364,14 +1438,14 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 # 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 4 +# serial 5 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -1387,6 +1461,7 @@ AC_SUBST($1)]) # If it does, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then @@ -1397,7 +1472,7 @@ else fi ]) -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1405,60 +1480,23 @@ fi # AM_PROG_MKDIR_P # --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) +# Check for `mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) # Helper functions for option handling. -*- Autoconf -*- @@ -1570,9 +1608,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Copyright (C) 2006 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. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. diff --git a/configure b/configure index a2fbc8d..da0b580 100755 --- a/configure +++ b/configure @@ -654,6 +654,7 @@ target_alias INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA +am__isrc CYGPATH_W PACKAGE VERSION @@ -743,6 +744,9 @@ INTLTOOL_POLICY_RULE MSGMERGE INTLTOOL_PERL ALL_LINGUAS +ENABLE_MPI +MPIRUN +RR ENABLE_CAM ENABLE_TRIG ENABLE_DAC @@ -755,9 +759,6 @@ OVERRIDE_IMAGE_WIDTH_MAX OVERRIDE_IMAGE_HEIGHT_MAX CANVAS_AA DEBUG -ENABLE_MPI -MPIRUN -RR LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -1356,6 +1357,8 @@ Optional Features: (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --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-cam enable data acquisition --enable-trig enable (realtime) triggering --enable-rta=RTA_DIR place where the RTAI code resides @@ -1368,7 +1371,6 @@ Optional Features: --enable-canvas-aa Use Anti Aliased canvas for viewer; slower but better displaying of image and resulting data --enable-debug debug version (more verbose) - --enable-mpi enable Message Protocol Interface (MPI) Some influential environment variables: CC C compiler command @@ -1822,7 +1824,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version="1.9" +am__api_version='1.10' + ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -2005,38 +2008,53 @@ else echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' +{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done +done +IFS=$as_save_IFS + +fi + + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" else - mkdir_p='$(install_sh) -d' + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" fi fi +{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +echo "${ECHO_T}$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac for ac_prog in gawk mawk nawk awk do @@ -2119,12 +2137,16 @@ else fi rmdir .tst 2>/dev/null -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } + fi fi # test whether we have cygpath @@ -2167,7 +2189,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user # run `make install-strip'. However `strip' might not be the right @@ -2271,7 +2293,7 @@ else fi fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -2296,9 +2318,7 @@ fi { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } - - -if test $USE_MAINTAINER_MODE = yes; then + if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' else @@ -2364,9 +2384,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' fi - - -if test "x$enable_dependency_tracking" != xno; then + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' else @@ -2375,7 +2393,6 @@ else fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3362,6 +3379,7 @@ else depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -3391,9 +3409,7 @@ fi echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= @@ -4231,6 +4247,7 @@ else depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -4260,9 +4277,7 @@ fi echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= @@ -5016,6 +5031,7 @@ else depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -5045,9 +5061,7 @@ fi echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= @@ -7684,6 +7698,21 @@ echo "${ECHO_T}$LINGUAS" >&6; } + { echo "$as_me:$LINENO: checking whether NLS is requested" >&5 +echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; } + # Check whether --enable-nls was given. +if test "${enable_nls+set}" = set; then + enableval=$enable_nls; USE_NLS=$enableval +else + USE_NLS=yes +fi + + { echo "$as_me:$LINENO: result: $USE_NLS" >&5 +echo "${ECHO_T}$USE_NLS" >&6; } + + + + case "$am__api_version" in 1.01234) { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 @@ -7997,6 +8026,47 @@ echo "${ECHO_T}no" >&6; } fi +# Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_GMSGFMT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac +fi +GMSGFMT=$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +echo "${ECHO_T}$GMSGFMT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} @@ -8520,14 +8590,116 @@ fi +# Check whether --enable-mpi was given. +if test "${enable_mpi+set}" = set; then + enableval=$enable_mpi; ENABLE_MPI="-DENABLE_MPI" + +fi + + + +if test "${ENABLE_MPI}" == '-DENABLE_MPI'; then + + # Extract the first word of "mpirun", so it can be a program name with args. +set dummy mpirun; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_MPIRUN+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$MPIRUN"; then + ac_cv_prog_MPIRUN="$MPIRUN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_MPIRUN="true" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_MPIRUN" && ac_cv_prog_MPIRUN="false" +fi +fi +MPIRUN=$ac_cv_prog_MPIRUN +if test -n "$MPIRUN"; then + { echo "$as_me:$LINENO: result: $MPIRUN" >&5 +echo "${ECHO_T}$MPIRUN" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + if test x$MPIRUN = xfalse ; then + { { echo "$as_me:$LINENO: error: \"missing mpirun \ +Needed by gpiv when --enable-mpi\"" >&5 +echo "$as_me: error: \"missing mpirun \ +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. +set dummy gpiv_rr; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_RR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$RR"; then + ac_cv_prog_RR="$RR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RR="true" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_RR" && ac_cv_prog_RR="false" +fi +fi +RR=$ac_cv_prog_RR +if test -n "$RR"; then + { echo "$as_me:$LINENO: result: $RR" >&5 +echo "${ECHO_T}$RR" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + if test x$RR = xfalse ; then + { { echo "$as_me:$LINENO: error: \"missing mpi-enabled gpiv_rr from gpivtools. \ +Needed by gpiv when --enable-mpi\"" >&5 +echo "$as_me: error: \"missing mpi-enabled gpiv_rr from gpivtools. \ +Needed by gpiv when --enable-mpi\"" >&2;} + { (exit 1); exit 1; }; } + fi + -{ echo "$as_me:$LINENO: checking for gpiv_piv_interrogate_ia in -lgpiv" >&5 -echo $ECHO_N "checking for gpiv_piv_interrogate_ia in -lgpiv... $ECHO_C" >&6; } -if test "${ac_cv_lib_gpiv_gpiv_piv_interrogate_ia+set}" = set; then +{ echo "$as_me:$LINENO: checking for gpiv_piv_mpi_bcast_pivpar in -lgpiv_mpi" >&5 +echo $ECHO_N "checking for gpiv_piv_mpi_bcast_pivpar in -lgpiv_mpi... $ECHO_C" >&6; } +if test "${ac_cv_lib_gpiv_mpi_gpiv_piv_mpi_bcast_pivpar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lgpiv $LIBS" +LIBS="-lgpiv_mpi $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -8541,11 +8713,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char gpiv_piv_interrogate_ia (); +char gpiv_piv_mpi_bcast_pivpar (); int main () { -return gpiv_piv_interrogate_ia (); +return gpiv_piv_mpi_bcast_pivpar (); ; return 0; } @@ -8568,37 +8740,41 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_gpiv_gpiv_piv_interrogate_ia=yes + ac_cv_lib_gpiv_mpi_gpiv_piv_mpi_bcast_pivpar=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_gpiv_gpiv_piv_interrogate_ia=no + ac_cv_lib_gpiv_mpi_gpiv_piv_mpi_bcast_pivpar=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_gpiv_gpiv_piv_interrogate_ia" >&5 -echo "${ECHO_T}$ac_cv_lib_gpiv_gpiv_piv_interrogate_ia" >&6; } -if test $ac_cv_lib_gpiv_gpiv_piv_interrogate_ia = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_gpiv_mpi_gpiv_piv_mpi_bcast_pivpar" >&5 +echo "${ECHO_T}$ac_cv_lib_gpiv_mpi_gpiv_piv_mpi_bcast_pivpar" >&6; } +if test $ac_cv_lib_gpiv_mpi_gpiv_piv_mpi_bcast_pivpar = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGPIV 1 +#define HAVE_LIBGPIV_MPI 1 _ACEOF - LIBS="-lgpiv $LIBS" + LIBS="-lgpiv_mpi $LIBS" else - { { echo "$as_me:$LINENO: error: libgpiv has not been installed" >&5 -echo "$as_me: error: libgpiv has not been installed" >&2;} + { { echo "$as_me:$LINENO: error: \"gpiv_piv_mpi_bcast_pivpar is not working in libgpiv_mpi. \ +Enable MPI in libgpiv or disable it here by leaving out --enable-mpi during ./configure\"" >&5 +echo "$as_me: error: \"gpiv_piv_mpi_bcast_pivpar is not working in libgpiv_mpi. \ +Enable MPI in libgpiv or disable it here by leaving out --enable-mpi during ./configure\"" >&2;} { (exit 1); exit 1; }; } fi -{ echo "$as_me:$LINENO: checking for gpiv_scan_resourcefiles in -lgpiv" >&5 -echo $ECHO_N "checking for gpiv_scan_resourcefiles in -lgpiv... $ECHO_C" >&6; } -if test "${ac_cv_lib_gpiv_gpiv_scan_resourcefiles+set}" = set; then +else + +{ echo "$as_me:$LINENO: checking for gpiv_piv_interrogate_img in -lgpiv" >&5 +echo $ECHO_N "checking for gpiv_piv_interrogate_img in -lgpiv... $ECHO_C" >&6; } +if test "${ac_cv_lib_gpiv_gpiv_piv_interrogate_img+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -8616,11 +8792,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char gpiv_scan_resourcefiles (); +char gpiv_piv_interrogate_img (); int main () { -return gpiv_scan_resourcefiles (); +return gpiv_piv_interrogate_img (); ; return 0; } @@ -8643,21 +8819,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_gpiv_gpiv_scan_resourcefiles=yes + ac_cv_lib_gpiv_gpiv_piv_interrogate_img=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_gpiv_gpiv_scan_resourcefiles=no + ac_cv_lib_gpiv_gpiv_piv_interrogate_img=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_gpiv_gpiv_scan_resourcefiles" >&5 -echo "${ECHO_T}$ac_cv_lib_gpiv_gpiv_scan_resourcefiles" >&6; } -if test $ac_cv_lib_gpiv_gpiv_scan_resourcefiles = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_gpiv_gpiv_piv_interrogate_img" >&5 +echo "${ECHO_T}$ac_cv_lib_gpiv_gpiv_piv_interrogate_img" >&6; } +if test $ac_cv_lib_gpiv_gpiv_piv_interrogate_img = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBGPIV 1 _ACEOF @@ -8670,6 +8846,8 @@ echo "$as_me: error: libgpiv has not been installed" >&2;} { (exit 1); exit 1; }; } fi +fi + @@ -9476,9 +9654,7 @@ echo "${ECHO_T}no" >&6; } fi - - -if $CONTROL; then + if $CONTROL; then HAVE_CONTROL_TRUE= HAVE_CONTROL_FALSE='#' else @@ -9547,190 +9723,6 @@ fi -# Check whether --enable-mpi was given. -if test "${enable_mpi+set}" = set; then - enableval=$enable_mpi; ENABLE_MPI="-DENABLE_MPI" - -fi - - - -if test "${ENABLE_MPI}" == '-DENABLE_MPI'; then - - # Extract the first word of "mpirun", so it can be a program name with args. -set dummy mpirun; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_MPIRUN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$MPIRUN"; then - ac_cv_prog_MPIRUN="$MPIRUN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_MPIRUN="true" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_MPIRUN" && ac_cv_prog_MPIRUN="false" -fi -fi -MPIRUN=$ac_cv_prog_MPIRUN -if test -n "$MPIRUN"; then - { echo "$as_me:$LINENO: result: $MPIRUN" >&5 -echo "${ECHO_T}$MPIRUN" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - if test x$MPIRUN = xfalse ; then - { { echo "$as_me:$LINENO: error: \"missing mpirun \ -Needed by gpiv when --enable-mpi\"" >&5 -echo "$as_me: error: \"missing mpirun \ -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. -set dummy gpiv_rr; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_RR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RR"; then - ac_cv_prog_RR="$RR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RR="true" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_RR" && ac_cv_prog_RR="false" -fi -fi -RR=$ac_cv_prog_RR -if test -n "$RR"; then - { echo "$as_me:$LINENO: result: $RR" >&5 -echo "${ECHO_T}$RR" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - if test x$RR = xfalse ; then - { { echo "$as_me:$LINENO: error: \"missing mpi-enabled gpiv_rr from gpivtools. \ -Needed by gpiv when --enable-mpi\"" >&5 -echo "$as_me: error: \"missing mpi-enabled gpiv_rr from gpivtools. \ -Needed by gpiv when --enable-mpi\"" >&2;} - { (exit 1); exit 1; }; } - fi - - -{ echo "$as_me:$LINENO: checking for gpiv_piv_mpi_bcast_pivpar in -lgpiv" >&5 -echo $ECHO_N "checking for gpiv_piv_mpi_bcast_pivpar in -lgpiv... $ECHO_C" >&6; } -if test "${ac_cv_lib_gpiv_gpiv_piv_mpi_bcast_pivpar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgpiv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 gpiv_piv_mpi_bcast_pivpar (); -int -main () -{ -return gpiv_piv_mpi_bcast_pivpar (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_gpiv_gpiv_piv_mpi_bcast_pivpar=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_gpiv_gpiv_piv_mpi_bcast_pivpar=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_gpiv_gpiv_piv_mpi_bcast_pivpar" >&5 -echo "${ECHO_T}$ac_cv_lib_gpiv_gpiv_piv_mpi_bcast_pivpar" >&6; } -if test $ac_cv_lib_gpiv_gpiv_piv_mpi_bcast_pivpar = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGPIV 1 -_ACEOF - - LIBS="-lgpiv $LIBS" - -else - { { echo "$as_me:$LINENO: error: \"gpiv_piv_mpi_bcast_pivpar is not working in libgpiv. \ -Enable MPI in libgpiv or disable it here by leaving out --enable-mpi during ./configure\"" >&5 -echo "$as_me: error: \"gpiv_piv_mpi_bcast_pivpar is not working in libgpiv. \ -Enable MPI in libgpiv or disable it here by leaving out --enable-mpi during ./configure\"" >&2;} - { (exit 1); exit 1; }; } -fi - - -fi - - - ac_config_files="$ac_config_files Makefile doc/Makefile doc/C/Makefile doc/C/figures/Makefile src/Makefile po/Makefile.in man/Makefile pixmaps/Makefile" @@ -10265,6 +10257,7 @@ gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -10471,6 +10464,7 @@ target_alias!$target_alias$ac_delim INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim INSTALL_DATA!$INSTALL_DATA$ac_delim +am__isrc!$am__isrc$ac_delim CYGPATH_W!$CYGPATH_W$ac_delim PACKAGE!$PACKAGE$ac_delim VERSION!$VERSION$ac_delim @@ -10527,7 +10521,6 @@ XGETTEXT!$XGETTEXT$ac_delim CATALOGS!$CATALOGS$ac_delim CATOBJEXT!$CATOBJEXT$ac_delim DATADIRNAME!$DATADIRNAME$ac_delim -GMOFILES!$GMOFILES$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -10569,6 +10562,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +GMOFILES!$GMOFILES$ac_delim INSTOBJEXT!$INSTOBJEXT$ac_delim INTLLIBS!$INTLLIBS$ac_delim PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim @@ -10601,6 +10595,9 @@ INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim MSGMERGE!$MSGMERGE$ac_delim INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim ALL_LINGUAS!$ALL_LINGUAS$ac_delim +ENABLE_MPI!$ENABLE_MPI$ac_delim +MPIRUN!$MPIRUN$ac_delim +RR!$RR$ac_delim ENABLE_CAM!$ENABLE_CAM$ac_delim ENABLE_TRIG!$ENABLE_TRIG$ac_delim ENABLE_DAC!$ENABLE_DAC$ac_delim @@ -10613,14 +10610,11 @@ OVERRIDE_IMAGE_WIDTH_MAX!$OVERRIDE_IMAGE_WIDTH_MAX$ac_delim OVERRIDE_IMAGE_HEIGHT_MAX!$OVERRIDE_IMAGE_HEIGHT_MAX$ac_delim CANVAS_AA!$CANVAS_AA$ac_delim DEBUG!$DEBUG$ac_delim -ENABLE_MPI!$ENABLE_MPI$ac_delim -MPIRUN!$MPIRUN$ac_delim -RR!$RR$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 49; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -10847,6 +10841,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -10900,6 +10899,7 @@ s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out @@ -10934,8 +10934,9 @@ echo "$as_me: executing $ac_file commands" >&6;} # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ @@ -11053,6 +11054,11 @@ done sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; "po/stamp-it":C) + if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then + { { echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5 +echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;} + { (exit 1); exit 1; }; } + fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" sed '/^#/d @@ -11061,17 +11067,11 @@ done '"s|^| $ac_top_srcdir/|" \ "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES" - if test ! -f "po/Makefile"; then - { { echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5 -echo "$as_me: error: po/Makefile is not ready." >&2;} - { (exit 1); exit 1; }; } - fi - mv "po/Makefile" "po/Makefile.tmp" sed '/^POTFILES =/,/[^\\]$/ { /^POTFILES =/!d r po/POTFILES } - ' "po/Makefile.tmp" >"po/Makefile" + ' "po/Makefile.in" >"po/Makefile" rm -f "po/Makefile.tmp" mv "po/stamp-it.tmp" "po/stamp-it" ;; diff --git a/configure.in b/configure.in index 9f4f329..9d1e711 100644 --- a/configure.in +++ b/configure.in @@ -84,10 +84,40 @@ AC_CHECK_LIB(gsl, main, , dnl AC_CHECK_LIB(gslcblas, gsl_fit_linear, , dnl AC_MSG_ERROR("libgsl not installed")) -AC_CHECK_LIB(gpiv, gpiv_piv_interrogate_ia, , - AC_MSG_ERROR([libgpiv has not been installed])) -AC_CHECK_LIB(gpiv, gpiv_scan_resourcefiles, , - AC_MSG_ERROR([libgpiv has not been installed])) +dnl +dnl Enabling Message Passing Interface (MPI) for parallel computing +dnl +AC_ARG_ENABLE(mpi, + [ --enable-mpi enable Message Protocol Interface (MPI)], + [ENABLE_MPI="-DENABLE_MPI"] + ) +AC_SUBST(ENABLE_MPI) + +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_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") + fi + + AC_CHECK_LIB(gpiv_mpi, gpiv_piv_mpi_bcast_pivpar, , + AC_MSG_ERROR("gpiv_piv_mpi_bcast_pivpar is not working in libgpiv_mpi. \ +Enable MPI in libgpiv or disable it here by leaving out --enable-mpi during ./configure")) + +else + AC_CHECK_LIB(gpiv, gpiv_piv_interrogate_img, , + AC_MSG_ERROR([libgpiv has not been installed])) +fi + dnl AC_CHECK_HEADER(gpiv.h, ,AC_MSG_ERROR("giv.h is not installed")) AC_CHECK_HEADERS([stdlib.h string.h unistd.h fftw3.h gpiv.h]) @@ -191,39 +221,6 @@ AC_SUBST(DEBUG) -dnl -dnl Enabling Message Passing Interface (MPI) for parallel computing -dnl -AC_ARG_ENABLE(mpi, - [ --enable-mpi enable Message Protocol Interface (MPI)], - [ENABLE_MPI="-DENABLE_MPI"] - ) -AC_SUBST(ENABLE_MPI) - -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_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") - fi - - AC_CHECK_LIB(gpiv, gpiv_piv_mpi_bcast_pivpar, , - AC_MSG_ERROR("gpiv_piv_mpi_bcast_pivpar is not working in libgpiv. \ -Enable MPI in libgpiv or disable it here by leaving out --enable-mpi during ./configure")) - -fi - - - dnl GNOME_DISABLE_DEPRECATED="-DGNOME_DISABLE_DEPRECATED" dnl AC_SUBST(GNOME_DISABLE_DEPRECATED) diff --git a/doc/C/Makefile.in b/doc/C/Makefile.in index 88cffc5..136342b 100644 --- a/doc/C/Makefile.in +++ b/doc/C/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -46,10 +42,11 @@ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -59,14 +56,14 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(gpiv_helpdir)" gpiv_helpDATA_INSTALL = $(INSTALL_DATA) DATA = $(gpiv_help_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -105,8 +102,7 @@ GPIV_PRINT_LIBS = @GPIV_PRINT_LIBS@ GPIV_UI_CFLAGS = @GPIV_UI_CFLAGS@ GPIV_UI_LIBS = @GPIV_UI_LIBS@ GREP = @GREP@ -HAVE_CONTROL_FALSE = @HAVE_CONTROL_FALSE@ -HAVE_CONTROL_TRUE = @HAVE_CONTROL_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -142,9 +138,8 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MPIRUN = @MPIRUN@ MSGFMT = @MSGFMT@ @@ -173,9 +168,11 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -183,6 +180,7 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -206,8 +204,11 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = figures gpiv_helpdir = $(datadir)/gnome/help/gpiv/C gpiv_help_DATA = \ @@ -250,10 +251,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-gpiv_helpDATA: $(gpiv_help_DATA) @$(NORMAL_INSTALL) - test -z "$(gpiv_helpdir)" || $(mkdir_p) "$(DESTDIR)$(gpiv_helpdir)" + test -z "$(gpiv_helpdir)" || $(MKDIR_P) "$(DESTDIR)$(gpiv_helpdir)" @list='$(gpiv_help_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -300,8 +300,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -345,8 +344,8 @@ 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; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -371,8 +370,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -382,13 +381,12 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(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; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -402,22 +400,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -431,7 +428,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -439,6 +436,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -452,7 +451,7 @@ all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(gpiv_helpdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -498,12 +497,20 @@ info-am: install-data-am: install-gpiv_helpDATA +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -522,22 +529,24 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-gpiv_helpDATA uninstall-info-am +uninstall-am: uninstall-gpiv_helpDATA -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - dist-hook distclean distclean-generic distclean-recursive \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive dist-hook distclean distclean-generic \ distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-gpiv_helpDATA install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-gpiv_helpDATA uninstall-info-am + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-gpiv_helpDATA install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-gpiv_helpDATA #EXTRA_DIST = $(gpiv_help_DATA) diff --git a/doc/C/figures/Makefile.in b/doc/C/figures/Makefile.in index 4d0f31a..bad89f6 100644 --- a/doc/C/figures/Makefile.in +++ b/doc/C/figures/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -56,8 +52,6 @@ DATA = $(gpiv_fig_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -96,8 +90,7 @@ GPIV_PRINT_LIBS = @GPIV_PRINT_LIBS@ GPIV_UI_CFLAGS = @GPIV_UI_CFLAGS@ GPIV_UI_LIBS = @GPIV_UI_LIBS@ GREP = @GREP@ -HAVE_CONTROL_FALSE = @HAVE_CONTROL_FALSE@ -HAVE_CONTROL_TRUE = @HAVE_CONTROL_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -133,9 +126,8 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MPIRUN = @MPIRUN@ MSGFMT = @MSGFMT@ @@ -164,9 +156,11 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -174,6 +168,7 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -197,8 +192,11 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ gpiv_figdir = $(datadir)/gnome/help/gpiv/C/figures gpiv_fig_DATA = \ gpiv-desk.png \ @@ -245,10 +243,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-gpiv_figDATA: $(gpiv_fig_DATA) @$(NORMAL_INSTALL) - test -z "$(gpiv_figdir)" || $(mkdir_p) "$(DESTDIR)$(gpiv_figdir)" + test -z "$(gpiv_figdir)" || $(MKDIR_P) "$(DESTDIR)$(gpiv_figdir)" @list='$(gpiv_fig_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -271,22 +268,21 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -305,7 +301,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(gpiv_figdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -351,12 +347,20 @@ info-am: install-data-am: install-gpiv_figDATA +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -375,17 +379,20 @@ ps: ps-am ps-am: -uninstall-am: uninstall-gpiv_figDATA uninstall-info-am +uninstall-am: uninstall-gpiv_figDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic dist-hook \ distclean distclean-generic distdir dvi dvi-am html html-am \ info info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-gpiv_figDATA install-info \ - install-info-am install-man install-strip installcheck \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-gpiv_figDATA install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-gpiv_figDATA \ - uninstall-info-am + pdf-am ps ps-am uninstall uninstall-am uninstall-gpiv_figDATA dist-hook: diff --git a/doc/Makefile.in b/doc/Makefile.in index 712eaaa..e5b78da 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -45,18 +41,19 @@ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -95,8 +92,7 @@ GPIV_PRINT_LIBS = @GPIV_PRINT_LIBS@ GPIV_UI_CFLAGS = @GPIV_UI_CFLAGS@ GPIV_UI_LIBS = @GPIV_UI_LIBS@ GREP = @GREP@ -HAVE_CONTROL_FALSE = @HAVE_CONTROL_FALSE@ -HAVE_CONTROL_TRUE = @HAVE_CONTROL_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -132,9 +128,8 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MPIRUN = @MPIRUN@ MSGFMT = @MSGFMT@ @@ -163,9 +158,11 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -173,6 +170,7 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -196,8 +194,11 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = C EXTRA_DIST = Makefile.in all: all-recursive @@ -232,7 +233,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -265,8 +265,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -310,8 +309,8 @@ 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; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -336,8 +335,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -347,13 +346,12 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(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; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -367,22 +365,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -396,7 +393,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -404,6 +401,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -457,12 +456,20 @@ info-am: install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -481,21 +488,23 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-recursive distclean-tags \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/man/Makefile.in b/man/Makefile.in index f7614c2..907877b 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in 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. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -50,8 +46,6 @@ MANS = $(man_MANS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -90,8 +84,7 @@ GPIV_PRINT_LIBS = @GPIV_PRINT_LIBS@ GPIV_UI_CFLAGS = @GPIV_UI_CFLAGS@ GPIV_UI_LIBS = @GPIV_UI_LIBS@ GREP = @GREP@ -HAVE_CONTROL_FALSE = @HAVE_CONTROL_FALSE@ -HAVE_CONTROL_TRUE = @HAVE_CONTROL_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -127,9 +120,8 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MPIRUN = @MPIRUN@ MSGFMT = @MSGFMT@ @@ -158,9 +150,11 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -168,6 +162,7 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -191,8 +186,11 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ man_MANS = gpiv.1 EXTRA_DIST = $(man_MANS) all: all-am @@ -227,10 +225,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -281,22 +278,21 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -312,7 +308,7 @@ check: check-am all-am: Makefile $(MANS) installdirs: for dir in "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -358,12 +354,20 @@ info-am: install-data-am: install-man +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: install-man1 +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -382,18 +386,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-man +uninstall-am: uninstall-man uninstall-man: uninstall-man1 +.MAKE: install-am install-strip + .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-man1 install-strip installcheck installcheck-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ - uninstall-am uninstall-info-am uninstall-man uninstall-man1 + uninstall-am uninstall-man uninstall-man1 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/mkinstalldirs b/mkinstalldirs old mode 100644 new mode 100755 diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am new file mode 100644 index 0000000..15f4cb3 --- /dev/null +++ b/pixmaps/Makefile.am @@ -0,0 +1,7 @@ +INCLUDES = -DDATA_DIR=\""$(datadir)"\" + +pixmapsdir = $(datadir)/pixmaps +pixmaps_DATA = gpiv_logo.png gpiv_logo.xpm + +EXTRA_DIST = $(pixmaps_DATA) + diff --git a/po/Makefile.in.in b/po/Makefile.in.in index e0a2203..57ef267 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -54,16 +54,16 @@ GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDA ALL_LINGUAS = @ALL_LINGUAS@ -PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) +PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) -POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) +POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) -DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) -EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS +DISTFILES = Makefile.in.in POTFILES.in $(POFILES) +EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS POTFILES = \ # This comment gets stripped out diff --git a/po/ca.gmo b/po/ca.gmo deleted file mode 100644 index 0cfa60e83922f777807e18d3588b61b1b0c05665..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 25331 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 Jt5&k4{s-};3aS7A diff --git a/po/nl.gmo b/po/nl.gmo deleted file mode 100644 index 35a3eba398b7129c723a344740cdeebcfc4e6e44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 25664 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 dac->combo_fname_items = NULL; - for (i = 0; i < gpiv_var.number_fnames_last; i++) { + for (i = 0; i < gpiv_var->number_fnames_last; i++) { dac->combo_fname_items = g_list_append (dac->combo_fname_items, - gpiv_var.fn_last[i]); + gpiv_var->fn_last[i]); } gtk_combo_set_popdown_strings (GTK_COMBO (dac->combo_fname), dac->combo_fname_items); @@ -109,12 +109,12 @@ on_checkbutton_fname_date(GtkWidget *widget, */ { if (GTK_TOGGLE_BUTTON(widget)->active) { - gpiv_var.fname_date = TRUE; + gpiv_var->fname_date = TRUE; } else { - gpiv_var.fname_date = FALSE; + gpiv_var->fname_date = FALSE; } gnome_config_push_prefix("/gpiv/RuntimeVariables/"); - gnome_config_set_bool("fname_date", gpiv_var.fname_date); + gnome_config_set_bool("fname_date", gpiv_var->fname_date); gnome_config_pop_prefix(); gnome_config_sync(); } @@ -143,12 +143,12 @@ on_checkbutton_fname_time(GtkWidget *widget, */ { if (GTK_TOGGLE_BUTTON(widget)->active) { - gpiv_var.fname_time = TRUE; + gpiv_var->fname_time = TRUE; } else { - gpiv_var.fname_time = FALSE; + gpiv_var->fname_time = FALSE; } gnome_config_push_prefix("/gpiv/RuntimeVariables/"); - gnome_config_set_bool("fname_time", gpiv_var.fname_time); + gnome_config_set_bool("fname_time", gpiv_var->fname_time); gnome_config_pop_prefix(); gnome_config_sync(); } @@ -249,7 +249,7 @@ on_radiobutton_dac_mouse(GtkWidget * widget, { gint mouse_select = atoi(gtk_object_get_data(GTK_OBJECT(widget), "mouse_select")); - gl_cam_par.mode = mouse_select; + gl_cam_par->mode = mouse_select; /* g_warning("on_radiobutton_dac_mouse:: mode = %d", */ /* gl_cam_par.mode); */ @@ -301,7 +301,7 @@ on_spinbutton_dac_trigger_nf(GtkSpinButton * widget, /*----------------------------------------------------------------------------- */ { - gl_cam_par.cycles = gtk_spin_button_get_value_as_int(widget); + gl_cam_par->cycles = gtk_spin_button_get_value_as_int(widget); } #else /* ENABLE_CAM */ diff --git a/src/dac_cam.c b/src/dac_cam.c index d82adea..ff75839 100644 --- a/src/dac_cam.c +++ b/src/dac_cam.c @@ -155,33 +155,33 @@ exec_cam_start(GpivConsole * gpiv * report camera's feature set * in: on_menu_camera_select */ -/* dc1394_print_feature_set(&cam_var.feature_set[0]); */ +/* dc1394_print_feature_set(&cam_var->feature_set[0]); */ /* g_message("exec_cam_start:: mode[%d] = %s", */ -/* cam_var.misc_info[0].mode, */ -/* format0_desc[cam_var.misc_info[0].mode - MODE_FORMAT0_MIN]); */ +/* cam_var->misc_info[0].mode, */ +/* format0_desc[cam_var->misc_info[0].mode - MODE_FORMAT0_MIN]); */ /* g_message("exec_cam_start:: format[%d] = %s", */ -/* cam_var.misc_info[0].format, */ -/* format_desc[cam_var.misc_info[0].format - FORMAT_MIN]); */ +/* cam_var->misc_info[0].format, */ +/* format_desc[cam_var->misc_info[0].format - FORMAT_MIN]); */ - if (verbose) g_warning("exec_cam_start:: fps = %d", cam_var.misc_info[0].framerate/* - FRAMERATE_MIN */); - if (dc1394_setup_capture(cam_var.camera[0].handle, - cam_var.camera[0].id, - cam_var.misc_info[0].iso_channel, - cam_var.misc_info[0].format, - cam_var.misc_info[0].mode, - cam_var.maxspeed, + if (verbose) g_warning("exec_cam_start:: fps = %d", cam_var->misc_info[0].framerate/* - FRAMERATE_MIN */); + if (dc1394_setup_capture(cam_var->camera[0].handle, + cam_var->camera[0].id, + cam_var->misc_info[0].iso_channel, + cam_var->misc_info[0].format, + cam_var->misc_info[0].mode, + cam_var->maxspeed, - cam_var.misc_info[0].framerate, + cam_var->misc_info[0].framerate, /* FRAMERATE_7_5, */ /* FRAMERATE_3_75, */ - &cam_var.capture[0]) + &cam_var->capture[0]) != DC1394_SUCCESS) { - dc1394_release_camera(cam_var.handle, &cam_var.capture[0]); - raw1394_destroy_handle(cam_var.handle); + dc1394_release_camera(cam_var->handle, &cam_var->capture[0]); + raw1394_destroy_handle(cam_var->handle); warning_gpiv(_("Unable to setup camera-\n\ check line %d of %s to make sure\n\ that the video mode,framerate and format are\n\ @@ -194,10 +194,10 @@ supported by your camera"), /* * have the camera start sending us data */ - if (dc1394_start_iso_transmission(cam_var.handle, cam_var.capture[0].node) + if (dc1394_start_iso_transmission(cam_var->handle, cam_var->capture[0].node) != DC1394_SUCCESS) { - dc1394_release_camera(cam_var.handle, &cam_var.capture[0]); - raw1394_destroy_handle(cam_var.handle); + dc1394_release_camera(cam_var->handle, &cam_var->capture[0]); + raw1394_destroy_handle(cam_var->handle); warning_gpiv(_("Unable to start camera iso transmission")); return; } @@ -214,10 +214,10 @@ supported by your camera"), * set trigger mode and use triggering or just free run */ - if (gpiv_par.console__trigger_cam) { + if (gpiv_par->console__trigger_cam) { if (verbose) g_warning("exec_cam_start:: trigger_cam"); -/* if (dc1394_set_trigger_mode(cam_var.handle, */ -/* cam_var.capture[0].node, */ +/* if (dc1394_set_trigger_mode(cam_var->handle, */ +/* cam_var->capture[0].node, */ /* TRIGGER_MODE_0) != DC1394_SUCCESS) */ /* { */ /* warning_gpiv(_("unable to set camera trigger mode")); */ @@ -239,15 +239,15 @@ supported by your camera"), * Stop data transmission */ if (verbose) g_warning("exec_cam_start:: Stop data transmission and release camera"); - if (dc1394_stop_iso_transmission(cam_var.handle, cam_var.capture[0].node) + if (dc1394_stop_iso_transmission(cam_var->handle, cam_var->capture[0].node) != DC1394_SUCCESS -/* && dc1394_release_camera(cam_var.handle, &cam_var.capture[0]) */ +/* && dc1394_release_camera(cam_var->handle, &cam_var->capture[0]) */ /* != DC1394_SUCCESS */ ) { warning_gpiv(_("couldn't stop the camera?")); } -/* in: exec_stop_cam dc1394_release_camera(cam_var.handle, &cam_var.capture[0]); */ -/*in: exec_stop_cam: raw1394_destroy_handle(cam_var.handle); */ +/* in: exec_stop_cam dc1394_release_camera(cam_var->handle, &cam_var->capture[0]); */ +/*in: exec_stop_cam: raw1394_destroy_handle(cam_var->handle); */ } @@ -261,18 +261,18 @@ exec_cam_stop (void gint i; cancel_process = TRUE; - for (i = 0; i < cam_var.numCameras; i++) { - if (dc1394_stop_iso_transmission(cam_var.handle, cam_var.capture[i].node) + for (i = 0; i < cam_var->numCameras; i++) { + if (dc1394_stop_iso_transmission(cam_var->handle, cam_var->capture[i].node) != DC1394_SUCCESS) { warning_gpiv(_("couldn't stop the camera?")); } pthread_exit(NULL); - dc1394_release_camera(cam_var.handle, &cam_var.capture[0]); + dc1394_release_camera(cam_var->handle, &cam_var->capture[0]); } - if (cam_var.numCameras > 0) { - raw1394_destroy_handle(cam_var.handle); + if (cam_var->numCameras > 0) { + raw1394_destroy_handle(cam_var->handle); } } @@ -305,15 +305,15 @@ on_menu_format (GtkWidget *widget, /* IsoFlowCheck(state); */ if (verbose) g_message("on_menu_format:: "); - if (!dc1394_get_iso_status(cam_var.camera[0].handle, cam_var.camera[0].id, - &cam_var.misc_info[0].is_iso_on)) { + if (!dc1394_get_iso_status(cam_var->camera[0].handle, cam_var->camera[0].id, + &cam_var->misc_info[0].is_iso_on)) { g_warning("Cannot get ISO status"); } else { - if (cam_var.misc_info[0].is_iso_on > 0) { + if (cam_var->misc_info[0].is_iso_on > 0) { cancel_process = TRUE; } } - was_iso_on = cam_var.misc_info[0].is_iso_on; + was_iso_on = cam_var->misc_info[0].is_iso_on; /* g_message("on_menu_format:: is_iso_on = %d", was_iso_on); */ @@ -340,20 +340,20 @@ on_menu_format (GtkWidget *widget, warning_gpiv(_("on_menu_format: non valid format")); } - if (!dc1394_set_video_format(cam_var.camera[0].handle, - cam_var.camera[0].id, + if (!dc1394_set_video_format(cam_var->camera[0].handle, + cam_var->camera[0].id, format)) { if (verbose) g_warning("on_menu_format:: Could not set video format"); } else { - cam_var.misc_info[0].format = format; + cam_var->misc_info[0].format = format; } - if (!dc1394_set_video_mode(cam_var.camera[0].handle, - cam_var.camera[0].id, + if (!dc1394_set_video_mode(cam_var->camera[0].handle, + cam_var->camera[0].id, mode)) { if (verbose) g_warning("on_menu_format:: Could not set video format"); } else { - cam_var.misc_info[0].mode = mode; + cam_var->misc_info[0].mode = mode; } @@ -386,9 +386,9 @@ on_menu_fps (GtkWidget *widget, /* ---------------------------------------------------------------------------- */ { - cam_var.misc_info[0].framerate = (int) data/* - FRAMERATE_MIN */; -/* cam_var.misc_info[0].framerat */ - if (verbose) g_warning("on_menu_fps:: fps = %d", cam_var.misc_info[0].framerate); + cam_var->misc_info[0].framerate = (int) data/* - FRAMERATE_MIN */; +/* cam_var->misc_info[0].framerat */ + if (verbose) g_warning("on_menu_fps:: fps = %d", cam_var->misc_info[0].framerate); } @@ -401,12 +401,12 @@ on_trigger_polarity_toggled (GtkToggleButton *togglebutton, { /* ---------------------------------------------------------------------------- */ - if (!dc1394_set_trigger_polarity(cam_var.camera[0].handle, - cam_var.camera[0].id, + if (!dc1394_set_trigger_polarity(cam_var->camera[0].handle, + cam_var->camera[0].id, togglebutton->active)) { message_gpiv(_("Cannot set trigger polarity")); } else { - cam_var.feature_set[0].feature[FEATURE_TRIGGER-FEATURE_MIN]. + cam_var->feature_set[0].feature[FEATURE_TRIGGER-FEATURE_MIN]. trigger_polarity = (int) togglebutton->active; } } @@ -419,13 +419,13 @@ on_trigger_external_toggled (GtkToggleButton *togglebutton, { /* ---------------------------------------------------------------------------- */ - if (!dc1394_feature_on_off(cam_var.camera[0].handle, - cam_var.camera[0].id, + if (!dc1394_feature_on_off(cam_var->camera[0].handle, + cam_var->camera[0].id, FEATURE_TRIGGER, togglebutton->active)) { message_gpiv(_("Cannot set external trigger source")); } else { - cam_var.feature_set[0].feature[FEATURE_TRIGGER - FEATURE_MIN].is_on = + cam_var->feature_set[0].feature[FEATURE_TRIGGER - FEATURE_MIN].is_on = togglebutton->active; } /* UpdateTriggerFrame(); */ @@ -439,11 +439,11 @@ on_trigger_mode_activate (GtkWidget *widget, /* ---------------------------------------------------------------------------- */ { - if (!dc1394_set_trigger_mode(cam_var.camera[0].handle, cam_var.camera[0].id, + if (!dc1394_set_trigger_mode(cam_var->camera[0].handle, cam_var->camera[0].id, (int) user_data)) { message_gpiv(_("Cannot set trigger mode")); } else { - cam_var.feature_set[0].feature[FEATURE_TRIGGER-FEATURE_MIN]. + cam_var->feature_set[0].feature[FEATURE_TRIGGER-FEATURE_MIN]. trigger_mode = (int) user_data; } @@ -456,11 +456,11 @@ on_trigger_mode_activate (GtkWidget *widget, /* on_trigger_value_changed (GtkAdjustment *adj, */ /* gpointer user_data) */ /* { */ -/* if (!dc1394_set_feature_value(cam_var.camera[0].handle, cam_var.camera[0].id, */ +/* if (!dc1394_set_feature_value(cam_var->camera[0].handle, cam_var->camera[0].id, */ /* FEATURE_TRIGGER, adj->value)) */ /* message_gpiv(_("Cannot set external trigger count")); */ /* else */ -/* cam_var.feature_set[0].feature[FEATURE_TRIGGER-FEATURE_MIN].value = */ +/* cam_var->feature_set[0].feature[FEATURE_TRIGGER-FEATURE_MIN].value = */ /* adj->value; */ /* } */ @@ -485,9 +485,9 @@ on_checkbutton_camera_trigger (GtkWidget *widget, */ { if (GTK_TOGGLE_BUTTON(widget)->active) { - gpiv_par.console__trigger_cam = TRUE; + gpiv_par->console__trigger_cam = TRUE; } else { - gpiv_par.console__trigger_cam = FALSE; + gpiv_par->console__trigger_cam = FALSE; } } @@ -507,8 +507,8 @@ on_man_auto_menu (GtkWidget *widget, } var_type; var_type = atoi(gtk_object_get_data(GTK_OBJECT(widget), "var_type")); - if (!dc1394_auto_on_off(cam_var.camera[0].handle, - cam_var.camera[0].id, + if (!dc1394_auto_on_off(cam_var->camera[0].handle, + cam_var->camera[0].id, feature, var_type)) { message_gpiv(_("on_man_auto_menu: Cannnot set auto / manual")); } @@ -531,25 +531,25 @@ on_scale_changed (GtkAdjustment *adj, { switch((int)user_data) { case FEATURE_TEMPERATURE: - if (!dc1394_set_temperature(cam_var.camera[0].handle, - cam_var.camera[0].id, + if (!dc1394_set_temperature(cam_var->camera[0].handle, + cam_var->camera[0].id, adj->value)) message_gpiv(_("on_scale_changed: Cannot set temperature")); else - cam_var.feature_set[0].feature[FEATURE_TEMPERATURE-FEATURE_MIN]. + cam_var->feature_set[0].feature[FEATURE_TEMPERATURE-FEATURE_MIN]. value = adj->value; break; default: /* g_message("on_scale_changed:: feature = %d value = %f", */ /* (gint) user_data, adj->value); */ - if (!dc1394_set_feature_value(cam_var.camera[0].handle, - cam_var.camera[0].id, + if (!dc1394_set_feature_value(cam_var->camera[0].handle, + cam_var->camera[0].id, (gint) user_data, adj->value)) { message_gpiv(_("on_scale_changed: Cannot set feature")); } else { - cam_var.feature_set[0].feature[(gint) user_data - FEATURE_MIN]. + cam_var->feature_set[0].feature[(gint) user_data - FEATURE_MIN]. value = adj->value; } break; @@ -641,23 +641,23 @@ open_dac_img(GpivCamVar *cam_var, /* * parameter initializing of image */ - gpiv_img_parameters_set(&img->image_par, FALSE); + gpiv_img_parameters_set(img->image->header, FALSE); - img->image_par.ncolumns = cam_var->capture[0].frame_width; - img->image_par.nrows = cam_var->capture[0].frame_height; - img->image_par.x_corr = gpiv_par.x_corr; - img->image_par.ncolumns__set = TRUE; - img->image_par.nrows__set = TRUE; - img->image_par.x_corr__set = TRUE; + img->image->header->ncolumns = cam_var->capture[0].frame_width; + img->image->header->nrows = cam_var->capture[0].frame_height; + img->image->header->x_corr = gpiv_par->x_corr; + img->image->header->ncolumns__set = TRUE; + img->image->header->nrows__set = TRUE; + img->image->header->x_corr__set = TRUE; - gpiv_img_cp_parameters (gl_image_par, &img->image_par, FALSE, FALSE); + gl_image_par = gpiv_img_cp_parameters (img->image->header); if (verbose) g_message("open_dac_img:: 1 creation_date = %s", - img->image_par.creation_date); + img->image->header->creation_date); /* * Apply time and date to creation_date (buffer) parameter */ month = month_name(g_date_month(date)); - g_snprintf(img->image_par.creation_date, + g_snprintf(img->image->header->creation_date, GPIV_MAX_CHARS, "%d %s %d %d:%d:%d", g_date_day(date), @@ -673,8 +673,8 @@ open_dac_img(GpivCamVar *cam_var, img->img1 = gpiv_alloc_img(img->image_par); /* } */ - for (i = 0; i < img->image_par.nrows ; i++) { - for (j = 0; j < img->image_par.ncolumns; j++) { + for (i = 0; i < img->image->header->nrows ; i++) { + for (j = 0; j < img->image->header->ncolumns; j++) { /* * format 640x480 = 1:1.3 */ @@ -684,12 +684,12 @@ open_dac_img(GpivCamVar *cam_var, - if (gpiv_par.x_corr) { + if (gpiv_par->x_corr) { /* if(alloc_mem) { */ img->img2 = gpiv_alloc_img(img->image_par); /* } */ - for (i = 0; i < img->image_par.nrows ; i++) { - for (j = 0; j < img->image_par.ncolumns; j++) { + for (i = 0; i < img->image->header->nrows ; i++) { + for (j = 0; j < img->image->header->ncolumns; j++) { /* * format 640x480 = 1:1.3 */ @@ -736,7 +736,7 @@ load_dac_buffer (GpivConsole *gpiv, g_snprintf (display_act->file_uri_name, GPIV_MAX_CHARS, "%s", fname); if((return_val = open_dac_img (cam_var, frameA, frameB, - &display_act->img, FALSE)) + display_act->img, FALSE)) != 0) { gtk_object_destroy (GTK_OBJECT(display[ibuf]->mwin)); if (ibuf > 0) { @@ -767,14 +767,14 @@ load_dac_buffer (GpivConsole *gpiv, */ create_background (display_act); create_img (display_act); - if (display_act->display_img1) { + if (display_act->img->exist_img ) { show_img1 (display_act); } else { hide_img1 (display_act); } - if (gl_image_par.x_corr) { - if (display_act->display_img2) { + if (gl_image_par->x_corr) { + if (display_act->img->exist_img) { show_img2 (display_act); } else { hide_img2 (display_act); @@ -783,11 +783,11 @@ load_dac_buffer (GpivConsole *gpiv, /* display_act->img.img_mean = image_mean(display_act->img.img1, */ -/* gpiv_par.img_width, */ -/* gpiv_par.img_height); */ +/* gpiv_par->img_width, */ +/* gpiv_par->img_height); */ - if (gpiv_par.display__intregs == 1) { + if (gpiv_par->display__intregs == 1) { if (verbose) g_message("load_dac_buffer:: create_all_intregs"); create_all_intregs(display_act); } @@ -822,12 +822,12 @@ load_dac_buffer (GpivConsole *gpiv, /* gpiv_img_cp_parameters(gl_image_par, display_act->img.image_par); */ if (verbose) g_message ("load_dac_buffer:: ncolumns=%d nrows = %d", - display_act->img.image_par.ncolumns, display_act->img.image_par.nrows); + display_act->img->image->header->ncolumns, display_act->img->image->header->nrows); gtk_widget_set_size_request (display_act->canvas, (gint) (display_act->zoom_factor * - display_act->img.image_par.ncolumns), + display_act->img->image->header->ncolumns), (gint) (display_act->zoom_factor * - display_act->img.image_par.nrows)); + display_act->img->image->header->nrows)); } @@ -858,18 +858,18 @@ rec_and_display (GpivConsole *gpiv * been enabled only from camera */ #ifdef ENABLE_TRIG - if (gpiv_par.process_trig) { + if (gpiv_par->process_trig) { mode = gl_trig_par.ttime.mode; cycles = gl_trig_par.ttime.cycles; DURATION = GPIV_TIMER_MODE__DURATION; } else { - mode = gl_cam_par.mode; - cycles = gl_cam_par.cycles; + mode = gl_cam_par->mode; + cycles = gl_cam_par->cycles; DURATION = GPIV_CAM_MODE__DURATION; } #else /* ENABLE_TRIG */ - mode = gl_cam_par.mode; - cycles = gl_cam_par.cycles; + mode = gl_cam_par->mode; + cycles = gl_cam_par->cycles; DURATION = GPIV_CAM_MODE__DURATION; #endif /* ENABLE_TRIG */ @@ -880,7 +880,7 @@ rec_and_display (GpivConsole *gpiv if (mode == DURATION) { for (ibuf = 0; ibuf < nbufs; ibuf++) { if (display[ibuf] != NULL) { - close_buffer(gpiv, display[ibuf], &ibuf); + close_buffer(gpiv, display[ibuf]); } } gtk_clist_clear(GTK_CLIST(gpiv->clist_buf)); @@ -891,11 +891,11 @@ rec_and_display (GpivConsole *gpiv */ for (ibuf = 0; ibuf < cycles; ibuf++) { img_frame[ibuf].A = - gpiv_ucmatrix(cam_var.capture[0].frame_height, - cam_var.capture[0].frame_width); - if (gpiv_par.x_corr) { - img_frame[ibuf].B = gpiv_ucmatrix(cam_var.capture[0].frame_height, - cam_var.capture[0].frame_width); + gpiv_ucmatrix(cam_var->capture[0].frame_height, + cam_var->capture[0].frame_width); + if (gpiv_par->x_corr) { + img_frame[ibuf].B = gpiv_ucmatrix(cam_var->capture[0].frame_height, + cam_var->capture[0].frame_width); } } @@ -946,10 +946,10 @@ rec_and_display (GpivConsole *gpiv * displaying and freeing image mem */ for (ibuf = 0; ibuf < cycles; ibuf++) { - add_buffer(gpiv, gpiv_var.fn_last[0], ibuf, img_frame[ibuf].A, + add_buffer(gpiv, gpiv_var->fn_last[0], ibuf, img_frame[ibuf].A, img_frame[ibuf].B); gpiv_free_ucmatrix(img_frame[ibuf].A); - if (gpiv_par.x_corr) { + if (gpiv_par->x_corr) { gpiv_free_ucmatrix(img_frame[ibuf].B); } } @@ -968,17 +968,17 @@ rec_and_display (GpivConsole *gpiv /* 0.1); */ img_frame[ibuf].A = - gpiv_ucmatrix(cam_var.capture[0].frame_height, - cam_var.capture[0].frame_width); - if (gpiv_par.x_corr) { - img_frame[ibuf].B = gpiv_ucmatrix(cam_var.capture[0].frame_height, - cam_var.capture[0].frame_width); + gpiv_ucmatrix(cam_var->capture[0].frame_height, + cam_var->capture[0].frame_width); + if (gpiv_par->x_corr) { + img_frame[ibuf].B = gpiv_ucmatrix(cam_var->capture[0].frame_height, + cam_var->capture[0].frame_width); } while (!cancel_process) { rec_frame(&img_frame[ibuf]); while (g_main_iteration(FALSE)); - renew_buffer(gpiv, gpiv_var.fn_last[0], ibuf, img_frame[ibuf].A, + renew_buffer(gpiv, gpiv_var->fn_last[0], ibuf, img_frame[ibuf].A, img_frame[ibuf].B); /* BUGFIX: for Gtk2 */ /* gtk_progress_bar_pulse ((GNOME_APPBAR(gpiv->appbar)) */ @@ -987,7 +987,7 @@ rec_and_display (GpivConsole *gpiv } gpiv_free_ucmatrix(img_frame[ibuf].A); - if (gpiv_par.x_corr) { + if (gpiv_par->x_corr) { gpiv_free_ucmatrix(img_frame[ibuf].B); } @@ -1010,18 +1010,18 @@ thread_rec_frame(void *img_frame) my_frame = (ImgFrame *) img_frame; -/* unsigned char **frameA = gpiv_ucmatrix(cam_var.capture[0].frame_height, */ -/* cam_var.capture[0].frame_width); */ +/* unsigned char **frameA = gpiv_ucmatrix(cam_var->capture[0].frame_height, */ +/* cam_var->capture[0].frame_width); */ if (verbose) g_message("thread_rec_frame:: 0.1"); /* * capture one frame */ - if (dc1394_single_capture(cam_var.handle, &cam_var.capture[0]) + if (dc1394_single_capture(cam_var->handle, &cam_var->capture[0]) != DC1394_SUCCESS) { - dc1394_release_camera(cam_var.handle, &cam_var.capture[0]); - raw1394_destroy_handle(cam_var.handle); + dc1394_release_camera(cam_var->handle, &cam_var->capture[0]); + raw1394_destroy_handle(cam_var->handle); warning_gpiv(_("unable to capture a frame")); /* return(); */ } else { @@ -1034,9 +1034,9 @@ thread_rec_frame(void *img_frame) */ pthread_mutex_lock(&mutex_rec); - memcpy( frameA[0], (const char *) cam_var.capture[0].capture_buffer, - sizeof(char) * cam_var.capture[0].frame_width * - cam_var.capture[0].frame_height); + memcpy( frameA[0], (const char *) cam_var->capture[0].capture_buffer, + sizeof(char) * cam_var->capture[0].frame_width * + cam_var->capture[0].frame_height); pthread_mutex_unlock(&mutex_rec); if (verbose) g_message("thread_rec_frame:: 2"); } @@ -1044,19 +1044,19 @@ thread_rec_frame(void *img_frame) /* * Repeat if cross correlation; x_corr = TRUE */ - if (gpiv_par.x_corr) { - if (dc1394_single_capture(cam_var.handle, &cam_var.capture[0]) + if (gpiv_par->x_corr) { + if (dc1394_single_capture(cam_var->handle, &cam_var->capture[0]) != DC1394_SUCCESS) { - dc1394_release_camera(cam_var.handle, &cam_var.capture[0]); - raw1394_destroy_handle(cam_var.handle); + dc1394_release_camera(cam_var->handle, &cam_var->capture[0]); + raw1394_destroy_handle(cam_var->handle); warning_gpiv(_("unable to capture a frame")); /* return(); */ } else { pthread_mutex_lock(&mutex_rec); - memcpy( frameB[0], (const char *) cam_var.capture[0].capture_buffer, - sizeof(char) * cam_var.capture[0].frame_width * - cam_var.capture[0].frame_height); + memcpy( frameB[0], (const char *) cam_var->capture[0].capture_buffer, + sizeof(char) * cam_var->capture[0].frame_width * + cam_var->capture[0].frame_height); pthread_mutex_unlock(&mutex_rec); } } @@ -1083,7 +1083,7 @@ thread_rec_frame_serie(ImgFrame img_frame[GPIV_NIMG_MAX] #ifdef ENABLE_TRIG cycles = gl_trig_par.ttime.cycles; #else /* ENABLE_TRIG */ - cycles = gl_cam_par.cycles; + cycles = gl_cam_par->cycles; #endif /* ENABLE_TRIG */ /* g_message("thread_rec_frame_series:: 0 with id = %d", (int) pthread_self ()); */ @@ -1109,10 +1109,10 @@ rec_frame(ImgFrame *img_frame /* g_message("rec_frame:: 0"); */ - if (dc1394_single_capture(cam_var.handle, &cam_var.capture[0]) + if (dc1394_single_capture(cam_var->handle, &cam_var->capture[0]) != DC1394_SUCCESS) { - dc1394_release_camera(cam_var.handle, &cam_var.capture[0]); - raw1394_destroy_handle(cam_var.handle); + dc1394_release_camera(cam_var->handle, &cam_var->capture[0]); + raw1394_destroy_handle(cam_var->handle); g_warning("unable to capture a frame"); return; } @@ -1121,26 +1121,26 @@ rec_frame(ImgFrame *img_frame * Copy buffer content to tmp buffer array */ memcpy( img_frame->A[0], - (const char *) cam_var.capture[0].capture_buffer, - sizeof(char) * cam_var.capture[0].frame_width * - cam_var.capture[0].frame_height); + (const char *) cam_var->capture[0].capture_buffer, + sizeof(char) * cam_var->capture[0].frame_width * + cam_var->capture[0].frame_height); - if (gpiv_par.x_corr) { + if (gpiv_par->x_corr) { /* * capture second frame */ - if (dc1394_single_capture(cam_var.handle, &cam_var.capture[0]) + if (dc1394_single_capture(cam_var->handle, &cam_var->capture[0]) != DC1394_SUCCESS) { - dc1394_release_camera(cam_var.handle, &cam_var.capture[0]); - raw1394_destroy_handle(cam_var.handle); + dc1394_release_camera(cam_var->handle, &cam_var->capture[0]); + raw1394_destroy_handle(cam_var->handle); g_warning("unable to capture a frame"); return; } memcpy( img_frame->B[0], - (const char *) cam_var.capture[0].capture_buffer, - sizeof(char) * cam_var.capture[0].frame_width * - cam_var.capture[0].frame_height); + (const char *) cam_var->capture[0].capture_buffer, + sizeof(char) * cam_var->capture[0].frame_width * + cam_var->capture[0].frame_height); } /* g_message("rec_frame:: 3/3"); */ @@ -1189,30 +1189,30 @@ add_buffer(GpivConsole *gpiv, g_snprintf(cbuf, 4, "%d", ibuf); - if (gpiv_var.fname_date - && gpiv_var.fname_time) { - fname_base = g_strdup(g_strconcat(gpiv_var.fn_last[0], + if (gpiv_var->fname_date + && gpiv_var->fname_time) { + fname_base = g_strdup(g_strconcat(gpiv_var->fn_last[0], (gchar *) cdate, (gchar *) ctime, (gchar *) cbuf, NULL)); - } else if (gpiv_var.fname_date) { - fname_base = g_strdup(g_strconcat(gpiv_var.fn_last[0], + } else if (gpiv_var->fname_date) { + fname_base = g_strdup(g_strconcat(gpiv_var->fn_last[0], (gchar *) cdate, (gchar *) cbuf, NULL)); - } else if (gpiv_var.fname_time) { - fname_base = g_strdup(g_strconcat(gpiv_var.fn_last[0], + } else if (gpiv_var->fname_time) { + fname_base = g_strdup(g_strconcat(gpiv_var->fn_last[0], (gchar *) ctime, (gchar *) cbuf, NULL)); } else { - fname_base = g_strdup(g_strconcat(gpiv_var.fn_last[0], + fname_base = g_strdup(g_strconcat(gpiv_var->fn_last[0], (gchar *) cbuf, NULL)); } - load_dac_buffer(gpiv, &cam_var, FALSE, fname_base, ibuf, frameA, frameB, + load_dac_buffer(gpiv, cam_var, FALSE, fname_base, ibuf, frameA, frameB, INSERT); nbufs++; @@ -1245,14 +1245,14 @@ renew_buffer(GpivConsole *gpiv, display_act = display[ibuf]; recreate_img(display_act, frameA, frameB); - if (display_act->display_img1) { + if (display_act->img->exist_img) { show_img1(display_act); } else { hide_img1(display_act); } - if (gl_image_par.x_corr) { - if (display_act->display_img2) { + if (gl_image_par->x_corr) { + if (display_act->img->exist_img) { show_img2(display_act); } else { hide_img2(display_act); @@ -1286,36 +1286,36 @@ recreate_img(Display * disp, gint depth = 8; assert (disp != NULL); - assert (disp->img.img1 != NULL); - assert (disp->img.rgbbuf_img1 != NULL); - if (disp->img.image_par.x_corr) { - assert (disp->img.img2 != NULL); - assert (disp->img.rgbbuf_img2 != NULL); + //assert (disp->img->img1 != NULL); + assert (disp->img->rgbbuf_img1 != NULL); + if (disp->img->image->header->x_corr) { + // assert (disp->img->img2 != NULL); + assert (disp->img->rgbbuf_img2 != NULL); } - assert (disp->img.exist_img); + assert (disp->img->exist_img); - fact = fact << (disp->img.image_par.depth - depth); - disp->img.rgb_img_width = disp->img.image_par.ncolumns * 3; - while ((disp->img.rgb_img_width) % 4 != 0) { - disp->img.rgb_img_width++; + fact = fact << (disp->img->image->header->depth - depth); + disp->img->rgb_img_width = disp->img->image->header->ncolumns * 3; + while ((disp->img->rgb_img_width) % 4 != 0) { + disp->img->rgb_img_width++; } - pixbuf1 = gdk_pixbuf_new_from_data(disp->img.rgbbuf_img1, + pixbuf1 = gdk_pixbuf_new_from_data(disp->img->rgbbuf_img1, GDK_COLORSPACE_RGB, FALSE, /* gboolean has_alpha */ - disp->img.image_par.depth, - disp->img.image_par.ncolumns, - disp->img.image_par.nrows, - disp->img.rgb_img_width, /* rowstride */ + disp->img->image->header->depth, + disp->img->image->header->ncolumns, + disp->img->image->header->nrows, + disp->img->rgb_img_width, /* rowstride */ NULL, NULL); - pos1 = disp->img.rgbbuf_img1; - for (i = 0; i < disp->img.image_par.nrows; i++) { - for (j = 0; j < disp->img.image_par.ncolumns; j++) { + pos1 = disp->img->rgbbuf_img1; + for (i = 0; i < disp->img->image->header->nrows; i++) { + for (j = 0; j < disp->img->image->header->ncolumns; j++) { *pos1++ = (guchar) (frameA[i][j] / fact); *pos1++ = (guchar) (frameA[i][j] / fact); *pos1++ = (guchar) (frameA[i][j] / fact); @@ -1323,11 +1323,11 @@ recreate_img(Display * disp, } - gnome_canvas_item_set(GNOME_CANVAS_ITEM (disp->img.gci_img1), + gnome_canvas_item_set(GNOME_CANVAS_ITEM (disp->img->gci_img1), "pixbuf", pixbuf1, NULL); -/* gnome_canvas_item_raise_to_top (GNOME_CANVAS_ITEM (disp->img.gci_img1)); */ -/* gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (disp->img.gci_img1)); */ +/* gnome_canvas_item_raise_to_top (GNOME_CANVAS_ITEM (disp->img->gci_img1)); */ +/* gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (disp->img->gci_img1)); */ /* gtk_widget_pop_visual(); */ /* gtk_widget_pop_colormap(); */ @@ -1337,27 +1337,27 @@ recreate_img(Display * disp, -/* if(image_par.x_corr) { */ +/* if(image->header->x_corr) { */ /* pos2 = NULL; */ -/* disp->img.rgbbuf_img2 = g_malloc(disp->img.rgb_img_width * 3 * */ -/* gpiv_par.img_height); */ +/* disp->img->rgbbuf_img2 = g_malloc(disp->img->rgb_img_width * 3 * */ +/* gpiv_par->img_height); */ -/* pixbuf2 = gdk_pixbuf_new_from_data(disp->img.rgbbuf_img2, */ +/* pixbuf2 = gdk_pixbuf_new_from_data(disp->img->rgbbuf_img2, */ /* GDK_COLORSPACE_RGB, */ /* FALSE, */ /* depth, */ -/* gpiv_par.img_width, */ -/* gpiv_par.img_height, */ -/* disp->img.rgb_img_width, */ +/* gpiv_par->img_width, */ +/* gpiv_par->img_height, */ +/* disp->img->rgb_img_width, */ /* NULL, */ /* NULL); */ -/* if (disp->img.gci_img2 != NULL) { */ +/* if (disp->img->gci_img2 != NULL) { */ /* destroy_img(disp); */ /* } */ -/* disp->img.gci_img2 = */ +/* disp->img->gci_img2 = */ /* gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS */ /* (disp->canvas)), */ /* gnome_canvas_pixbuf_get_type (), */ @@ -1365,9 +1365,9 @@ recreate_img(Display * disp, /* NULL); */ -/* pos2 = disp->img.rgbbuf_img2; */ -/* for (i = 0; i < gpiv_par.img_height; i++) { */ -/* for (j = 0; j < gpiv_par.img_width; j++) { */ +/* pos2 = disp->img->rgbbuf_img2; */ +/* for (i = 0; i < gpiv_par->img_height; i++) { */ +/* for (j = 0; j < gpiv_par->img_width; j++) { */ /* *pos2++ = (guchar) (frameB[i][j] / fact); */ /* *pos2++ = (guchar) (frameB[i][j] / fact); */ /* *pos2++ = (guchar) (frameB[i][j] / fact); */ @@ -1377,7 +1377,7 @@ recreate_img(Display * disp, /* gdk_pixbuf_unref (pixbuf2); */ /* } else { */ - disp->img.gci_img2 = disp->img.gci_img2; + disp->img->gci_img2 = disp->img->gci_img2; /* } */ } diff --git a/src/dac_interface.c b/src/dac_interface.c index d5dd151..dc31b6e 100644 --- a/src/dac_interface.c +++ b/src/dac_interface.c @@ -98,7 +98,7 @@ create_camera_menu(GnomeApp *main_window, gtk_container_add(GTK_CONTAINER (cam->vbox_cam), cam->camera_select); - if (cam_var.numCameras >= 1) { + if (cam_var->numCameras >= 1) { gtk_widget_set_sensitive (cam->camera_select, TRUE); } else { gtk_widget_set_sensitive (cam->camera_select, FALSE ); @@ -107,14 +107,14 @@ create_camera_menu(GnomeApp *main_window, cam->camera_select_menu = gtk_menu_new (); - if (cam_var.numCameras > 0) { - for (i = 0; i < cam_var.numCameras; i++) { + if (cam_var->numCameras > 0) { + for (i = 0; i < cam_var->numCameras; i++) { g_snprintf(tmp, GPIV_MAX_CHARS, "Node %d: %s %s", - cam_var.camera[i].id, - cam_var.camera[i].vendor, - cam_var.camera[i].model); + cam_var->camera[i].id, + cam_var->camera[i].vendor, + cam_var->camera[i].model); cam->menu_item = gtk_menu_item_new_with_label (_(tmp)); gtk_widget_show (cam->menu_item); gtk_menu_append (GTK_MENU (cam->camera_select_menu), @@ -128,10 +128,10 @@ create_camera_menu(GnomeApp *main_window, /* * BUGFIX apply last camera to img_par.source */ - g_snprintf(gl_image_par.source, GPIV_MAX_CHARS, "%s %s", - cam_var.camera[i].vendor, - cam_var.camera[i].model); - gl_image_par.source__set = TRUE; + g_snprintf(gl_image_par->source, GPIV_MAX_CHARS, "%s %s", + cam_var->camera[i].vendor, + cam_var->camera[i].model); + gl_image_par->source__set = TRUE; } } else { g_snprintf(tmp, @@ -144,8 +144,8 @@ create_camera_menu(GnomeApp *main_window, gtk_option_menu_set_menu (GTK_OPTION_MENU (cam->camera_select), cam->camera_select_menu); - g_snprintf(gl_image_par.source, GPIV_MAX_CHARS, "No camera"); - gl_image_par.source__set = TRUE; + g_snprintf(gl_image_par->source, GPIV_MAX_CHARS, "No camera"); + gl_image_par->source__set = TRUE; } @@ -176,12 +176,12 @@ create_format_menu(GnomeApp *main_window, char tmp[GPIV_MAX_CHARS]; quadlet_t modes, formats; - if (cam_var.numCameras > 0) { - dc1394_query_supported_formats(cam_var.camera[0].handle, - cam_var.camera[0].id, + if (cam_var->numCameras > 0) { + dc1394_query_supported_formats(cam_var->camera[0].handle, + cam_var->camera[0].id, &formats); - dc1394_query_supported_modes(cam_var.camera[0].handle, - cam_var.camera[0].id, + dc1394_query_supported_modes(cam_var->camera[0].handle, + cam_var->camera[0].id, FORMAT_VGA_NONCOMPRESSED, &modes); } @@ -204,7 +204,7 @@ create_format_menu(GnomeApp *main_window, cam->format_menu_menu = gtk_menu_new (); - if (cam_var.numCameras > 0) { + if (cam_var->numCameras > 0) { /* * Format 0 */ @@ -370,14 +370,14 @@ create_fps_menu(GnomeApp *main_window, gchar tmp[GPIV_MAX_CHARS]; quadlet_t value; - if (cam_var.numCameras > 0) { - if (cam_var.misc_info[0].format == FORMAT_SCALABLE_IMAGE_SIZE) { + if (cam_var->numCameras > 0) { + if (cam_var->misc_info[0].format == FORMAT_SCALABLE_IMAGE_SIZE) { value = 0; /* format 7 has no fixed framerates */ } else { - err=dc1394_query_supported_framerates(cam_var.camera[0].handle, - cam_var.camera[0].id, - cam_var.misc_info[0].format, - cam_var.misc_info[0].mode, + err=dc1394_query_supported_framerates(cam_var->camera[0].handle, + cam_var->camera[0].id, + cam_var->misc_info[0].format, + cam_var->misc_info[0].mode, &value); if (!err) g_warning("Could not query supported framerates"); } @@ -403,7 +403,7 @@ create_fps_menu(GnomeApp *main_window, cam->fps_menu_menu = gtk_menu_new (); - if (cam_var.numCameras > 0) { + if (cam_var->numCameras > 0) { k = 0; for (f=FRAMERATE_MIN, i=0; f <= FRAMERATE_MAX; i++, f++) { /* @@ -432,26 +432,26 @@ create_fps_menu(GnomeApp *main_window, gtk_option_menu_set_menu (GTK_OPTION_MENU (cam->fps_menu), cam->fps_menu_menu); - if (index[cam_var.misc_info[0].framerate-FRAMERATE_MIN] < 0 ) { + if (index[cam_var->misc_info[0].framerate-FRAMERATE_MIN] < 0 ) { // previously selected framerate unsupported!! // automatically switch to nearest fps available for (i = 1; i <= ((NUM_FRAMERATES>>1) +1); i++) { // search radius is num_framerates/2 +1 for safe rounding - if (((cam_var.misc_info[0].framerate-FRAMERATE_MIN-i)>=0) && cont) { - if (index[cam_var.misc_info[0].framerate - FRAMERATE_MIN-i] + if (((cam_var->misc_info[0].framerate-FRAMERATE_MIN-i)>=0) && cont) { + if (index[cam_var->misc_info[0].framerate - FRAMERATE_MIN-i] >= 0) { // try down - new_framerate=cam_var.misc_info[0].framerate - i; + new_framerate=cam_var->misc_info[0].framerate - i; cont=DC1394_FALSE; } } - if (((cam_var.misc_info[0].framerate - FRAMERATE_MIN + i) + if (((cam_var->misc_info[0].framerate - FRAMERATE_MIN + i) < NUM_FRAMERATES) && cont) { - if (index[cam_var.misc_info[0].framerate - FRAMERATE_MIN + i] + if (index[cam_var->misc_info[0].framerate - FRAMERATE_MIN + i] >=0) { // try up - new_framerate=cam_var.misc_info[0].framerate + i; + new_framerate=cam_var->misc_info[0].framerate + i; cont=DC1394_FALSE; } } @@ -460,15 +460,15 @@ create_fps_menu(GnomeApp *main_window, "create_fps_menu: Invalid framerate. Updating to nearest: %s\n", fps_label_list[new_framerate-FRAMERATE_MIN]); warning_gpiv(tmp); - err = dc1394_set_video_framerate(cam_var.camera[0].handle, - cam_var.camera[0].id, + err = dc1394_set_video_framerate(cam_var->camera[0].handle, + cam_var->camera[0].id, new_framerate); if (!err) warning_gpiv("create_fps_menu: Cannot set video framerate"); - cam_var.misc_info[0].framerate = new_framerate; + cam_var->misc_info[0].framerate = new_framerate; } gtk_option_menu_set_history (GTK_OPTION_MENU (cam->fps_menu), - index[cam_var.misc_info[0].framerate - + index[cam_var->misc_info[0].framerate - FRAMERATE_MIN]); } @@ -492,9 +492,9 @@ create_trigger_mode(GnomeApp *main_window, gint index[NUM_TRIGGER_MODE]; - if (cam_var.numCameras > 0) { - err = dc1394_query_feature_characteristics(cam_var.camera[0].handle, - cam_var.camera[0].id, + if (cam_var->numCameras > 0) { + err = dc1394_query_feature_characteristics(cam_var->camera[0].handle, + cam_var->camera[0].id, FEATURE_TRIGGER, &value); if (!err) g_warning("Could not query trigger feature characteristics"); @@ -522,7 +522,7 @@ create_trigger_mode(GnomeApp *main_window, cam->trigger_mode_menu = gtk_menu_new (); - if (cam_var.numCameras > 0) { + if (cam_var->numCameras > 0) { if (modes) { /* * at least one mode present @@ -552,7 +552,7 @@ create_trigger_mode(GnomeApp *main_window, * sets the active menu item: */ gtk_option_menu_set_history (GTK_OPTION_MENU (cam->trigger_mode), - index[cam_var.feature_set[0].feature + index[cam_var->feature_set[0].feature [FEATURE_TRIGGER - FEATURE_MIN] .trigger_mode]); } @@ -592,14 +592,14 @@ create_camera_feature_menu_scale(GnomeApp *main_window, - if (cam_var.numCameras > 0 - && cam_var.feature_set[0].feature[FEATURE - FEATURE_MIN]. + if (cam_var->numCameras > 0 + && cam_var->feature_set[0].feature[FEATURE - FEATURE_MIN]. readout_capable) { adj_scale = gtk_adjustment_new(0, - cam_var.feature_set[0]. + cam_var->feature_set[0]. feature[FEATURE - FEATURE_MIN].min, - cam_var.feature_set[0]. + cam_var->feature_set[0]. feature[FEATURE - FEATURE_MIN].max, 1, 10, @@ -626,15 +626,15 @@ create_camera_feature_menu_scale(GnomeApp *main_window, gtk_scale_set_digits (GTK_SCALE (scale), 0); - if (cam_var.numCameras > 0) { - if (cam_var.feature_set[0].feature[FEATURE - FEATURE_MIN]. + if (cam_var->numCameras > 0) { + if (cam_var->feature_set[0].feature[FEATURE - FEATURE_MIN]. readout_capable) { gtk_adjustment_set_value(GTK_ADJUSTMENT (adj_scale), - cam_var.feature_set[0]. + cam_var->feature_set[0]. feature[FEATURE - FEATURE_MIN].value); } - if (cam_var.feature_set[0].feature[FEATURE - FEATURE_MIN]. + if (cam_var->feature_set[0].feature[FEATURE - FEATURE_MIN]. manual_capable) { /* * set glider active and connect @@ -664,8 +664,8 @@ create_camera_feature_menu_scale(GnomeApp *main_window, option_menu = gtk_menu_new (); - if (cam_var.numCameras > 0) { - if (cam_var.feature_set[0].feature[FEATURE - FEATURE_MIN]. + if (cam_var->numCameras > 0) { + if (cam_var->feature_set[0].feature[FEATURE - FEATURE_MIN]. manual_capable) { /* * add menu man @@ -689,7 +689,7 @@ create_camera_feature_menu_scale(GnomeApp *main_window, (int*) FEATURE); } - if (cam_var.feature_set[0].feature[FEATURE - FEATURE_MIN]. + if (cam_var->feature_set[0].feature[FEATURE - FEATURE_MIN]. auto_capable) { /* * add menu auto @@ -713,8 +713,8 @@ create_camera_feature_menu_scale(GnomeApp *main_window, /* * add menu non avail. */ - if (!cam_var.feature_set[0].feature[FEATURE - FEATURE_MIN].auto_capable - && !cam_var.feature_set[0].feature[FEATURE - FEATURE_MIN]. + if (!cam_var->feature_set[0].feature[FEATURE - FEATURE_MIN].auto_capable + && !cam_var->feature_set[0].feature[FEATURE - FEATURE_MIN]. manual_capable ) { gtk_widget_set_sensitive (option, @@ -983,8 +983,8 @@ create_dac (GnomeApp *main_window, /* dac->combo_fname_items = g_list_append (dac->combo_fname_items, */ /* (gpointer) dac_par.fname); */ - for (i = 0; i < gpiv_var.number_fnames_last; i++) { - fname_last_base = g_strdup(g_basename(gpiv_var.fn_last[i])); + for (i = 0; i < gpiv_var->number_fnames_last; i++) { + fname_last_base = g_strdup(g_basename(gpiv_var->fn_last[i])); strtok(fname_last_base, "."); dac->combo_fname_items = g_list_append (dac->combo_fname_items, (gpointer) g_basename @@ -1061,7 +1061,7 @@ create_dac (GnomeApp *main_window, NULL); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON (dac->checkbutton_fname_date), - gpiv_var.fname_date); + gpiv_var->fname_date); @@ -1106,7 +1106,7 @@ create_dac (GnomeApp *main_window, NULL); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON (dac->checkbutton_fname_time), - gpiv_var.fname_time); + gpiv_var->fname_time); @@ -1614,7 +1614,7 @@ create_dac (GnomeApp *main_window, #ifdef ENABLE_CAM dac->trig->spinbutton_adj_trigger_nf = - gtk_adjustment_new(gl_cam_par.cycles, + gtk_adjustment_new(gl_cam_par->cycles, GPIV_CAMPAR_CYCLES_MIN, MAX_BUFS, /* GPIV_CAMPAR_CYCLES_MAX */ ADJ_ISTEP, @@ -2237,7 +2237,7 @@ create_dac (GnomeApp *main_window, * Setting initial values */ #ifdef ENABLE_CAM - if (gl_cam_par.mode == GPIV_CAM_MODE__PERIODIC) { + if (gl_cam_par->mode == GPIV_CAM_MODE__PERIODIC) { gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON (dac->trig->radiobutton_mouse_1), TRUE); @@ -2247,7 +2247,7 @@ create_dac (GnomeApp *main_window, FALSE); } - if (gl_cam_par.mode == GPIV_CAM_MODE__DURATION) { + if (gl_cam_par->mode == GPIV_CAM_MODE__DURATION) { gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON (dac->trig->radiobutton_mouse_2), TRUE); -- 2.11.4.GIT