Imported Upstream version 1.11.1.1
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Mon, 25 Apr 2011 23:00:12 +0000 (02:00 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Mon, 25 Apr 2011 23:00:12 +0000 (02:00 +0300)
42 files changed:
CMakeLists.txt
ChangeLog.txt
Makefile.in
TODO
autom4te.cache/output.0
autom4te.cache/output.1
autom4te.cache/traces.0
autom4te.cache/traces.1
configure
configure.ac
examples/Makefile.in
examples/full_test.cpp
include/Makefile.in
include/mgl/config.h.in
include/mgl/mgl.h
include/mgl/mgl_ab.h
include/mgl/mgl_data.h
include/mgl/mgl_define.h
include/mgl/mgl_idtf.h
lang/Makefile.in
mathgl-all.workspace
mgl/CMakeLists.txt
mgl/Makefile.am
mgl/Makefile.in
mgl/mgl_ab.cpp
mgl/mgl_crust.cpp
mgl/mgl_data_io.cpp
mgl/mgl_eval.cpp
mgl/mgl_exec.cpp
mgl/mgl_export.cpp
mgl/mgl_font.cpp
mgl/mgl_idtf.cpp
mgl/mgl_main.cpp
mgl/mgl_pde.cpp
mgl/mgl_zb.cpp
mgl/mgl_zb2.cpp
texinfo/Makefile.in
texinfo/example_en.texi
texinfo/example_ru.texi
texinfo/png/Makefile.in
utils/Makefile.in
widgets/Makefile.in

index 8a6141c575fafe0a51e752b1cae5f034f54689c9..2eef65b42ddb104415560accdb91052574987b31 100644 (file)
@@ -8,6 +8,8 @@ option(enable-langall "Enable all language interfaces")
 option(enable-pthread "Enable POSIX threads support")
 option(enable-gsl "Enable gsl support")
 option(enable-jpeg "Enable jpeg support")
+option(enable-u3d "Enable u3d support")
+option(enable-pdf "Enable pdf support")
 option(enable-gif "Enable gif support")
 option(enable-hdf4 "Enable hdf4 support")
 option(enable-hdf5 "Enable hdf5 support")
@@ -31,6 +33,12 @@ endif(enable-all OR enable-pthread)
 if(enable-all OR enable-jpeg)
     set(use_jpeg 1)
 endif(enable-all OR enable-jpeg)
+if(enable-all OR enable-u3d OR enable-pdf)
+    set(use_u3d 1)
+endif(enable-all OR enable-u3d OR enable-pdf)
+if(enable-all OR enable-pdf)
+    set(use_pdf 1)
+endif(enable-all OR enable-pdf)
 if(enable-all OR enable-gif)
     set(use_gif 1)
 endif(enable-all OR enable-gif)
@@ -96,6 +104,32 @@ if(NOT CMAKE_USE_PTHREADS_INIT)
        endif(use_pthread)
 endif(NOT CMAKE_USE_PTHREADS_INIT)
 
+if(use_u3d)
+       find_library(U3D_LIB IDTF)
+       if(NOT U3D_LIB)
+               message(STATUS "Couldn't find U3D libraries.")
+       endif(NOT U3D_LIB)
+       find_path(U3D_INCLUDE_DIR u3d/SceneConverterLib.h)
+       if(NOT U3D_INCLUDE_DIR)
+               message(STATUS "Couldn't find U3D headers.")
+       endif(NOT U3D_INCLUDE_DIR)
+       message(STATUS "Found U3D libraries at: ${U3D_LIB}")
+       message(STATUS "Found U3D headers: ${U3D_INCLUDE_DIR}")
+endif(use_u3d)
+
+if(use_pdf)
+       find_library(HPDF_LIB hpdf)
+       if(NOT HPDF_LIB)
+               message(STATUS "Couldn't find libHaru.")
+       endif(NOT HPDF_LIB)
+       find_path(HPDF_INCLUDE_DIR hpdf_u3d.h)
+       if(NOT HPDF_INCLUDE_DIR)
+               message(STATUS "Couldn't find headers of u3d-enabled version of libHaru.")
+       endif(NOT HPDF_INCLUDE_DIR)
+       message(STATUS "Found libHaru library at: ${HPDF_LIB}")
+       message(STATUS "Found libHaru headers: ${HPDF_INCLUDE_DIR}")
+endif(use_pdf)
+
 include(FindJPEG)
 if(NOT JPEG_FOUND)
        if(use_jpeg)
index a4ae6e16b0c654370b9eaec5fcff8eeaf1815362..5cbe2fa5287b6c595c51a8eeeccc0a7b642d23a9 100644 (file)
@@ -1,3 +1,7 @@
+1.11.1 Released 18 March 2011
+       - Improve IDTF export
+       - Minor changes and bugfixes
+
 1.11.0.1 Released 15 November 2010
        - Bugfix for reading textual data files (mostly under win32).
        - Docs update.
index 9aec9a41d99d57d58170b144044b784e58176f21..8628c1b782f4e9e2e60ad7f5972bf16fa590ed52 100644 (file)
@@ -220,6 +220,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TMPDIR = @TMPDIR@
+U3D_LIBS = @U3D_LIBS@
 UIC = @UIC@
 VERSION = @VERSION@
 WX_FLAGS = @WX_FLAGS@
diff --git a/TODO b/TODO
index c41c6e36f5d78a4ab30b4e9a2b18e828601ed0c6..b599d10f6ec4f1fb45420abbcd91613c420da9fb 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,12 +4,23 @@
 1. Colorbar: print more digits for manual arrays ... but avoid overlapping ???
 2. Miss MAJOR labels or decrease its fontsize if labels too close.
        Also check that enough digits is printed to distingush the labels
-       Also allow "time"-labels
+       Also allow "time"-labels -- like "%d/%m/%Y %H:%M:%S"
        Also allow rotate labels if they too dense
 3. Legend in OpenGL mode
 4. Add plot Circle() as Error() but with marks instead of error boxes (default 'o') + alpha-transpared if filled
 5. Export to LaTeX formats - (pgf/tikz) or metapost if possible (like EPS).
 6. Use '~' for old style textual arguments!!!
+7. Pipes in mgl2png, mgl2eps, ... (stdin, stdout)
+8. Multithreading
+9. Number of proc from get_nprocs_conf() (#include <sys/sysinfo.h>)
+10.Arbitrary line/curve coordinates if z=nan
+11.Add apperture for light (partially is done)
+12.Add diffusive light (no dependence of normale but have direction)
+13. утилиты (mgl2png и пр.) вылетают, если в коментариях русские буквы
+14. Last ' isn't send as call argument!!!
+15. MGL docs -- text what formulas are applicable for scalars too.
+16. Manual labels in string with '\n' separator
+17. Venn() diagram-like -- transparent circles with manual colors and sizes -- may be a variant of Mark()???
 
 11. Update STIX fonts (new release) + create PWT fonts
 12. Problem with \calB and so on (\calH, ...) -- they are present only in italic font :(.
@@ -25,7 +36,7 @@
 29. Multithreading by "subplots" -- for parser first of all !!!
 
 30. Sample about pthread using.
-
+31. Add help about cmake and GIF/JPEG to the "Installation and using"
 32. Regroup pictures in WWW by big classes + combo plots
 
 =========================
index 26594ebedc997a1df566cbb0aaf7d28e5d76ec7b..829e3b36f1a177eab17a7e8dfc68dd9a12363e86 100644 (file)
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.67 for mathgl 1.10.
+@%:@ Generated by GNU Autoconf 2.67 for mathgl 1.11.
 @%:@
 @%:@ Report bugs to <mathgl.abalakin@gmail.com>.
 @%:@ 
@@ -761,8 +761,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mathgl'
 PACKAGE_TARNAME='mathgl'
-PACKAGE_VERSION='1.10'
-PACKAGE_STRING='mathgl 1.10'
+PACKAGE_VERSION='1.11'
+PACKAGE_STRING='mathgl 1.11'
 PACKAGE_BUGREPORT='mathgl.abalakin@gmail.com'
 PACKAGE_URL=''
 
@@ -856,6 +856,11 @@ USE_FLTK_FALSE
 USE_FLTK_TRUE
 FLTK_LIBS
 FLTK_FLAGS
+USE_U3D_FALSE
+USE_U3D_TRUE
+U3D_LIBS
+USE_PDF_FALSE
+USE_PDF_TRUE
 USE_JPEG_FALSE
 USE_JPEG_TRUE
 JPEG_LIBS
@@ -1025,6 +1030,8 @@ enable_hdf5_18
 enable_hdf4
 enable_gif
 enable_jpeg
+enable_u3d
+enable_pdf
 enable_fltk
 enable_wx
 enable_qt
@@ -1590,7 +1597,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mathgl 1.10 to adapt to many kinds of systems.
+\`configure' configures mathgl 1.11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1660,7 +1667,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mathgl 1.10:";;
+     short | recursive ) echo "Configuration of mathgl 1.11:";;
    esac
   cat <<\_ACEOF
 
@@ -1686,6 +1693,8 @@ Optional Features:
   --enable-hdf4    Turn on hdf4
   --enable-gif    Turn on gif
   --enable-jpeg    Turn on jpeg
+  --enable-u3d    Turn on u3d functions
+  --enable-pdf    Turn on u3d and pdf functions
   --enable-fltk    Turn on fltk
   --enable-wx    Turn on wxWidget
   --enable-qt    Turn on Qt
@@ -1782,7 +1791,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mathgl configure 1.10
+mathgl configure 1.11
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2178,12 +2187,12 @@ fi
 
 } @%:@ ac_fn_cxx_try_link
 
-@%:@ ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-@%:@ -------------------------------------------------------
+@%:@ ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
+@%:@ ---------------------------------------------------------
 @%:@ Tests whether HEADER exists, giving a warning if it cannot be compiled using
 @%:@ the include files in INCLUDES and setting the cache variable VAR
 @%:@ accordingly.
-ac_fn_c_check_header_mongrel ()
+ac_fn_cxx_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   if eval "test \"\${$3+set}\"" = set; then :
@@ -2204,7 +2213,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 $4
 @%:@include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_header_compiler=yes
 else
   ac_header_compiler=no
@@ -2220,7 +2229,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 @%:@include <$2>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   ac_header_preproc=yes
 else
   ac_header_preproc=no
@@ -2230,7 +2239,7 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 $as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
   yes:no: )
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
 $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
@@ -2267,12 +2276,12 @@ $as_echo "$ac_res" >&6; }
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
-} @%:@ ac_fn_c_check_header_mongrel
+} @%:@ ac_fn_cxx_check_header_mongrel
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mathgl $as_me 1.10, which was
+It was created by mathgl $as_me 1.11, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2621,7 +2630,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-MGL_RELEASE=1.10
+MGL_RELEASE=1.11
 
 
 
@@ -2657,6 +2666,12 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 ac_config_headers="$ac_config_headers include/mgl/config.h"
 
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
 
 #MGL_RELEASE=1.4
 #AC_SUBST(MGL_RELEASE)
@@ -3110,7 +3125,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mathgl'
- VERSION='1.10'
+ VERSION='1.11'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3935,11 +3950,11 @@ if test "x$ac_cv_prog_cc_c89" != xno; then :
   
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -4381,11 +4396,11 @@ else
     CXXFLAGS=
   fi
 fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 depcc="$CXX"  am_compiler_list=
 
@@ -7992,11 +8007,11 @@ else
     CXXFLAGS=
   fi
 fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 depcc="$CXX"  am_compiler_list=
 
@@ -8254,11 +8269,11 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 _lt_caught_CXX_error=yes; }
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 else
   _lt_caught_CXX_error=yes
@@ -11942,11 +11957,11 @@ $as_echo "$enable_static" >&6; }
 
 
 fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 CC="$lt_save_CC"
 
   lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
 fi # test "$_lt_caught_CXX_error" != yes
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 
@@ -14875,7 +14890,8 @@ else
   pthread=true
 fi
 
-ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+
+ac_fn_cxx_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
 if test "x$ac_cv_header_pthread_h" = x""yes; then :
   (test x$all = xtrue || test x$pthread = xtrue) && PTHREAD_FLAGS=-DHAVE_PTHREAD 
 else
@@ -14903,7 +14919,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_pthread_main=yes
 else
   ac_cv_lib_pthread_main=no
@@ -15061,7 +15077,7 @@ case "${host}" in
 
   *w32*)
        GL_LIBS=opengl32
-       ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
+       ac_fn_cxx_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
 if test "x$ac_cv_header_GL_gl_h" = x""yes; then :
   
 else
@@ -15089,7 +15105,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
   eval "$as_ac_Lib=no"
@@ -15108,7 +15124,7 @@ else
 fi
 
        GLUT_LIBS=glut32
-       ac_fn_c_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default"
+       ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default"
 if test "x$ac_cv_header_GL_glut_h" = x""yes; then :
   (test x$all = xtrue || test x$glut = xtrue) && GLUT_FLAGS=-DHAVE_GLUT 
 else
@@ -15136,7 +15152,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
   eval "$as_ac_Lib=no"
@@ -15158,7 +15174,7 @@ fi
 
        *)
        GL_LIBS=GL
-       ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
+       ac_fn_cxx_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
 if test "x$ac_cv_header_GL_gl_h" = x""yes; then :
   
 else
@@ -15186,7 +15202,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
   eval "$as_ac_Lib=no"
@@ -15205,7 +15221,7 @@ else
 fi
 
        GLUT_LIBS=glut
-       ac_fn_c_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default"
+       ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default"
 if test "x$ac_cv_header_GL_glut_h" = x""yes; then :
   (test x$all = xtrue || test x$glut = xtrue) && GLUT_FLAGS=-DHAVE_GLUT 
 else
@@ -15233,7 +15249,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
   eval "$as_ac_Lib=no"
@@ -15295,7 +15311,7 @@ else
 fi
 
 #AC_CHECK_HEADER(hdf5.h,[(test x$all = xtrue || test x$hdf5 = xtrue || test x$hdf5_18 = xtrue) && HDF5_FLAGS=-DHAVE_HDF5 AC_SUBST(HDF5_FLAGS)],
-ac_fn_c_check_header_mongrel "$LINENO" "hdf5.h" "ac_cv_header_hdf5_h" "$ac_includes_default"
+ac_fn_cxx_check_header_mongrel "$LINENO" "hdf5.h" "ac_cv_header_hdf5_h" "$ac_includes_default"
 if test "x$ac_cv_header_hdf5_h" = x""yes; then :
   (test x$all = xtrue || test x$hdf5 = xtrue || test x$hdf5_18 = xtrue) && HDF5_FLAGS=-DHAVE_HDF5 
 else
@@ -15326,7 +15342,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_hdf5_main=yes
 else
   ac_cv_lib_hdf5_main=no
@@ -15364,7 +15380,7 @@ else
   hdf4=false
 fi
 
-ac_fn_c_check_header_mongrel "$LINENO" "hdf/mfhdf.h" "ac_cv_header_hdf_mfhdf_h" "$ac_includes_default"
+ac_fn_cxx_check_header_mongrel "$LINENO" "hdf/mfhdf.h" "ac_cv_header_hdf_mfhdf_h" "$ac_includes_default"
 if test "x$ac_cv_header_hdf_mfhdf_h" = x""yes; then :
   (test x$all = xtrue || test x$hdf4 = xtrue) && HDF4_FLAGS=-DHAVE_HDF4 
 else
@@ -15392,7 +15408,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_df_main=yes
 else
   ac_cv_lib_df_main=no
@@ -15429,7 +15445,7 @@ else
   gif=false
 fi
 
-ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
+ac_fn_cxx_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
 if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
   (test x$all = xtrue || test x$gif = xtrue) && GIF_FLAGS=-DHAVE_GIF 
 else
@@ -15457,7 +15473,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_gif_main=yes
 else
   ac_cv_lib_gif_main=no
@@ -15483,7 +15499,7 @@ else
 fi
 
 
-ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
+ac_fn_cxx_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
 if test "x$ac_cv_header_png_h" = x""yes; then :
   
 else
@@ -15511,7 +15527,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_png_main=yes
 else
   ac_cv_lib_png_main=no
@@ -15540,7 +15556,7 @@ else
   jpeg=false
 fi
 
-ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
+ac_fn_cxx_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
 if test "x$ac_cv_header_jpeglib_h" = x""yes; then :
   (test x$all = xtrue || test x$jpeg = xtrue) && JPEG_FLAGS=-DHAVE_JPEG 
 else
@@ -15568,7 +15584,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_jpeg_main=yes
 else
   ac_cv_lib_jpeg_main=no
@@ -15594,6 +15610,179 @@ else
 fi
 
 
+@%:@ Check whether --enable-u3d was given.
+if test "${enable_u3d+set}" = set; then :
+  enableval=$enable_u3d; case "${enableval}" in
+  yes) u3d=true ;;
+  no)  u3d=false ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-u3d" "$LINENO" 5  ;;
+esac
+else
+  u3d=false
+fi
+
+@%:@ Check whether --enable-pdf was given.
+if test "${enable_pdf+set}" = set; then :
+  enableval=$enable_pdf; case "${enableval}" in
+  yes) pdf=true; u3d=true ;;
+  no)  pdf=false ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-pdf" "$LINENO" 5  ;;
+esac
+else
+  pdf=false
+fi
+
+if test "x$pdf" == xtrue; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lhpdf" >&5
+$as_echo_n "checking for main in -lhpdf... " >&6; }
+if test "${ac_cv_lib_hpdf_main+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lhpdf  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_hpdf_main=yes
+else
+  ac_cv_lib_hpdf_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hpdf_main" >&5
+$as_echo "$ac_cv_lib_hpdf_main" >&6; }
+if test "x$ac_cv_lib_hpdf_main" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_LIBHPDF 1
+_ACEOF
+
+  LIBS="-lhpdf $LIBS"
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "--enable-pdf was given, but test for libharu failed
+See \`config.log' for more details" "$LINENO" 5 ; }
+  
+fi
+
+fi
+if test "x$pdf" == xtrue; then :
+  for ac_header in hpdf.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "hpdf.h" "ac_cv_header_hpdf_h" "$ac_includes_default"
+if test "x$ac_cv_header_hpdf_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_HPDF_H 1
+_ACEOF
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "--enable-pdf was given, but test for headers failed
+See \`config.log' for more details" "$LINENO" 5 ; }
+  
+fi
+
+done
+
+fi
+ if test x$pdf = xtrue; then
+  USE_PDF_TRUE=
+  USE_PDF_FALSE='#'
+else
+  USE_PDF_TRUE='#'
+  USE_PDF_FALSE=
+fi
+
+
+if test "x$u3d" == xtrue; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lIDTF" >&5
+$as_echo_n "checking for main in -lIDTF... " >&6; }
+if test "${ac_cv_lib_IDTF_main+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lIDTF -lm -ldl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_IDTF_main=yes
+else
+  ac_cv_lib_IDTF_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_IDTF_main" >&5
+$as_echo "$ac_cv_lib_IDTF_main" >&6; }
+if test "x$ac_cv_lib_IDTF_main" = x""yes; then :
+  U3D_LIBS="-lIDTF -lm -ldl"
+
+  
+$as_echo "@%:@define HAVE_U3D 1" >>confdefs.h
+
+  
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "--enable-u3d was given, but test for libIDTF failed
+See \`config.log' for more details" "$LINENO" 5 ; }
+fi
+
+fi
+if test "x$u3d" == xtrue; then :
+  for ac_header in u3d/SceneConverterLib.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "u3d/SceneConverterLib.h" "ac_cv_header_u3d_SceneConverterLib_h" "$ac_includes_default"
+if test "x$ac_cv_header_u3d_SceneConverterLib_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_U3D_SCENECONVERTERLIB_H 1
+_ACEOF
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "--enable-u3d was given, but test for headers failed
+See \`config.log' for more details" "$LINENO" 5 ; }
+  
+fi
+
+done
+
+fi
+ if test x$u3d = xtrue; then
+  USE_U3D_TRUE=
+  USE_U3D_FALSE='#'
+else
+  USE_U3D_TRUE='#'
+  USE_U3D_FALSE=
+fi
+
+
 @%:@ Check whether --enable-fltk was given.
 if test "${enable_fltk+set}" = set; then :
   enableval=$enable_fltk; case "${enableval}" in
@@ -16978,7 +17167,7 @@ else
 fi
 
 
-AM_CXXFLAGS="-Wall $GSL_FLAGS"
+AM_CXXFLAGS="$AM_CXXFLAGS -Wall $GSL_FLAGS"
 
 
 ac_config_files="$ac_config_files Makefile mgl/Makefile examples/Makefile include/Makefile lang/Makefile utils/Makefile widgets/Makefile"
@@ -17133,6 +17322,14 @@ if test -z "${USE_JPEG_TRUE}" && test -z "${USE_JPEG_FALSE}"; then
   as_fn_error $? "conditional \"USE_JPEG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5 
 fi
+if test -z "${USE_PDF_TRUE}" && test -z "${USE_PDF_FALSE}"; then
+  as_fn_error $? "conditional \"USE_PDF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5 
+fi
+if test -z "${USE_U3D_TRUE}" && test -z "${USE_U3D_FALSE}"; then
+  as_fn_error $? "conditional \"USE_U3D\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5 
+fi
 if test -z "${USE_FLTK_TRUE}" && test -z "${USE_FLTK_FALSE}"; then
   as_fn_error $? "conditional \"USE_FLTK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5 
@@ -17569,7 +17766,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mathgl $as_me 1.10, which was
+This file was extended by mathgl $as_me 1.11, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17635,7 +17832,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-mathgl config.status 1.10
+mathgl config.status 1.11
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
index 1c674bb6f44608f3854d97153463a4c6b083a2d7..5947e16762169556fa9e8f648c1f75775305d38e 100644 (file)
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.67 for mathgl 1.10.
+@%:@ Generated by GNU Autoconf 2.67 for mathgl 1.11.
 @%:@
 @%:@ Report bugs to <mathgl.abalakin@gmail.com>.
 @%:@ 
@@ -761,8 +761,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mathgl'
 PACKAGE_TARNAME='mathgl'
-PACKAGE_VERSION='1.10'
-PACKAGE_STRING='mathgl 1.10'
+PACKAGE_VERSION='1.11'
+PACKAGE_STRING='mathgl 1.11'
 PACKAGE_BUGREPORT='mathgl.abalakin@gmail.com'
 PACKAGE_URL=''
 
@@ -856,6 +856,11 @@ USE_FLTK_FALSE
 USE_FLTK_TRUE
 FLTK_LIBS
 FLTK_FLAGS
+USE_U3D_FALSE
+USE_U3D_TRUE
+U3D_LIBS
+USE_PDF_FALSE
+USE_PDF_TRUE
 USE_JPEG_FALSE
 USE_JPEG_TRUE
 JPEG_LIBS
@@ -1025,6 +1030,8 @@ enable_hdf5_18
 enable_hdf4
 enable_gif
 enable_jpeg
+enable_u3d
+enable_pdf
 enable_fltk
 enable_wx
 enable_qt
@@ -1590,7 +1597,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mathgl 1.10 to adapt to many kinds of systems.
+\`configure' configures mathgl 1.11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1660,7 +1667,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mathgl 1.10:";;
+     short | recursive ) echo "Configuration of mathgl 1.11:";;
    esac
   cat <<\_ACEOF
 
@@ -1686,6 +1693,8 @@ Optional Features:
   --enable-hdf4    Turn on hdf4
   --enable-gif    Turn on gif
   --enable-jpeg    Turn on jpeg
+  --enable-u3d    Turn on u3d functions
+  --enable-pdf    Turn on u3d and pdf functions
   --enable-fltk    Turn on fltk
   --enable-wx    Turn on wxWidget
   --enable-qt    Turn on Qt
@@ -1782,7 +1791,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mathgl configure 1.10
+mathgl configure 1.11
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2178,12 +2187,12 @@ fi
 
 } @%:@ ac_fn_cxx_try_link
 
-@%:@ ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-@%:@ -------------------------------------------------------
+@%:@ ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
+@%:@ ---------------------------------------------------------
 @%:@ Tests whether HEADER exists, giving a warning if it cannot be compiled using
 @%:@ the include files in INCLUDES and setting the cache variable VAR
 @%:@ accordingly.
-ac_fn_c_check_header_mongrel ()
+ac_fn_cxx_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   if eval "test \"\${$3+set}\"" = set; then :
@@ -2204,7 +2213,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 $4
 @%:@include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_header_compiler=yes
 else
   ac_header_compiler=no
@@ -2220,7 +2229,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 @%:@include <$2>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   ac_header_preproc=yes
 else
   ac_header_preproc=no
@@ -2230,7 +2239,7 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 $as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
   yes:no: )
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
 $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
@@ -2267,12 +2276,12 @@ $as_echo "$ac_res" >&6; }
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
-} @%:@ ac_fn_c_check_header_mongrel
+} @%:@ ac_fn_cxx_check_header_mongrel
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mathgl $as_me 1.10, which was
+It was created by mathgl $as_me 1.11, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2621,7 +2630,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-MGL_RELEASE=1.10
+MGL_RELEASE=1.11
 
 
 
@@ -2657,6 +2666,12 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 ac_config_headers="$ac_config_headers include/mgl/config.h"
 
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
 
 #MGL_RELEASE=1.4
 #AC_SUBST(MGL_RELEASE)
@@ -3110,7 +3125,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mathgl'
- VERSION='1.10'
+ VERSION='1.11'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3935,11 +3950,11 @@ if test "x$ac_cv_prog_cc_c89" != xno; then :
   
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -4381,11 +4396,11 @@ else
     CXXFLAGS=
   fi
 fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 depcc="$CXX"  am_compiler_list=
 
@@ -7992,11 +8007,11 @@ else
     CXXFLAGS=
   fi
 fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 depcc="$CXX"  am_compiler_list=
 
@@ -8254,11 +8269,11 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 _lt_caught_CXX_error=yes; }
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 else
   _lt_caught_CXX_error=yes
@@ -11938,11 +11953,11 @@ $as_echo "$enable_static" >&6; }
 
 
 fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 CC="$lt_save_CC"
 
   lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
 fi # test "$_lt_caught_CXX_error" != yes
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 
@@ -14871,7 +14886,8 @@ else
   pthread=true
 fi
 
-ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+
+ac_fn_cxx_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
 if test "x$ac_cv_header_pthread_h" = x""yes; then :
   (test x$all = xtrue || test x$pthread = xtrue) && PTHREAD_FLAGS=-DHAVE_PTHREAD 
 else
@@ -14899,7 +14915,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_pthread_main=yes
 else
   ac_cv_lib_pthread_main=no
@@ -15057,7 +15073,7 @@ case "${host}" in
 
   *w32*)
        GL_LIBS=opengl32
-       ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
+       ac_fn_cxx_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
 if test "x$ac_cv_header_GL_gl_h" = x""yes; then :
   
 else
@@ -15085,7 +15101,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
   eval "$as_ac_Lib=no"
@@ -15104,7 +15120,7 @@ else
 fi
 
        GLUT_LIBS=glut32
-       ac_fn_c_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default"
+       ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default"
 if test "x$ac_cv_header_GL_glut_h" = x""yes; then :
   (test x$all = xtrue || test x$glut = xtrue) && GLUT_FLAGS=-DHAVE_GLUT 
 else
@@ -15132,7 +15148,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
   eval "$as_ac_Lib=no"
@@ -15154,7 +15170,7 @@ fi
 
        *)
        GL_LIBS=GL
-       ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
+       ac_fn_cxx_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
 if test "x$ac_cv_header_GL_gl_h" = x""yes; then :
   
 else
@@ -15182,7 +15198,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
   eval "$as_ac_Lib=no"
@@ -15201,7 +15217,7 @@ else
 fi
 
        GLUT_LIBS=glut
-       ac_fn_c_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default"
+       ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default"
 if test "x$ac_cv_header_GL_glut_h" = x""yes; then :
   (test x$all = xtrue || test x$glut = xtrue) && GLUT_FLAGS=-DHAVE_GLUT 
 else
@@ -15229,7 +15245,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
   eval "$as_ac_Lib=no"
@@ -15291,7 +15307,7 @@ else
 fi
 
 #AC_CHECK_HEADER(hdf5.h,[(test x$all = xtrue || test x$hdf5 = xtrue || test x$hdf5_18 = xtrue) && HDF5_FLAGS=-DHAVE_HDF5 AC_SUBST(HDF5_FLAGS)],
-ac_fn_c_check_header_mongrel "$LINENO" "hdf5.h" "ac_cv_header_hdf5_h" "$ac_includes_default"
+ac_fn_cxx_check_header_mongrel "$LINENO" "hdf5.h" "ac_cv_header_hdf5_h" "$ac_includes_default"
 if test "x$ac_cv_header_hdf5_h" = x""yes; then :
   (test x$all = xtrue || test x$hdf5 = xtrue || test x$hdf5_18 = xtrue) && HDF5_FLAGS=-DHAVE_HDF5 
 else
@@ -15322,7 +15338,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_hdf5_main=yes
 else
   ac_cv_lib_hdf5_main=no
@@ -15360,7 +15376,7 @@ else
   hdf4=false
 fi
 
-ac_fn_c_check_header_mongrel "$LINENO" "hdf/mfhdf.h" "ac_cv_header_hdf_mfhdf_h" "$ac_includes_default"
+ac_fn_cxx_check_header_mongrel "$LINENO" "hdf/mfhdf.h" "ac_cv_header_hdf_mfhdf_h" "$ac_includes_default"
 if test "x$ac_cv_header_hdf_mfhdf_h" = x""yes; then :
   (test x$all = xtrue || test x$hdf4 = xtrue) && HDF4_FLAGS=-DHAVE_HDF4 
 else
@@ -15388,7 +15404,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_df_main=yes
 else
   ac_cv_lib_df_main=no
@@ -15425,7 +15441,7 @@ else
   gif=false
 fi
 
-ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
+ac_fn_cxx_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
 if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
   (test x$all = xtrue || test x$gif = xtrue) && GIF_FLAGS=-DHAVE_GIF 
 else
@@ -15453,7 +15469,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_gif_main=yes
 else
   ac_cv_lib_gif_main=no
@@ -15479,7 +15495,7 @@ else
 fi
 
 
-ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
+ac_fn_cxx_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
 if test "x$ac_cv_header_png_h" = x""yes; then :
   
 else
@@ -15507,7 +15523,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_png_main=yes
 else
   ac_cv_lib_png_main=no
@@ -15536,7 +15552,7 @@ else
   jpeg=false
 fi
 
-ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
+ac_fn_cxx_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
 if test "x$ac_cv_header_jpeglib_h" = x""yes; then :
   (test x$all = xtrue || test x$jpeg = xtrue) && JPEG_FLAGS=-DHAVE_JPEG 
 else
@@ -15564,7 +15580,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_jpeg_main=yes
 else
   ac_cv_lib_jpeg_main=no
@@ -15590,6 +15606,179 @@ else
 fi
 
 
+@%:@ Check whether --enable-u3d was given.
+if test "${enable_u3d+set}" = set; then :
+  enableval=$enable_u3d; case "${enableval}" in
+  yes) u3d=true ;;
+  no)  u3d=false ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-u3d" "$LINENO" 5  ;;
+esac
+else
+  u3d=false
+fi
+
+@%:@ Check whether --enable-pdf was given.
+if test "${enable_pdf+set}" = set; then :
+  enableval=$enable_pdf; case "${enableval}" in
+  yes) pdf=true; u3d=true ;;
+  no)  pdf=false ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-pdf" "$LINENO" 5  ;;
+esac
+else
+  pdf=false
+fi
+
+if test "x$pdf" == xtrue; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lhpdf" >&5
+$as_echo_n "checking for main in -lhpdf... " >&6; }
+if test "${ac_cv_lib_hpdf_main+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lhpdf  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_hpdf_main=yes
+else
+  ac_cv_lib_hpdf_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hpdf_main" >&5
+$as_echo "$ac_cv_lib_hpdf_main" >&6; }
+if test "x$ac_cv_lib_hpdf_main" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_LIBHPDF 1
+_ACEOF
+
+  LIBS="-lhpdf $LIBS"
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "--enable-pdf was given, but test for libharu failed
+See \`config.log' for more details" "$LINENO" 5 ; }
+  
+fi
+
+fi
+if test "x$pdf" == xtrue; then :
+  for ac_header in hpdf.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "hpdf.h" "ac_cv_header_hpdf_h" "$ac_includes_default"
+if test "x$ac_cv_header_hpdf_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_HPDF_H 1
+_ACEOF
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "--enable-pdf was given, but test for headers failed
+See \`config.log' for more details" "$LINENO" 5 ; }
+  
+fi
+
+done
+
+fi
+ if test x$pdf = xtrue; then
+  USE_PDF_TRUE=
+  USE_PDF_FALSE='#'
+else
+  USE_PDF_TRUE='#'
+  USE_PDF_FALSE=
+fi
+
+
+if test "x$u3d" == xtrue; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lIDTF" >&5
+$as_echo_n "checking for main in -lIDTF... " >&6; }
+if test "${ac_cv_lib_IDTF_main+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lIDTF -lm -ldl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_IDTF_main=yes
+else
+  ac_cv_lib_IDTF_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_IDTF_main" >&5
+$as_echo "$ac_cv_lib_IDTF_main" >&6; }
+if test "x$ac_cv_lib_IDTF_main" = x""yes; then :
+  U3D_LIBS="-lIDTF -lm -ldl"
+
+  
+$as_echo "@%:@define HAVE_U3D 1" >>confdefs.h
+
+  
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "--enable-u3d was given, but test for libIDTF failed
+See \`config.log' for more details" "$LINENO" 5 ; }
+fi
+
+fi
+if test "x$u3d" == xtrue; then :
+  for ac_header in u3d/SceneConverterLib.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "u3d/SceneConverterLib.h" "ac_cv_header_u3d_SceneConverterLib_h" "$ac_includes_default"
+if test "x$ac_cv_header_u3d_SceneConverterLib_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_U3D_SCENECONVERTERLIB_H 1
+_ACEOF
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "--enable-u3d was given, but test for headers failed
+See \`config.log' for more details" "$LINENO" 5 ; }
+  
+fi
+
+done
+
+fi
+ if test x$u3d = xtrue; then
+  USE_U3D_TRUE=
+  USE_U3D_FALSE='#'
+else
+  USE_U3D_TRUE='#'
+  USE_U3D_FALSE=
+fi
+
+
 @%:@ Check whether --enable-fltk was given.
 if test "${enable_fltk+set}" = set; then :
   enableval=$enable_fltk; case "${enableval}" in
@@ -16974,7 +17163,7 @@ else
 fi
 
 
-AM_CXXFLAGS="-Wall $GSL_FLAGS"
+AM_CXXFLAGS="$AM_CXXFLAGS -Wall $GSL_FLAGS"
 
 
 ac_config_files="$ac_config_files Makefile mgl/Makefile examples/Makefile include/Makefile lang/Makefile utils/Makefile widgets/Makefile"
@@ -17129,6 +17318,14 @@ if test -z "${USE_JPEG_TRUE}" && test -z "${USE_JPEG_FALSE}"; then
   as_fn_error $? "conditional \"USE_JPEG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5 
 fi
+if test -z "${USE_PDF_TRUE}" && test -z "${USE_PDF_FALSE}"; then
+  as_fn_error $? "conditional \"USE_PDF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5 
+fi
+if test -z "${USE_U3D_TRUE}" && test -z "${USE_U3D_FALSE}"; then
+  as_fn_error $? "conditional \"USE_U3D\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5 
+fi
 if test -z "${USE_FLTK_TRUE}" && test -z "${USE_FLTK_FALSE}"; then
   as_fn_error $? "conditional \"USE_FLTK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5 
@@ -17565,7 +17762,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mathgl $as_me 1.10, which was
+This file was extended by mathgl $as_me 1.11, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17631,7 +17828,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-mathgl config.status 1.10
+mathgl config.status 1.11
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
index 97477af2491988545fa1a521d25f1e3ae1eac4c8..19fb312efbbed44f413363684c6927a2a7568d17 100644 (file)
@@ -2616,64 +2616,64 @@ m4trace:configure.ac:1: -1- m4_pattern_allow([^build_alias$])
 m4trace:configure.ac:1: -1- m4_pattern_allow([^host_alias$])
 m4trace:configure.ac:1: -1- m4_pattern_allow([^target_alias$])
 m4trace:configure.ac:4: -1- m4_pattern_allow([^MGL_RELEASE$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^MGL_CURRENT$])
-m4trace:configure.ac:22: -1- m4_pattern_allow([^MGL_REVISION$])
-m4trace:configure.ac:23: -1- m4_pattern_allow([^MGL_AGE$])
-m4trace:configure.ac:25: -1- AM_INIT_AUTOMAKE
-m4trace:configure.ac:25: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-m4trace:configure.ac:25: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
-m4trace:configure.ac:25: -1- AM_AUTOMAKE_VERSION([1.11.1])
-m4trace:configure.ac:25: -1- _AM_AUTOCONF_VERSION([2.67])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^am__isrc$])
-m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__isrc])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^CYGPATH_W$])
-m4trace:configure.ac:25: -1- _AM_SET_OPTIONS([])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:25: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+m4trace:configure.ac:22: -1- m4_pattern_allow([^MGL_CURRENT$])
+m4trace:configure.ac:23: -1- m4_pattern_allow([^MGL_REVISION$])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^MGL_AGE$])
+m4trace:configure.ac:26: -1- AM_INIT_AUTOMAKE
+m4trace:configure.ac:26: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
+m4trace:configure.ac:26: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
+m4trace:configure.ac:26: -1- AM_AUTOMAKE_VERSION([1.11.1])
+m4trace:configure.ac:26: -1- _AM_AUTOCONF_VERSION([2.67])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^am__isrc$])
+m4trace:configure.ac:26: -1- _AM_SUBST_NOTMAKE([am__isrc])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^CYGPATH_W$])
+m4trace:configure.ac:26: -1- _AM_SET_OPTIONS([])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.ac:26: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
  AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
-m4trace:configure.ac:25: -2- _AM_MANGLE_OPTION([no-define])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:25: -1- AM_SANITY_CHECK
-m4trace:configure.ac:25: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-m4trace:configure.ac:25: -1- AM_MISSING_HAS_RUN
-m4trace:configure.ac:25: -1- AM_AUX_DIR_EXPAND
-m4trace:configure.ac:25: -1- m4_pattern_allow([^ACLOCAL$])
-m4trace:configure.ac:25: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^AUTOCONF$])
-m4trace:configure.ac:25: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^AUTOMAKE$])
-m4trace:configure.ac:25: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^AUTOHEADER$])
-m4trace:configure.ac:25: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^MAKEINFO$])
-m4trace:configure.ac:25: -1- AM_PROG_INSTALL_SH
-m4trace:configure.ac:25: -1- m4_pattern_allow([^install_sh$])
-m4trace:configure.ac:25: -1- AM_PROG_INSTALL_STRIP
-m4trace:configure.ac:25: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
-m4trace:configure.ac:25: -1- AM_PROG_MKDIR_P
-m4trace:configure.ac:25: -1- m4_pattern_allow([^MKDIR_P$])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^mkdir_p$])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^AWK$])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.ac:25: -1- AM_SET_LEADING_DOT
-m4trace:configure.ac:25: -1- m4_pattern_allow([^am__leading_dot$])
-m4trace:configure.ac:25: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+m4trace:configure.ac:26: -2- _AM_MANGLE_OPTION([no-define])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.ac:26: -1- AM_SANITY_CHECK
+m4trace:configure.ac:26: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+m4trace:configure.ac:26: -1- AM_MISSING_HAS_RUN
+m4trace:configure.ac:26: -1- AM_AUX_DIR_EXPAND
+m4trace:configure.ac:26: -1- m4_pattern_allow([^ACLOCAL$])
+m4trace:configure.ac:26: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^AUTOCONF$])
+m4trace:configure.ac:26: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^AUTOMAKE$])
+m4trace:configure.ac:26: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^AUTOHEADER$])
+m4trace:configure.ac:26: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^MAKEINFO$])
+m4trace:configure.ac:26: -1- AM_PROG_INSTALL_SH
+m4trace:configure.ac:26: -1- m4_pattern_allow([^install_sh$])
+m4trace:configure.ac:26: -1- AM_PROG_INSTALL_STRIP
+m4trace:configure.ac:26: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
+m4trace:configure.ac:26: -1- AM_PROG_MKDIR_P
+m4trace:configure.ac:26: -1- m4_pattern_allow([^MKDIR_P$])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^mkdir_p$])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^AWK$])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^SET_MAKE$])
+m4trace:configure.ac:26: -1- AM_SET_LEADING_DOT
+m4trace:configure.ac:26: -1- m4_pattern_allow([^am__leading_dot$])
+m4trace:configure.ac:26: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
                             [_AM_PROG_TAR([v7])])])
-m4trace:configure.ac:25: -2- _AM_MANGLE_OPTION([tar-ustar])
-m4trace:configure.ac:25: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
-m4trace:configure.ac:25: -2- _AM_MANGLE_OPTION([tar-pax])
-m4trace:configure.ac:25: -1- _AM_PROG_TAR([v7])
-m4trace:configure.ac:25: -1- AM_MISSING_PROG([AMTAR], [tar])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^AMTAR$])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^am__tar$])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^am__untar$])
-m4trace:configure.ac:25: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
+m4trace:configure.ac:26: -2- _AM_MANGLE_OPTION([tar-ustar])
+m4trace:configure.ac:26: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
+m4trace:configure.ac:26: -2- _AM_MANGLE_OPTION([tar-pax])
+m4trace:configure.ac:26: -1- _AM_PROG_TAR([v7])
+m4trace:configure.ac:26: -1- AM_MISSING_PROG([AMTAR], [tar])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^AMTAR$])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^am__tar$])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^am__untar$])
+m4trace:configure.ac:26: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
                  [_AM_DEPENDENCIES(CC)],
                  [define([AC_PROG_CC],
                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
@@ -2686,321 +2686,336 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
                  [define([AC_PROG_OBJC],
                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
-m4trace:configure.ac:25: -2- _AM_MANGLE_OPTION([no-dependencies])
-m4trace:configure.ac:25: -1- _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])
-m4trace:configure.ac:25: -2- _AM_MANGLE_OPTION([silent-rules])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^ac_ct_CC$])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^EXEEXT$])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.ac:27: -1- _AM_DEPENDENCIES([CC])
-m4trace:configure.ac:27: -1- AM_SET_DEPDIR
-m4trace:configure.ac:27: -1- m4_pattern_allow([^DEPDIR$])
-m4trace:configure.ac:27: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
-m4trace:configure.ac:27: -1- AM_MAKE_INCLUDE
-m4trace:configure.ac:27: -1- m4_pattern_allow([^am__include$])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^am__quote$])
-m4trace:configure.ac:27: -1- AM_DEP_TRACK
-m4trace:configure.ac:27: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^AMDEP_TRUE$])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^AMDEP_FALSE$])
-m4trace:configure.ac:27: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
-m4trace:configure.ac:27: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
-m4trace:configure.ac:27: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^CCDEPMODE$])
-m4trace:configure.ac:27: -1- AM_CONDITIONAL([am__fastdepCC], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
-m4trace:configure.ac:27: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
-m4trace:configure.ac:27: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
-m4trace:configure.ac:28: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:28: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:26: -2- _AM_MANGLE_OPTION([no-dependencies])
+m4trace:configure.ac:26: -1- _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])
+m4trace:configure.ac:26: -2- _AM_MANGLE_OPTION([silent-rules])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^CFLAGS$])
 m4trace:configure.ac:28: -1- m4_pattern_allow([^LDFLAGS$])
 m4trace:configure.ac:28: -1- m4_pattern_allow([^LIBS$])
 m4trace:configure.ac:28: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:28: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:28: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:28: -1- _AM_DEPENDENCIES([CXX])
-m4trace:configure.ac:28: -1- m4_pattern_allow([^CXXDEPMODE$])
-m4trace:configure.ac:28: -1- AM_CONDITIONAL([am__fastdepCXX], [
+m4trace:configure.ac:28: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^EXEEXT$])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^OBJEXT$])
+m4trace:configure.ac:28: -1- _AM_DEPENDENCIES([CC])
+m4trace:configure.ac:28: -1- AM_SET_DEPDIR
+m4trace:configure.ac:28: -1- m4_pattern_allow([^DEPDIR$])
+m4trace:configure.ac:28: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:28: -1- AM_MAKE_INCLUDE
+m4trace:configure.ac:28: -1- m4_pattern_allow([^am__include$])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^am__quote$])
+m4trace:configure.ac:28: -1- AM_DEP_TRACK
+m4trace:configure.ac:28: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^AMDEP_TRUE$])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^AMDEP_FALSE$])
+m4trace:configure.ac:28: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
+m4trace:configure.ac:28: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
+m4trace:configure.ac:28: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^CCDEPMODE$])
+m4trace:configure.ac:28: -1- AM_CONDITIONAL([am__fastdepCC], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
+m4trace:configure.ac:28: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
+m4trace:configure.ac:28: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^ac_ct_CXX$])
+m4trace:configure.ac:29: -1- _AM_DEPENDENCIES([CXX])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^CXXDEPMODE$])
+m4trace:configure.ac:29: -1- AM_CONDITIONAL([am__fastdepCXX], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:28: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
-m4trace:configure.ac:28: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
-m4trace:configure.ac:28: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
-m4trace:configure.ac:28: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:31: -1- AC_LIBTOOL_WIN32_DLL
-m4trace:configure.ac:31: -1- _m4_warn([obsolete], [The macro `AC_LIBTOOL_WIN32_DLL' is obsolete.
+m4trace:configure.ac:29: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
+m4trace:configure.ac:29: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
+m4trace:configure.ac:29: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
+m4trace:configure.ac:32: -1- AC_LIBTOOL_WIN32_DLL
+m4trace:configure.ac:32: -1- _m4_warn([obsolete], [The macro `AC_LIBTOOL_WIN32_DLL' is obsolete.
 You should run autoupdate.], [/usr/share/aclocal/ltoptions.m4:145: AC_LIBTOOL_WIN32_DLL is expanded from...
-configure.ac:31: the top level])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^build$])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^build_cpu$])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^build_vendor$])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^build_os$])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^host$])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^host_cpu$])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^host_vendor$])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^host_os$])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^AS$])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^DLLTOOL$])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^OBJDUMP$])
-m4trace:configure.ac:31: -1- _m4_warn([obsolete], [AC_LIBTOOL_WIN32_DLL: Remove this warning and the call to _LT_SET_OPTION when you
+configure.ac:32: the top level])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^build$])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^build_cpu$])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^build_vendor$])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^build_os$])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^host$])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^host_cpu$])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^host_vendor$])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^host_os$])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^AS$])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^DLLTOOL$])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:32: -1- _m4_warn([obsolete], [AC_LIBTOOL_WIN32_DLL: Remove this warning and the call to _LT_SET_OPTION when you
 put the `win32-dll' option into LT_INIT's first parameter.], [/usr/share/aclocal/ltoptions.m4:145: AC_LIBTOOL_WIN32_DLL is expanded from...
-configure.ac:31: the top level])
-m4trace:configure.ac:32: -1- AC_LIBTOOL_DLOPEN
-m4trace:configure.ac:32: -1- _m4_warn([obsolete], [The macro `AC_LIBTOOL_DLOPEN' is obsolete.
-You should run autoupdate.], [/usr/share/aclocal/ltoptions.m4:110: AC_LIBTOOL_DLOPEN is expanded from...
 configure.ac:32: the top level])
-m4trace:configure.ac:32: -1- _m4_warn([obsolete], [AC_LIBTOOL_DLOPEN: Remove this warning and the call to _LT_SET_OPTION when you
+m4trace:configure.ac:33: -1- AC_LIBTOOL_DLOPEN
+m4trace:configure.ac:33: -1- _m4_warn([obsolete], [The macro `AC_LIBTOOL_DLOPEN' is obsolete.
+You should run autoupdate.], [/usr/share/aclocal/ltoptions.m4:110: AC_LIBTOOL_DLOPEN is expanded from...
+configure.ac:33: the top level])
+m4trace:configure.ac:33: -1- _m4_warn([obsolete], [AC_LIBTOOL_DLOPEN: Remove this warning and the call to _LT_SET_OPTION when you
 put the `dlopen' option into LT_INIT's first parameter.], [/usr/share/aclocal/ltoptions.m4:110: AC_LIBTOOL_DLOPEN is expanded from...
-configure.ac:32: the top level])
-m4trace:configure.ac:33: -1- AC_PROG_LIBTOOL
-m4trace:configure.ac:33: -1- _m4_warn([obsolete], [The macro `AC_PROG_LIBTOOL' is obsolete.
-You should run autoupdate.], [/usr/share/aclocal/libtool.m4:102: AC_PROG_LIBTOOL is expanded from...
 configure.ac:33: the top level])
-m4trace:configure.ac:33: -1- LT_INIT
-m4trace:configure.ac:33: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
-m4trace:configure.ac:33: -1- LTOPTIONS_VERSION
-m4trace:configure.ac:33: -1- LTSUGAR_VERSION
-m4trace:configure.ac:33: -1- LTVERSION_VERSION
-m4trace:configure.ac:33: -1- LTOBSOLETE_VERSION
-m4trace:configure.ac:33: -1- _LT_PROG_LTMAIN
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LIBTOOL$])
-m4trace:configure.ac:33: -1- LT_PATH_LD
-m4trace:configure.ac:33: -1- m4_pattern_allow([^SED$])
-m4trace:configure.ac:33: -1- AC_PROG_EGREP
-m4trace:configure.ac:33: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^EGREP$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^FGREP$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LD$])
-m4trace:configure.ac:33: -1- LT_PATH_NM
-m4trace:configure.ac:33: -1- m4_pattern_allow([^DUMPBIN$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^DUMPBIN$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^NM$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LN_S$])
-m4trace:configure.ac:33: -1- LT_CMD_MAX_LEN
-m4trace:configure.ac:33: -1- m4_pattern_allow([^OBJDUMP$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^OBJDUMP$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^AR$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^RANLIB$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([LT_OBJDIR])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LT_OBJDIR$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^lt_ECHO$])
-m4trace:configure.ac:33: -1- _LT_CC_BASENAME([$compiler])
-m4trace:configure.ac:33: -1- _LT_PATH_TOOL_PREFIX([${ac_tool_prefix}file], [/usr/bin$PATH_SEPARATOR$PATH])
-m4trace:configure.ac:33: -1- _LT_PATH_TOOL_PREFIX([file], [/usr/bin$PATH_SEPARATOR$PATH])
-m4trace:configure.ac:33: -1- LT_SUPPORTED_TAG([CC])
-m4trace:configure.ac:33: -1- _LT_COMPILER_BOILERPLATE
-m4trace:configure.ac:33: -1- _LT_LINKER_BOILERPLATE
-m4trace:configure.ac:33: -1- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], [lt_cv_prog_compiler_rtti_exceptions], [-fno-rtti -fno-exceptions], [], [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, )="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, ) -fno-rtti -fno-exceptions"])
-m4trace:configure.ac:33: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, ) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, )], [$_LT_TAGVAR(lt_prog_compiler_pic, )@&t@m4_if([],[],[ -DPIC],[m4_if([],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, ) in
+m4trace:configure.ac:34: -1- AC_PROG_LIBTOOL
+m4trace:configure.ac:34: -1- _m4_warn([obsolete], [The macro `AC_PROG_LIBTOOL' is obsolete.
+You should run autoupdate.], [/usr/share/aclocal/libtool.m4:102: AC_PROG_LIBTOOL is expanded from...
+configure.ac:34: the top level])
+m4trace:configure.ac:34: -1- LT_INIT
+m4trace:configure.ac:34: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
+m4trace:configure.ac:34: -1- LTOPTIONS_VERSION
+m4trace:configure.ac:34: -1- LTSUGAR_VERSION
+m4trace:configure.ac:34: -1- LTVERSION_VERSION
+m4trace:configure.ac:34: -1- LTOBSOLETE_VERSION
+m4trace:configure.ac:34: -1- _LT_PROG_LTMAIN
+m4trace:configure.ac:34: -1- m4_pattern_allow([^LIBTOOL$])
+m4trace:configure.ac:34: -1- LT_PATH_LD
+m4trace:configure.ac:34: -1- m4_pattern_allow([^SED$])
+m4trace:configure.ac:34: -1- AC_PROG_EGREP
+m4trace:configure.ac:34: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^FGREP$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^LD$])
+m4trace:configure.ac:34: -1- LT_PATH_NM
+m4trace:configure.ac:34: -1- m4_pattern_allow([^DUMPBIN$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^DUMPBIN$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^NM$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^LN_S$])
+m4trace:configure.ac:34: -1- LT_CMD_MAX_LEN
+m4trace:configure.ac:34: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^AR$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^RANLIB$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([LT_OBJDIR])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^LT_OBJDIR$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^lt_ECHO$])
+m4trace:configure.ac:34: -1- _LT_CC_BASENAME([$compiler])
+m4trace:configure.ac:34: -1- _LT_PATH_TOOL_PREFIX([${ac_tool_prefix}file], [/usr/bin$PATH_SEPARATOR$PATH])
+m4trace:configure.ac:34: -1- _LT_PATH_TOOL_PREFIX([file], [/usr/bin$PATH_SEPARATOR$PATH])
+m4trace:configure.ac:34: -1- LT_SUPPORTED_TAG([CC])
+m4trace:configure.ac:34: -1- _LT_COMPILER_BOILERPLATE
+m4trace:configure.ac:34: -1- _LT_LINKER_BOILERPLATE
+m4trace:configure.ac:34: -1- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], [lt_cv_prog_compiler_rtti_exceptions], [-fno-rtti -fno-exceptions], [], [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, )="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, ) -fno-rtti -fno-exceptions"])
+m4trace:configure.ac:34: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, ) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, )], [$_LT_TAGVAR(lt_prog_compiler_pic, )@&t@m4_if([],[],[ -DPIC],[m4_if([],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, ) in
      "" | " "*) ;;
      *) _LT_TAGVAR(lt_prog_compiler_pic, )=" $_LT_TAGVAR(lt_prog_compiler_pic, )" ;;
      esac], [_LT_TAGVAR(lt_prog_compiler_pic, )=
      _LT_TAGVAR(lt_prog_compiler_can_build_shared, )=no])
-m4trace:configure.ac:33: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, )=])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^DSYMUTIL$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^NMEDIT$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LIPO$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^OTOOL$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^OTOOL64$])
-m4trace:configure.ac:33: -1- LT_SYS_DLOPEN_SELF
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
-m4trace:configure.ac:33: -1- LT_LANG([CXX])
-m4trace:configure.ac:33: -1- LT_SUPPORTED_TAG([CXX])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:33: -1- _AM_DEPENDENCIES([CXX])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CXXDEPMODE$])
-m4trace:configure.ac:33: -1- AM_CONDITIONAL([am__fastdepCXX], [
+m4trace:configure.ac:34: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, )=])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^DSYMUTIL$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^NMEDIT$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^LIPO$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^OTOOL$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^OTOOL64$])
+m4trace:configure.ac:34: -1- LT_SYS_DLOPEN_SELF
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
+m4trace:configure.ac:34: -1- LT_LANG([CXX])
+m4trace:configure.ac:34: -1- LT_SUPPORTED_TAG([CXX])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^ac_ct_CXX$])
+m4trace:configure.ac:34: -1- _AM_DEPENDENCIES([CXX])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CXXDEPMODE$])
+m4trace:configure.ac:34: -1- AM_CONDITIONAL([am__fastdepCXX], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
-m4trace:configure.ac:33: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
-m4trace:configure.ac:33: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:33: -1- _LT_COMPILER_BOILERPLATE
-m4trace:configure.ac:33: -1- _LT_LINKER_BOILERPLATE
-m4trace:configure.ac:33: -1- _LT_CC_BASENAME([$compiler])
-m4trace:configure.ac:33: -1- LT_PATH_LD
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LD$])
-m4trace:configure.ac:33: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, CXX) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, CXX)], [$_LT_TAGVAR(lt_prog_compiler_pic, CXX)@&t@m4_if([CXX],[],[ -DPIC],[m4_if([CXX],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, CXX) in
+m4trace:configure.ac:34: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
+m4trace:configure.ac:34: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
+m4trace:configure.ac:34: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:34: -1- _LT_COMPILER_BOILERPLATE
+m4trace:configure.ac:34: -1- _LT_LINKER_BOILERPLATE
+m4trace:configure.ac:34: -1- _LT_CC_BASENAME([$compiler])
+m4trace:configure.ac:34: -1- LT_PATH_LD
+m4trace:configure.ac:34: -1- m4_pattern_allow([^LD$])
+m4trace:configure.ac:34: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, CXX) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, CXX)], [$_LT_TAGVAR(lt_prog_compiler_pic, CXX)@&t@m4_if([CXX],[],[ -DPIC],[m4_if([CXX],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, CXX) in
      "" | " "*) ;;
      *) _LT_TAGVAR(lt_prog_compiler_pic, CXX)=" $_LT_TAGVAR(lt_prog_compiler_pic, CXX)" ;;
      esac], [_LT_TAGVAR(lt_prog_compiler_pic, CXX)=
      _LT_TAGVAR(lt_prog_compiler_can_build_shared, CXX)=no])
-m4trace:configure.ac:33: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works_CXX], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, CXX)=])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^MGL_USE_DOUBLE$])
-m4trace:configure.ac:46: -1- m4_pattern_allow([^MGL_USE_DOUBLE$])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^PTHREAD_FLAGS$])
-m4trace:configure.ac:75: -1- m4_pattern_allow([^PTHREAD_LIBS$])
-m4trace:configure.ac:77: -1- AM_CONDITIONAL([USE_PTHREAD], [test x$pthread = xtrue])
-m4trace:configure.ac:77: -1- m4_pattern_allow([^USE_PTHREAD_TRUE$])
-m4trace:configure.ac:77: -1- m4_pattern_allow([^USE_PTHREAD_FALSE$])
-m4trace:configure.ac:77: -1- _AM_SUBST_NOTMAKE([USE_PTHREAD_TRUE])
-m4trace:configure.ac:77: -1- _AM_SUBST_NOTMAKE([USE_PTHREAD_FALSE])
-m4trace:configure.ac:89: -1- m4_pattern_allow([^GSL_FLAGS$])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^GSL_LIBS$])
-m4trace:configure.ac:100: -1- m4_pattern_allow([^GSL_FLAGS$])
-m4trace:configure.ac:102: -1- AM_CONDITIONAL([USE_GSL], [test x$test_gsl = xtrue])
-m4trace:configure.ac:102: -1- m4_pattern_allow([^USE_GSL_TRUE$])
-m4trace:configure.ac:102: -1- m4_pattern_allow([^USE_GSL_FALSE$])
-m4trace:configure.ac:102: -1- _AM_SUBST_NOTMAKE([USE_GSL_TRUE])
-m4trace:configure.ac:102: -1- _AM_SUBST_NOTMAKE([USE_GSL_FALSE])
-m4trace:configure.ac:115: -1- m4_pattern_allow([^GL_LIBS$])
-m4trace:configure.ac:118: -1- m4_pattern_allow([^GLUT_LIBS$])
-m4trace:configure.ac:125: -1- m4_pattern_allow([^GL_LIBS$])
-m4trace:configure.ac:128: -1- m4_pattern_allow([^GLUT_FLAGS$])
-m4trace:configure.ac:130: -1- m4_pattern_allow([^GLUT_LIBS$])
-m4trace:configure.ac:137: -1- m4_pattern_allow([^GL_LIBS$])
-m4trace:configure.ac:140: -1- m4_pattern_allow([^GLUT_FLAGS$])
-m4trace:configure.ac:142: -1- m4_pattern_allow([^GLUT_LIBS$])
-m4trace:configure.ac:147: -1- AM_CONDITIONAL([USE_GLUT], [(test x$all = xtrue || test x$glut = xtrue)])
-m4trace:configure.ac:147: -1- m4_pattern_allow([^USE_GLUT_TRUE$])
-m4trace:configure.ac:147: -1- m4_pattern_allow([^USE_GLUT_FALSE$])
-m4trace:configure.ac:147: -1- _AM_SUBST_NOTMAKE([USE_GLUT_TRUE])
-m4trace:configure.ac:147: -1- _AM_SUBST_NOTMAKE([USE_GLUT_FALSE])
-m4trace:configure.ac:177: -1- m4_pattern_allow([^HDF5_FLAGS$])
-m4trace:configure.ac:179: -1- m4_pattern_allow([^HDF5_LIBS$])
-m4trace:configure.ac:181: -1- AM_CONDITIONAL([USE_HDF5], [(test x$all = xtrue || test x$hdf5 = xtrue || test x$hdf5_18 = xtrue)])
-m4trace:configure.ac:181: -1- m4_pattern_allow([^USE_HDF5_TRUE$])
-m4trace:configure.ac:181: -1- m4_pattern_allow([^USE_HDF5_FALSE$])
-m4trace:configure.ac:181: -1- _AM_SUBST_NOTMAKE([USE_HDF5_TRUE])
-m4trace:configure.ac:181: -1- _AM_SUBST_NOTMAKE([USE_HDF5_FALSE])
-m4trace:configure.ac:193: -1- m4_pattern_allow([^HDF4_FLAGS$])
-m4trace:configure.ac:194: -1- m4_pattern_allow([^HDF4_LIBS$])
-m4trace:configure.ac:196: -1- AM_CONDITIONAL([USE_HDF4], [(test x$all = xtrue || test x$hdf4 = xtrue)])
-m4trace:configure.ac:196: -1- m4_pattern_allow([^USE_HDF4_TRUE$])
-m4trace:configure.ac:196: -1- m4_pattern_allow([^USE_HDF4_FALSE$])
-m4trace:configure.ac:196: -1- _AM_SUBST_NOTMAKE([USE_HDF4_TRUE])
-m4trace:configure.ac:196: -1- _AM_SUBST_NOTMAKE([USE_HDF4_FALSE])
-m4trace:configure.ac:205: -1- m4_pattern_allow([^GIF_FLAGS$])
-m4trace:configure.ac:208: -1- m4_pattern_allow([^GIF_LIBS$])
-m4trace:configure.ac:210: -1- AM_CONDITIONAL([USE_GIF], [(test x$all = xtrue || test x$gif = xtrue)])
-m4trace:configure.ac:210: -1- m4_pattern_allow([^USE_GIF_TRUE$])
-m4trace:configure.ac:210: -1- m4_pattern_allow([^USE_GIF_FALSE$])
-m4trace:configure.ac:210: -1- _AM_SUBST_NOTMAKE([USE_GIF_TRUE])
-m4trace:configure.ac:210: -1- _AM_SUBST_NOTMAKE([USE_GIF_FALSE])
-m4trace:configure.ac:214: -1- m4_pattern_allow([^PNG_LIBS$])
-m4trace:configure.ac:224: -1- m4_pattern_allow([^JPEG_FLAGS$])
-m4trace:configure.ac:227: -1- m4_pattern_allow([^JPEG_LIBS$])
-m4trace:configure.ac:229: -1- AM_CONDITIONAL([USE_JPEG], [(test x$all = xtrue || test x$jpeg = xtrue)])
-m4trace:configure.ac:229: -1- m4_pattern_allow([^USE_JPEG_TRUE$])
-m4trace:configure.ac:229: -1- m4_pattern_allow([^USE_JPEG_FALSE$])
-m4trace:configure.ac:229: -1- _AM_SUBST_NOTMAKE([USE_JPEG_TRUE])
-m4trace:configure.ac:229: -1- _AM_SUBST_NOTMAKE([USE_JPEG_FALSE])
-m4trace:configure.ac:240: -1- m4_pattern_allow([^FLTK_FLAGS$])
-m4trace:configure.ac:241: -1- m4_pattern_allow([^FLTK_LIBS$])
-m4trace:configure.ac:250: -1- AM_CONDITIONAL([USE_FLTK], [test x$test_fltk = xtrue])
-m4trace:configure.ac:250: -1- m4_pattern_allow([^USE_FLTK_TRUE$])
-m4trace:configure.ac:250: -1- m4_pattern_allow([^USE_FLTK_FALSE$])
-m4trace:configure.ac:250: -1- _AM_SUBST_NOTMAKE([USE_FLTK_TRUE])
-m4trace:configure.ac:250: -1- _AM_SUBST_NOTMAKE([USE_FLTK_FALSE])
-m4trace:configure.ac:262: -1- m4_pattern_allow([^WX_FLAGS$])
-m4trace:configure.ac:263: -1- m4_pattern_allow([^WX_LIBS$])
-m4trace:configure.ac:272: -1- AM_CONDITIONAL([USE_WX], [test x$test_wx = xtrue])
-m4trace:configure.ac:272: -1- m4_pattern_allow([^USE_WX_TRUE$])
-m4trace:configure.ac:272: -1- m4_pattern_allow([^USE_WX_FALSE$])
-m4trace:configure.ac:272: -1- _AM_SUBST_NOTMAKE([USE_WX_TRUE])
-m4trace:configure.ac:272: -1- _AM_SUBST_NOTMAKE([USE_WX_FALSE])
-m4trace:configure.ac:282: -1- AT_WITH_QT
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QMAKE$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QMAKE$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^MOC$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^MOC$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^UIC$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^UIC$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^RCC$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^RCC$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_PATH$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^TMPDIR$])
-m4trace:configure.ac:282: -1- _AT_TWEAK_PRO_FILE([CONFIG], [+release])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_VERSION_MAJOR$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_DEFINES$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_CFLAGS$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_CXXFLAGS$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_INCPATH$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_CPPFLAGS$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_LFLAGS$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_LDFLAGS$])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_LIBS$])
-m4trace:configure.ac:283: -1- AT_REQUIRE_QT_VERSION([4.3])
-m4trace:configure.ac:283: -1- m4_pattern_allow([^QT_VERSION$])
-m4trace:configure.ac:286: -1- AM_CONDITIONAL([USE_QT], [test x$test_qt = xtrue])
-m4trace:configure.ac:286: -1- m4_pattern_allow([^USE_QT_TRUE$])
-m4trace:configure.ac:286: -1- m4_pattern_allow([^USE_QT_FALSE$])
-m4trace:configure.ac:286: -1- _AM_SUBST_NOTMAKE([USE_QT_TRUE])
-m4trace:configure.ac:286: -1- _AM_SUBST_NOTMAKE([USE_QT_FALSE])
-m4trace:configure.ac:296: -1- m4_pattern_allow([^PYTHON_HEADERS$])
-m4trace:configure.ac:297: -1- m4_pattern_allow([^HAVE_SWIG$])
-m4trace:configure.ac:300: -1- AM_PATH_PYTHON([])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^PYTHON$])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^PYTHON_VERSION$])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^PYTHON_PREFIX$])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^PYTHON_EXEC_PREFIX$])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^PYTHON_PLATFORM$])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^pythondir$])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^pkgpythondir$])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^pyexecdir$])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^pkgpyexecdir$])
-m4trace:configure.ac:306: -1- AM_CONDITIONAL([USE_PYTHON], [test x$test_python = xtrue ])
-m4trace:configure.ac:306: -1- m4_pattern_allow([^USE_PYTHON_TRUE$])
-m4trace:configure.ac:306: -1- m4_pattern_allow([^USE_PYTHON_FALSE$])
-m4trace:configure.ac:306: -1- _AM_SUBST_NOTMAKE([USE_PYTHON_TRUE])
-m4trace:configure.ac:306: -1- _AM_SUBST_NOTMAKE([USE_PYTHON_FALSE])
-m4trace:configure.ac:316: -1- m4_pattern_allow([^OCTAVE$])
-m4trace:configure.ac:322: -1- m4_pattern_allow([^OCTAVE_ARCH$])
-m4trace:configure.ac:323: -1- m4_pattern_allow([^OCTAVE_INCFLAGS$])
-m4trace:configure.ac:326: -1- AM_CONDITIONAL([USE_OCTAVE], [test x$test_octave = xtrue ])
-m4trace:configure.ac:326: -1- m4_pattern_allow([^USE_OCTAVE_TRUE$])
-m4trace:configure.ac:326: -1- m4_pattern_allow([^USE_OCTAVE_FALSE$])
-m4trace:configure.ac:326: -1- _AM_SUBST_NOTMAKE([USE_OCTAVE_TRUE])
-m4trace:configure.ac:326: -1- _AM_SUBST_NOTMAKE([USE_OCTAVE_FALSE])
-m4trace:configure.ac:335: -1- AM_CONDITIONAL([USE_TESTIO], [test x$testio = xtrue ])
-m4trace:configure.ac:335: -1- m4_pattern_allow([^USE_TESTIO_TRUE$])
-m4trace:configure.ac:335: -1- m4_pattern_allow([^USE_TESTIO_FALSE$])
-m4trace:configure.ac:335: -1- _AM_SUBST_NOTMAKE([USE_TESTIO_TRUE])
-m4trace:configure.ac:335: -1- _AM_SUBST_NOTMAKE([USE_TESTIO_FALSE])
-m4trace:configure.ac:347: -1- AM_CONDITIONAL([USE_DOCS], [(test x$docs = xtrue || test x$all = xtrue) ])
-m4trace:configure.ac:347: -1- m4_pattern_allow([^USE_DOCS_TRUE$])
-m4trace:configure.ac:347: -1- m4_pattern_allow([^USE_DOCS_FALSE$])
-m4trace:configure.ac:347: -1- _AM_SUBST_NOTMAKE([USE_DOCS_TRUE])
-m4trace:configure.ac:347: -1- _AM_SUBST_NOTMAKE([USE_DOCS_FALSE])
-m4trace:configure.ac:350: -1- m4_pattern_allow([^AM_CXXFLAGS$])
-m4trace:configure.ac:361: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:361: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:361: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:361: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:361: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:361: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:361: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:361: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
-m4trace:configure.ac:361: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
-m4trace:configure.ac:361: -1- _LT_PROG_LTMAIN
+m4trace:configure.ac:34: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works_CXX], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, CXX)=])
+m4trace:configure.ac:45: -1- m4_pattern_allow([^MGL_USE_DOUBLE$])
+m4trace:configure.ac:47: -1- m4_pattern_allow([^MGL_USE_DOUBLE$])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^PTHREAD_FLAGS$])
+m4trace:configure.ac:76: -1- m4_pattern_allow([^PTHREAD_LIBS$])
+m4trace:configure.ac:78: -1- AM_CONDITIONAL([USE_PTHREAD], [test x$pthread = xtrue])
+m4trace:configure.ac:78: -1- m4_pattern_allow([^USE_PTHREAD_TRUE$])
+m4trace:configure.ac:78: -1- m4_pattern_allow([^USE_PTHREAD_FALSE$])
+m4trace:configure.ac:78: -1- _AM_SUBST_NOTMAKE([USE_PTHREAD_TRUE])
+m4trace:configure.ac:78: -1- _AM_SUBST_NOTMAKE([USE_PTHREAD_FALSE])
+m4trace:configure.ac:90: -1- m4_pattern_allow([^GSL_FLAGS$])
+m4trace:configure.ac:91: -1- m4_pattern_allow([^GSL_LIBS$])
+m4trace:configure.ac:101: -1- m4_pattern_allow([^GSL_FLAGS$])
+m4trace:configure.ac:103: -1- AM_CONDITIONAL([USE_GSL], [test x$test_gsl = xtrue])
+m4trace:configure.ac:103: -1- m4_pattern_allow([^USE_GSL_TRUE$])
+m4trace:configure.ac:103: -1- m4_pattern_allow([^USE_GSL_FALSE$])
+m4trace:configure.ac:103: -1- _AM_SUBST_NOTMAKE([USE_GSL_TRUE])
+m4trace:configure.ac:103: -1- _AM_SUBST_NOTMAKE([USE_GSL_FALSE])
+m4trace:configure.ac:116: -1- m4_pattern_allow([^GL_LIBS$])
+m4trace:configure.ac:119: -1- m4_pattern_allow([^GLUT_LIBS$])
+m4trace:configure.ac:126: -1- m4_pattern_allow([^GL_LIBS$])
+m4trace:configure.ac:129: -1- m4_pattern_allow([^GLUT_FLAGS$])
+m4trace:configure.ac:131: -1- m4_pattern_allow([^GLUT_LIBS$])
+m4trace:configure.ac:138: -1- m4_pattern_allow([^GL_LIBS$])
+m4trace:configure.ac:141: -1- m4_pattern_allow([^GLUT_FLAGS$])
+m4trace:configure.ac:143: -1- m4_pattern_allow([^GLUT_LIBS$])
+m4trace:configure.ac:148: -1- AM_CONDITIONAL([USE_GLUT], [(test x$all = xtrue || test x$glut = xtrue)])
+m4trace:configure.ac:148: -1- m4_pattern_allow([^USE_GLUT_TRUE$])
+m4trace:configure.ac:148: -1- m4_pattern_allow([^USE_GLUT_FALSE$])
+m4trace:configure.ac:148: -1- _AM_SUBST_NOTMAKE([USE_GLUT_TRUE])
+m4trace:configure.ac:148: -1- _AM_SUBST_NOTMAKE([USE_GLUT_FALSE])
+m4trace:configure.ac:178: -1- m4_pattern_allow([^HDF5_FLAGS$])
+m4trace:configure.ac:180: -1- m4_pattern_allow([^HDF5_LIBS$])
+m4trace:configure.ac:182: -1- AM_CONDITIONAL([USE_HDF5], [(test x$all = xtrue || test x$hdf5 = xtrue || test x$hdf5_18 = xtrue)])
+m4trace:configure.ac:182: -1- m4_pattern_allow([^USE_HDF5_TRUE$])
+m4trace:configure.ac:182: -1- m4_pattern_allow([^USE_HDF5_FALSE$])
+m4trace:configure.ac:182: -1- _AM_SUBST_NOTMAKE([USE_HDF5_TRUE])
+m4trace:configure.ac:182: -1- _AM_SUBST_NOTMAKE([USE_HDF5_FALSE])
+m4trace:configure.ac:194: -1- m4_pattern_allow([^HDF4_FLAGS$])
+m4trace:configure.ac:195: -1- m4_pattern_allow([^HDF4_LIBS$])
+m4trace:configure.ac:197: -1- AM_CONDITIONAL([USE_HDF4], [(test x$all = xtrue || test x$hdf4 = xtrue)])
+m4trace:configure.ac:197: -1- m4_pattern_allow([^USE_HDF4_TRUE$])
+m4trace:configure.ac:197: -1- m4_pattern_allow([^USE_HDF4_FALSE$])
+m4trace:configure.ac:197: -1- _AM_SUBST_NOTMAKE([USE_HDF4_TRUE])
+m4trace:configure.ac:197: -1- _AM_SUBST_NOTMAKE([USE_HDF4_FALSE])
+m4trace:configure.ac:206: -1- m4_pattern_allow([^GIF_FLAGS$])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^GIF_LIBS$])
+m4trace:configure.ac:211: -1- AM_CONDITIONAL([USE_GIF], [(test x$all = xtrue || test x$gif = xtrue)])
+m4trace:configure.ac:211: -1- m4_pattern_allow([^USE_GIF_TRUE$])
+m4trace:configure.ac:211: -1- m4_pattern_allow([^USE_GIF_FALSE$])
+m4trace:configure.ac:211: -1- _AM_SUBST_NOTMAKE([USE_GIF_TRUE])
+m4trace:configure.ac:211: -1- _AM_SUBST_NOTMAKE([USE_GIF_FALSE])
+m4trace:configure.ac:215: -1- m4_pattern_allow([^PNG_LIBS$])
+m4trace:configure.ac:225: -1- m4_pattern_allow([^JPEG_FLAGS$])
+m4trace:configure.ac:228: -1- m4_pattern_allow([^JPEG_LIBS$])
+m4trace:configure.ac:230: -1- AM_CONDITIONAL([USE_JPEG], [(test x$all = xtrue || test x$jpeg = xtrue)])
+m4trace:configure.ac:230: -1- m4_pattern_allow([^USE_JPEG_TRUE$])
+m4trace:configure.ac:230: -1- m4_pattern_allow([^USE_JPEG_FALSE$])
+m4trace:configure.ac:230: -1- _AM_SUBST_NOTMAKE([USE_JPEG_TRUE])
+m4trace:configure.ac:230: -1- _AM_SUBST_NOTMAKE([USE_JPEG_FALSE])
+m4trace:configure.ac:246: -1- m4_pattern_allow([^HAVE_LIBHPDF$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^HAVE_HPDF_H$])
+m4trace:configure.ac:257: -1- AM_CONDITIONAL([USE_PDF], [test x$pdf = xtrue])
+m4trace:configure.ac:257: -1- m4_pattern_allow([^USE_PDF_TRUE$])
+m4trace:configure.ac:257: -1- m4_pattern_allow([^USE_PDF_FALSE$])
+m4trace:configure.ac:257: -1- _AM_SUBST_NOTMAKE([USE_PDF_TRUE])
+m4trace:configure.ac:257: -1- _AM_SUBST_NOTMAKE([USE_PDF_FALSE])
+m4trace:configure.ac:259: -1- m4_pattern_allow([^U3D_LIBS$])
+m4trace:configure.ac:259: -1- m4_pattern_allow([^HAVE_U3D$])
+m4trace:configure.ac:268: -1- m4_pattern_allow([^HAVE_U3D_SCENECONVERTERLIB_H$])
+m4trace:configure.ac:273: -1- AM_CONDITIONAL([USE_U3D], [test x$u3d = xtrue])
+m4trace:configure.ac:273: -1- m4_pattern_allow([^USE_U3D_TRUE$])
+m4trace:configure.ac:273: -1- m4_pattern_allow([^USE_U3D_FALSE$])
+m4trace:configure.ac:273: -1- _AM_SUBST_NOTMAKE([USE_U3D_TRUE])
+m4trace:configure.ac:273: -1- _AM_SUBST_NOTMAKE([USE_U3D_FALSE])
+m4trace:configure.ac:284: -1- m4_pattern_allow([^FLTK_FLAGS$])
+m4trace:configure.ac:285: -1- m4_pattern_allow([^FLTK_LIBS$])
+m4trace:configure.ac:294: -1- AM_CONDITIONAL([USE_FLTK], [test x$test_fltk = xtrue])
+m4trace:configure.ac:294: -1- m4_pattern_allow([^USE_FLTK_TRUE$])
+m4trace:configure.ac:294: -1- m4_pattern_allow([^USE_FLTK_FALSE$])
+m4trace:configure.ac:294: -1- _AM_SUBST_NOTMAKE([USE_FLTK_TRUE])
+m4trace:configure.ac:294: -1- _AM_SUBST_NOTMAKE([USE_FLTK_FALSE])
+m4trace:configure.ac:306: -1- m4_pattern_allow([^WX_FLAGS$])
+m4trace:configure.ac:307: -1- m4_pattern_allow([^WX_LIBS$])
+m4trace:configure.ac:316: -1- AM_CONDITIONAL([USE_WX], [test x$test_wx = xtrue])
+m4trace:configure.ac:316: -1- m4_pattern_allow([^USE_WX_TRUE$])
+m4trace:configure.ac:316: -1- m4_pattern_allow([^USE_WX_FALSE$])
+m4trace:configure.ac:316: -1- _AM_SUBST_NOTMAKE([USE_WX_TRUE])
+m4trace:configure.ac:316: -1- _AM_SUBST_NOTMAKE([USE_WX_FALSE])
+m4trace:configure.ac:326: -1- AT_WITH_QT
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QMAKE$])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QMAKE$])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^MOC$])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^MOC$])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^UIC$])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^UIC$])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^RCC$])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^RCC$])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_PATH$])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^TMPDIR$])
+m4trace:configure.ac:326: -1- _AT_TWEAK_PRO_FILE([CONFIG], [+release])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_VERSION_MAJOR$])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_DEFINES$])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_CFLAGS$])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_CXXFLAGS$])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_INCPATH$])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_CPPFLAGS$])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_LFLAGS$])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_LDFLAGS$])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_LIBS$])
+m4trace:configure.ac:327: -1- AT_REQUIRE_QT_VERSION([4.3])
+m4trace:configure.ac:327: -1- m4_pattern_allow([^QT_VERSION$])
+m4trace:configure.ac:330: -1- AM_CONDITIONAL([USE_QT], [test x$test_qt = xtrue])
+m4trace:configure.ac:330: -1- m4_pattern_allow([^USE_QT_TRUE$])
+m4trace:configure.ac:330: -1- m4_pattern_allow([^USE_QT_FALSE$])
+m4trace:configure.ac:330: -1- _AM_SUBST_NOTMAKE([USE_QT_TRUE])
+m4trace:configure.ac:330: -1- _AM_SUBST_NOTMAKE([USE_QT_FALSE])
+m4trace:configure.ac:340: -1- m4_pattern_allow([^PYTHON_HEADERS$])
+m4trace:configure.ac:341: -1- m4_pattern_allow([^HAVE_SWIG$])
+m4trace:configure.ac:344: -1- AM_PATH_PYTHON([])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^PYTHON$])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^PYTHON_VERSION$])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^PYTHON_PREFIX$])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^PYTHON_EXEC_PREFIX$])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^PYTHON_PLATFORM$])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^pythondir$])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^pkgpythondir$])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^pyexecdir$])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^pkgpyexecdir$])
+m4trace:configure.ac:350: -1- AM_CONDITIONAL([USE_PYTHON], [test x$test_python = xtrue ])
+m4trace:configure.ac:350: -1- m4_pattern_allow([^USE_PYTHON_TRUE$])
+m4trace:configure.ac:350: -1- m4_pattern_allow([^USE_PYTHON_FALSE$])
+m4trace:configure.ac:350: -1- _AM_SUBST_NOTMAKE([USE_PYTHON_TRUE])
+m4trace:configure.ac:350: -1- _AM_SUBST_NOTMAKE([USE_PYTHON_FALSE])
+m4trace:configure.ac:360: -1- m4_pattern_allow([^OCTAVE$])
+m4trace:configure.ac:366: -1- m4_pattern_allow([^OCTAVE_ARCH$])
+m4trace:configure.ac:367: -1- m4_pattern_allow([^OCTAVE_INCFLAGS$])
+m4trace:configure.ac:370: -1- AM_CONDITIONAL([USE_OCTAVE], [test x$test_octave = xtrue ])
+m4trace:configure.ac:370: -1- m4_pattern_allow([^USE_OCTAVE_TRUE$])
+m4trace:configure.ac:370: -1- m4_pattern_allow([^USE_OCTAVE_FALSE$])
+m4trace:configure.ac:370: -1- _AM_SUBST_NOTMAKE([USE_OCTAVE_TRUE])
+m4trace:configure.ac:370: -1- _AM_SUBST_NOTMAKE([USE_OCTAVE_FALSE])
+m4trace:configure.ac:379: -1- AM_CONDITIONAL([USE_TESTIO], [test x$testio = xtrue ])
+m4trace:configure.ac:379: -1- m4_pattern_allow([^USE_TESTIO_TRUE$])
+m4trace:configure.ac:379: -1- m4_pattern_allow([^USE_TESTIO_FALSE$])
+m4trace:configure.ac:379: -1- _AM_SUBST_NOTMAKE([USE_TESTIO_TRUE])
+m4trace:configure.ac:379: -1- _AM_SUBST_NOTMAKE([USE_TESTIO_FALSE])
+m4trace:configure.ac:391: -1- AM_CONDITIONAL([USE_DOCS], [(test x$docs = xtrue || test x$all = xtrue) ])
+m4trace:configure.ac:391: -1- m4_pattern_allow([^USE_DOCS_TRUE$])
+m4trace:configure.ac:391: -1- m4_pattern_allow([^USE_DOCS_FALSE$])
+m4trace:configure.ac:391: -1- _AM_SUBST_NOTMAKE([USE_DOCS_TRUE])
+m4trace:configure.ac:391: -1- _AM_SUBST_NOTMAKE([USE_DOCS_FALSE])
+m4trace:configure.ac:394: -1- m4_pattern_allow([^AM_CXXFLAGS$])
+m4trace:configure.ac:405: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:405: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:405: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:405: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:405: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:405: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:405: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:405: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
+m4trace:configure.ac:405: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:405: -1- _LT_PROG_LTMAIN
index 56cbdf82def280dcb11bfcdf010f449675c3dbc0..268d85bf04bf451797661a60611b5c834ca45d1c 100644 (file)
@@ -1,7 +1,7 @@
 m4trace:aclocal.m4:9123: -1- m4_include([config/autotroll.m4])
 m4trace:config/autotroll.m4:70: -1- m4_pattern_forbid([^AT_])
 m4trace:config/autotroll.m4:71: -1- m4_pattern_forbid([^_AT_])
-m4trace:configure.ac:1: -1- AC_INIT([mathgl], [1.10], [mathgl.abalakin@gmail.com])
+m4trace:configure.ac:1: -1- AC_INIT([mathgl], [1.11], [mathgl.abalakin@gmail.com])
 m4trace:configure.ac:1: -1- m4_pattern_forbid([^_?A[CHUM]_])
 m4trace:configure.ac:1: -1- m4_pattern_forbid([_AC_])
 m4trace:configure.ac:1: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -154,177 +154,105 @@ m4trace:configure.ac:4: -1- AC_SUBST_TRACE([MGL_RELEASE])
 m4trace:configure.ac:4: -1- m4_pattern_allow([^MGL_RELEASE$])
 m4trace:configure.ac:7: -1- AC_CONFIG_AUX_DIR([config])
 m4trace:configure.ac:9: -1- AC_CONFIG_HEADERS([include/mgl/config.h])
-m4trace:configure.ac:21: -1- AC_SUBST([MGL_CURRENT])
-m4trace:configure.ac:21: -1- AC_SUBST_TRACE([MGL_CURRENT])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^MGL_CURRENT$])
-m4trace:configure.ac:22: -1- AC_SUBST([MGL_REVISION])
-m4trace:configure.ac:22: -1- AC_SUBST_TRACE([MGL_REVISION])
-m4trace:configure.ac:22: -1- m4_pattern_allow([^MGL_REVISION$])
-m4trace:configure.ac:23: -1- AC_SUBST([MGL_AGE])
-m4trace:configure.ac:23: -1- AC_SUBST_TRACE([MGL_AGE])
-m4trace:configure.ac:23: -1- m4_pattern_allow([^MGL_AGE$])
-m4trace:configure.ac:25: -1- AM_INIT_AUTOMAKE
-m4trace:configure.ac:25: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-m4trace:configure.ac:25: -1- AM_AUTOMAKE_VERSION([1.11.1])
-m4trace:configure.ac:25: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.ac:25: -1- AC_SUBST([INSTALL_PROGRAM])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.ac:25: -1- AC_SUBST([INSTALL_SCRIPT])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.ac:25: -1- AC_SUBST([INSTALL_DATA])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([INSTALL_DATA])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.ac:25: -1- AC_SUBST([am__isrc], [' -I$(srcdir)'])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([am__isrc])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^am__isrc$])
-m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__isrc])
-m4trace:configure.ac:25: -1- AC_SUBST([CYGPATH_W])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([CYGPATH_W])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^CYGPATH_W$])
-m4trace:configure.ac:25: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([PACKAGE])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:25: -1- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([VERSION])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:25: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:25: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
+m4trace:configure.ac:22: -1- AC_SUBST([MGL_CURRENT])
+m4trace:configure.ac:22: -1- AC_SUBST_TRACE([MGL_CURRENT])
+m4trace:configure.ac:22: -1- m4_pattern_allow([^MGL_CURRENT$])
+m4trace:configure.ac:23: -1- AC_SUBST([MGL_REVISION])
+m4trace:configure.ac:23: -1- AC_SUBST_TRACE([MGL_REVISION])
+m4trace:configure.ac:23: -1- m4_pattern_allow([^MGL_REVISION$])
+m4trace:configure.ac:24: -1- AC_SUBST([MGL_AGE])
+m4trace:configure.ac:24: -1- AC_SUBST_TRACE([MGL_AGE])
+m4trace:configure.ac:24: -1- m4_pattern_allow([^MGL_AGE$])
+m4trace:configure.ac:26: -1- AM_INIT_AUTOMAKE
+m4trace:configure.ac:26: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
+m4trace:configure.ac:26: -1- AM_AUTOMAKE_VERSION([1.11.1])
+m4trace:configure.ac:26: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.ac:26: -1- AC_SUBST([INSTALL_PROGRAM])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.ac:26: -1- AC_SUBST([INSTALL_SCRIPT])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.ac:26: -1- AC_SUBST([INSTALL_DATA])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([INSTALL_DATA])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.ac:26: -1- AC_SUBST([am__isrc], [' -I$(srcdir)'])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([am__isrc])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^am__isrc$])
+m4trace:configure.ac:26: -1- _AM_SUBST_NOTMAKE([am__isrc])
+m4trace:configure.ac:26: -1- AC_SUBST([CYGPATH_W])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([CYGPATH_W])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^CYGPATH_W$])
+m4trace:configure.ac:26: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([PACKAGE])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:26: -1- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([VERSION])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.ac:26: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:26: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
 @%:@undef PACKAGE])
-m4trace:configure.ac:25: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:25: -1- AH_OUTPUT([VERSION], [/* Version number of package */
+m4trace:configure.ac:26: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.ac:26: -1- AH_OUTPUT([VERSION], [/* Version number of package */
 @%:@undef VERSION])
-m4trace:configure.ac:25: -1- AC_REQUIRE_AUX_FILE([missing])
-m4trace:configure.ac:25: -1- AC_SUBST([ACLOCAL])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([ACLOCAL])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^ACLOCAL$])
-m4trace:configure.ac:25: -1- AC_SUBST([AUTOCONF])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([AUTOCONF])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^AUTOCONF$])
-m4trace:configure.ac:25: -1- AC_SUBST([AUTOMAKE])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([AUTOMAKE])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^AUTOMAKE$])
-m4trace:configure.ac:25: -1- AC_SUBST([AUTOHEADER])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([AUTOHEADER])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^AUTOHEADER$])
-m4trace:configure.ac:25: -1- AC_SUBST([MAKEINFO])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([MAKEINFO])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^MAKEINFO$])
-m4trace:configure.ac:25: -1- AC_SUBST([install_sh])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([install_sh])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^install_sh$])
-m4trace:configure.ac:25: -1- AC_SUBST([STRIP])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([STRIP])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:25: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
-m4trace:configure.ac:25: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.ac:25: -1- AC_SUBST([MKDIR_P])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([MKDIR_P])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^MKDIR_P$])
-m4trace:configure.ac:25: -1- AC_SUBST([mkdir_p], ["$MKDIR_P"])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([mkdir_p])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^mkdir_p$])
-m4trace:configure.ac:25: -1- AC_SUBST([AWK])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([AWK])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^AWK$])
-m4trace:configure.ac:25: -1- AC_SUBST([SET_MAKE])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([SET_MAKE])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.ac:25: -1- AC_SUBST([am__leading_dot])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([am__leading_dot])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^am__leading_dot$])
-m4trace:configure.ac:25: -1- AC_SUBST([AMTAR])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([AMTAR])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^AMTAR$])
-m4trace:configure.ac:25: -1- AC_SUBST([am__tar])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([am__tar])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^am__tar$])
-m4trace:configure.ac:25: -1- AC_SUBST([am__untar])
-m4trace:configure.ac:25: -1- AC_SUBST_TRACE([am__untar])
-m4trace:configure.ac:25: -1- m4_pattern_allow([^am__untar$])
-m4trace:configure.ac:27: -1- AC_SUBST([CC])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:27: -1- AC_SUBST([CFLAGS])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([CFLAGS])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:27: -1- AC_SUBST([LDFLAGS])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([LDFLAGS])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:27: -1- AC_SUBST([LIBS])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([LIBS])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:27: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:27: -1- AC_SUBST([CC])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:27: -1- AC_SUBST([CC])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:27: -1- AC_SUBST([CC])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:27: -1- AC_SUBST([CC])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([CC])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:27: -1- AC_SUBST([ac_ct_CC])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([ac_ct_CC])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^ac_ct_CC$])
-m4trace:configure.ac:27: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([EXEEXT])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^EXEEXT$])
-m4trace:configure.ac:27: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([OBJEXT])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.ac:27: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([DEPDIR])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^DEPDIR$])
-m4trace:configure.ac:27: -1- AC_SUBST([am__include])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([am__include])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^am__include$])
-m4trace:configure.ac:27: -1- AC_SUBST([am__quote])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([am__quote])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^am__quote$])
-m4trace:configure.ac:27: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-m4trace:configure.ac:27: -1- AC_SUBST([AMDEP_TRUE])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([AMDEP_TRUE])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^AMDEP_TRUE$])
-m4trace:configure.ac:27: -1- AC_SUBST([AMDEP_FALSE])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([AMDEP_FALSE])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^AMDEP_FALSE$])
-m4trace:configure.ac:27: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
-m4trace:configure.ac:27: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
-m4trace:configure.ac:27: -1- AC_SUBST([AMDEPBACKSLASH])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
-m4trace:configure.ac:27: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
-m4trace:configure.ac:27: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([CCDEPMODE])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^CCDEPMODE$])
-m4trace:configure.ac:27: -1- AM_CONDITIONAL([am__fastdepCC], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:27: -1- AC_SUBST([am__fastdepCC_TRUE])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
-m4trace:configure.ac:27: -1- AC_SUBST([am__fastdepCC_FALSE])
-m4trace:configure.ac:27: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
-m4trace:configure.ac:27: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
-m4trace:configure.ac:27: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
-m4trace:configure.ac:27: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
-m4trace:configure.ac:28: -1- AC_SUBST([CXX])
-m4trace:configure.ac:28: -1- AC_SUBST_TRACE([CXX])
-m4trace:configure.ac:28: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:28: -1- AC_SUBST([CXXFLAGS])
-m4trace:configure.ac:28: -1- AC_SUBST_TRACE([CXXFLAGS])
-m4trace:configure.ac:28: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:26: -1- AC_REQUIRE_AUX_FILE([missing])
+m4trace:configure.ac:26: -1- AC_SUBST([ACLOCAL])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([ACLOCAL])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^ACLOCAL$])
+m4trace:configure.ac:26: -1- AC_SUBST([AUTOCONF])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([AUTOCONF])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^AUTOCONF$])
+m4trace:configure.ac:26: -1- AC_SUBST([AUTOMAKE])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([AUTOMAKE])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^AUTOMAKE$])
+m4trace:configure.ac:26: -1- AC_SUBST([AUTOHEADER])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([AUTOHEADER])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^AUTOHEADER$])
+m4trace:configure.ac:26: -1- AC_SUBST([MAKEINFO])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([MAKEINFO])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^MAKEINFO$])
+m4trace:configure.ac:26: -1- AC_SUBST([install_sh])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([install_sh])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^install_sh$])
+m4trace:configure.ac:26: -1- AC_SUBST([STRIP])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([STRIP])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:26: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
+m4trace:configure.ac:26: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.ac:26: -1- AC_SUBST([MKDIR_P])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^MKDIR_P$])
+m4trace:configure.ac:26: -1- AC_SUBST([mkdir_p], ["$MKDIR_P"])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([mkdir_p])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^mkdir_p$])
+m4trace:configure.ac:26: -1- AC_SUBST([AWK])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([AWK])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^AWK$])
+m4trace:configure.ac:26: -1- AC_SUBST([SET_MAKE])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([SET_MAKE])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^SET_MAKE$])
+m4trace:configure.ac:26: -1- AC_SUBST([am__leading_dot])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([am__leading_dot])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^am__leading_dot$])
+m4trace:configure.ac:26: -1- AC_SUBST([AMTAR])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([AMTAR])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^AMTAR$])
+m4trace:configure.ac:26: -1- AC_SUBST([am__tar])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([am__tar])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^am__tar$])
+m4trace:configure.ac:26: -1- AC_SUBST([am__untar])
+m4trace:configure.ac:26: -1- AC_SUBST_TRACE([am__untar])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^am__untar$])
+m4trace:configure.ac:28: -1- AC_SUBST([CC])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:28: -1- AC_SUBST([CFLAGS])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([CFLAGS])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^CFLAGS$])
 m4trace:configure.ac:28: -1- AC_SUBST([LDFLAGS])
 m4trace:configure.ac:28: -1- AC_SUBST_TRACE([LDFLAGS])
 m4trace:configure.ac:28: -1- m4_pattern_allow([^LDFLAGS$])
@@ -334,561 +262,670 @@ m4trace:configure.ac:28: -1- m4_pattern_allow([^LIBS$])
 m4trace:configure.ac:28: -1- AC_SUBST([CPPFLAGS])
 m4trace:configure.ac:28: -1- AC_SUBST_TRACE([CPPFLAGS])
 m4trace:configure.ac:28: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:28: -1- AC_SUBST([CXX])
-m4trace:configure.ac:28: -1- AC_SUBST_TRACE([CXX])
-m4trace:configure.ac:28: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:28: -1- AC_SUBST([ac_ct_CXX])
-m4trace:configure.ac:28: -1- AC_SUBST_TRACE([ac_ct_CXX])
-m4trace:configure.ac:28: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:28: -1- AC_SUBST([CXXDEPMODE], [depmode=$am_cv_CXX_dependencies_compiler_type])
-m4trace:configure.ac:28: -1- AC_SUBST_TRACE([CXXDEPMODE])
-m4trace:configure.ac:28: -1- m4_pattern_allow([^CXXDEPMODE$])
-m4trace:configure.ac:28: -1- AM_CONDITIONAL([am__fastdepCXX], [
+m4trace:configure.ac:28: -1- AC_SUBST([CC])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:28: -1- AC_SUBST([CC])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:28: -1- AC_SUBST([CC])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:28: -1- AC_SUBST([CC])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:28: -1- AC_SUBST([ac_ct_CC])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([ac_ct_CC])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:28: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([EXEEXT])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^EXEEXT$])
+m4trace:configure.ac:28: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([OBJEXT])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^OBJEXT$])
+m4trace:configure.ac:28: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([DEPDIR])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^DEPDIR$])
+m4trace:configure.ac:28: -1- AC_SUBST([am__include])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([am__include])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^am__include$])
+m4trace:configure.ac:28: -1- AC_SUBST([am__quote])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([am__quote])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^am__quote$])
+m4trace:configure.ac:28: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+m4trace:configure.ac:28: -1- AC_SUBST([AMDEP_TRUE])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([AMDEP_TRUE])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^AMDEP_TRUE$])
+m4trace:configure.ac:28: -1- AC_SUBST([AMDEP_FALSE])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([AMDEP_FALSE])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^AMDEP_FALSE$])
+m4trace:configure.ac:28: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
+m4trace:configure.ac:28: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
+m4trace:configure.ac:28: -1- AC_SUBST([AMDEPBACKSLASH])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
+m4trace:configure.ac:28: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
+m4trace:configure.ac:28: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([CCDEPMODE])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^CCDEPMODE$])
+m4trace:configure.ac:28: -1- AM_CONDITIONAL([am__fastdepCC], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
+m4trace:configure.ac:28: -1- AC_SUBST([am__fastdepCC_TRUE])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
+m4trace:configure.ac:28: -1- AC_SUBST([am__fastdepCC_FALSE])
+m4trace:configure.ac:28: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
+m4trace:configure.ac:28: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
+m4trace:configure.ac:28: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
+m4trace:configure.ac:28: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
+m4trace:configure.ac:29: -1- AC_SUBST([CXX])
+m4trace:configure.ac:29: -1- AC_SUBST_TRACE([CXX])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:29: -1- AC_SUBST([CXXFLAGS])
+m4trace:configure.ac:29: -1- AC_SUBST_TRACE([CXXFLAGS])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:29: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:29: -1- AC_SUBST_TRACE([LDFLAGS])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:29: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:29: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:29: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:29: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:29: -1- AC_SUBST([CXX])
+m4trace:configure.ac:29: -1- AC_SUBST_TRACE([CXX])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:29: -1- AC_SUBST([ac_ct_CXX])
+m4trace:configure.ac:29: -1- AC_SUBST_TRACE([ac_ct_CXX])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^ac_ct_CXX$])
+m4trace:configure.ac:29: -1- AC_SUBST([CXXDEPMODE], [depmode=$am_cv_CXX_dependencies_compiler_type])
+m4trace:configure.ac:29: -1- AC_SUBST_TRACE([CXXDEPMODE])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^CXXDEPMODE$])
+m4trace:configure.ac:29: -1- AM_CONDITIONAL([am__fastdepCXX], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:28: -1- AC_SUBST([am__fastdepCXX_TRUE])
-m4trace:configure.ac:28: -1- AC_SUBST_TRACE([am__fastdepCXX_TRUE])
-m4trace:configure.ac:28: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
-m4trace:configure.ac:28: -1- AC_SUBST([am__fastdepCXX_FALSE])
-m4trace:configure.ac:28: -1- AC_SUBST_TRACE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:28: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
-m4trace:configure.ac:28: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
-m4trace:configure.ac:28: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:31: -1- _m4_warn([obsolete], [The macro `AC_LIBTOOL_WIN32_DLL' is obsolete.
+m4trace:configure.ac:29: -1- AC_SUBST([am__fastdepCXX_TRUE])
+m4trace:configure.ac:29: -1- AC_SUBST_TRACE([am__fastdepCXX_TRUE])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
+m4trace:configure.ac:29: -1- AC_SUBST([am__fastdepCXX_FALSE])
+m4trace:configure.ac:29: -1- AC_SUBST_TRACE([am__fastdepCXX_FALSE])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
+m4trace:configure.ac:29: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
+m4trace:configure.ac:29: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
+m4trace:configure.ac:32: -1- _m4_warn([obsolete], [The macro `AC_LIBTOOL_WIN32_DLL' is obsolete.
 You should run autoupdate.], [aclocal.m4:7525: AC_LIBTOOL_WIN32_DLL is expanded from...
-configure.ac:31: the top level])
-m4trace:configure.ac:31: -1- AC_CANONICAL_HOST
-m4trace:configure.ac:31: -1- AC_CANONICAL_BUILD
-m4trace:configure.ac:31: -1- AC_REQUIRE_AUX_FILE([config.sub])
-m4trace:configure.ac:31: -1- AC_REQUIRE_AUX_FILE([config.guess])
-m4trace:configure.ac:31: -1- AC_SUBST([build], [$ac_cv_build])
-m4trace:configure.ac:31: -1- AC_SUBST_TRACE([build])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^build$])
-m4trace:configure.ac:31: -1- AC_SUBST([build_cpu], [$[1]])
-m4trace:configure.ac:31: -1- AC_SUBST_TRACE([build_cpu])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^build_cpu$])
-m4trace:configure.ac:31: -1- AC_SUBST([build_vendor], [$[2]])
-m4trace:configure.ac:31: -1- AC_SUBST_TRACE([build_vendor])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^build_vendor$])
-m4trace:configure.ac:31: -1- AC_SUBST([build_os])
-m4trace:configure.ac:31: -1- AC_SUBST_TRACE([build_os])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^build_os$])
-m4trace:configure.ac:31: -1- AC_SUBST([host], [$ac_cv_host])
-m4trace:configure.ac:31: -1- AC_SUBST_TRACE([host])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^host$])
-m4trace:configure.ac:31: -1- AC_SUBST([host_cpu], [$[1]])
-m4trace:configure.ac:31: -1- AC_SUBST_TRACE([host_cpu])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^host_cpu$])
-m4trace:configure.ac:31: -1- AC_SUBST([host_vendor], [$[2]])
-m4trace:configure.ac:31: -1- AC_SUBST_TRACE([host_vendor])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^host_vendor$])
-m4trace:configure.ac:31: -1- AC_SUBST([host_os])
-m4trace:configure.ac:31: -1- AC_SUBST_TRACE([host_os])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^host_os$])
-m4trace:configure.ac:31: -1- AC_SUBST([AS])
-m4trace:configure.ac:31: -1- AC_SUBST_TRACE([AS])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^AS$])
-m4trace:configure.ac:31: -1- AC_SUBST([DLLTOOL])
-m4trace:configure.ac:31: -1- AC_SUBST_TRACE([DLLTOOL])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^DLLTOOL$])
-m4trace:configure.ac:31: -1- AC_SUBST([OBJDUMP])
-m4trace:configure.ac:31: -1- AC_SUBST_TRACE([OBJDUMP])
-m4trace:configure.ac:31: -1- m4_pattern_allow([^OBJDUMP$])
-m4trace:configure.ac:31: -1- _m4_warn([obsolete], [AC_LIBTOOL_WIN32_DLL: Remove this warning and the call to _LT_SET_OPTION when you
+configure.ac:32: the top level])
+m4trace:configure.ac:32: -1- AC_CANONICAL_HOST
+m4trace:configure.ac:32: -1- AC_CANONICAL_BUILD
+m4trace:configure.ac:32: -1- AC_REQUIRE_AUX_FILE([config.sub])
+m4trace:configure.ac:32: -1- AC_REQUIRE_AUX_FILE([config.guess])
+m4trace:configure.ac:32: -1- AC_SUBST([build], [$ac_cv_build])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([build])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^build$])
+m4trace:configure.ac:32: -1- AC_SUBST([build_cpu], [$[1]])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([build_cpu])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^build_cpu$])
+m4trace:configure.ac:32: -1- AC_SUBST([build_vendor], [$[2]])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([build_vendor])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^build_vendor$])
+m4trace:configure.ac:32: -1- AC_SUBST([build_os])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([build_os])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^build_os$])
+m4trace:configure.ac:32: -1- AC_SUBST([host], [$ac_cv_host])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([host])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^host$])
+m4trace:configure.ac:32: -1- AC_SUBST([host_cpu], [$[1]])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([host_cpu])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^host_cpu$])
+m4trace:configure.ac:32: -1- AC_SUBST([host_vendor], [$[2]])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([host_vendor])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^host_vendor$])
+m4trace:configure.ac:32: -1- AC_SUBST([host_os])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([host_os])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^host_os$])
+m4trace:configure.ac:32: -1- AC_SUBST([AS])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([AS])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^AS$])
+m4trace:configure.ac:32: -1- AC_SUBST([DLLTOOL])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([DLLTOOL])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^DLLTOOL$])
+m4trace:configure.ac:32: -1- AC_SUBST([OBJDUMP])
+m4trace:configure.ac:32: -1- AC_SUBST_TRACE([OBJDUMP])
+m4trace:configure.ac:32: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:32: -1- _m4_warn([obsolete], [AC_LIBTOOL_WIN32_DLL: Remove this warning and the call to _LT_SET_OPTION when you
 put the `win32-dll' option into LT_INIT's first parameter.], [aclocal.m4:7525: AC_LIBTOOL_WIN32_DLL is expanded from...
-configure.ac:31: the top level])
-m4trace:configure.ac:32: -1- _m4_warn([obsolete], [The macro `AC_LIBTOOL_DLOPEN' is obsolete.
-You should run autoupdate.], [aclocal.m4:7490: AC_LIBTOOL_DLOPEN is expanded from...
 configure.ac:32: the top level])
-m4trace:configure.ac:32: -1- _m4_warn([obsolete], [AC_LIBTOOL_DLOPEN: Remove this warning and the call to _LT_SET_OPTION when you
+m4trace:configure.ac:33: -1- _m4_warn([obsolete], [The macro `AC_LIBTOOL_DLOPEN' is obsolete.
+You should run autoupdate.], [aclocal.m4:7490: AC_LIBTOOL_DLOPEN is expanded from...
+configure.ac:33: the top level])
+m4trace:configure.ac:33: -1- _m4_warn([obsolete], [AC_LIBTOOL_DLOPEN: Remove this warning and the call to _LT_SET_OPTION when you
 put the `dlopen' option into LT_INIT's first parameter.], [aclocal.m4:7490: AC_LIBTOOL_DLOPEN is expanded from...
-configure.ac:32: the top level])
-m4trace:configure.ac:33: -1- AC_PROG_LIBTOOL
-m4trace:configure.ac:33: -1- _m4_warn([obsolete], [The macro `AC_PROG_LIBTOOL' is obsolete.
-You should run autoupdate.], [aclocal.m4:123: AC_PROG_LIBTOOL is expanded from...
 configure.ac:33: the top level])
-m4trace:configure.ac:33: -1- LT_INIT
-m4trace:configure.ac:33: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
-m4trace:configure.ac:33: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
-m4trace:configure.ac:33: -1- AC_SUBST([LIBTOOL])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([LIBTOOL])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LIBTOOL$])
-m4trace:configure.ac:33: -1- AC_SUBST([SED])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([SED])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^SED$])
-m4trace:configure.ac:33: -1- AC_SUBST([GREP])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([GREP])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:33: -1- AC_SUBST([EGREP])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([EGREP])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^EGREP$])
-m4trace:configure.ac:33: -1- AC_SUBST([FGREP])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([FGREP])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^FGREP$])
-m4trace:configure.ac:33: -1- AC_SUBST([GREP])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([GREP])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:33: -1- AC_SUBST([LD])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([LD])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LD$])
-m4trace:configure.ac:33: -1- AC_SUBST([DUMPBIN])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([DUMPBIN])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^DUMPBIN$])
-m4trace:configure.ac:33: -1- AC_SUBST([ac_ct_DUMPBIN])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([ac_ct_DUMPBIN])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
-m4trace:configure.ac:33: -1- AC_SUBST([DUMPBIN])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([DUMPBIN])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^DUMPBIN$])
-m4trace:configure.ac:33: -1- AC_SUBST([NM])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([NM])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^NM$])
-m4trace:configure.ac:33: -1- AC_SUBST([LN_S], [$as_ln_s])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([LN_S])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LN_S$])
-m4trace:configure.ac:33: -1- AC_SUBST([OBJDUMP])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([OBJDUMP])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^OBJDUMP$])
-m4trace:configure.ac:33: -1- AC_SUBST([OBJDUMP])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([OBJDUMP])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^OBJDUMP$])
-m4trace:configure.ac:33: -1- AC_SUBST([AR])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([AR])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^AR$])
-m4trace:configure.ac:33: -1- AC_SUBST([STRIP])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([STRIP])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:33: -1- AC_SUBST([RANLIB])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([RANLIB])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^RANLIB$])
-m4trace:configure.ac:33: -1- m4_pattern_allow([LT_OBJDIR])
-m4trace:configure.ac:33: -1- AC_DEFINE_TRACE_LITERAL([LT_OBJDIR])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LT_OBJDIR$])
-m4trace:configure.ac:33: -1- AH_OUTPUT([LT_OBJDIR], [/* Define to the sub-directory in which libtool stores uninstalled libraries.
+m4trace:configure.ac:34: -1- AC_PROG_LIBTOOL
+m4trace:configure.ac:34: -1- _m4_warn([obsolete], [The macro `AC_PROG_LIBTOOL' is obsolete.
+You should run autoupdate.], [aclocal.m4:123: AC_PROG_LIBTOOL is expanded from...
+configure.ac:34: the top level])
+m4trace:configure.ac:34: -1- LT_INIT
+m4trace:configure.ac:34: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
+m4trace:configure.ac:34: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
+m4trace:configure.ac:34: -1- AC_SUBST([LIBTOOL])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([LIBTOOL])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^LIBTOOL$])
+m4trace:configure.ac:34: -1- AC_SUBST([SED])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([SED])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^SED$])
+m4trace:configure.ac:34: -1- AC_SUBST([GREP])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([GREP])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:34: -1- AC_SUBST([EGREP])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([EGREP])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:34: -1- AC_SUBST([FGREP])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([FGREP])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^FGREP$])
+m4trace:configure.ac:34: -1- AC_SUBST([GREP])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([GREP])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:34: -1- AC_SUBST([LD])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([LD])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^LD$])
+m4trace:configure.ac:34: -1- AC_SUBST([DUMPBIN])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([DUMPBIN])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^DUMPBIN$])
+m4trace:configure.ac:34: -1- AC_SUBST([ac_ct_DUMPBIN])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([ac_ct_DUMPBIN])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
+m4trace:configure.ac:34: -1- AC_SUBST([DUMPBIN])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([DUMPBIN])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^DUMPBIN$])
+m4trace:configure.ac:34: -1- AC_SUBST([NM])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([NM])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^NM$])
+m4trace:configure.ac:34: -1- AC_SUBST([LN_S], [$as_ln_s])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([LN_S])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^LN_S$])
+m4trace:configure.ac:34: -1- AC_SUBST([OBJDUMP])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([OBJDUMP])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:34: -1- AC_SUBST([OBJDUMP])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([OBJDUMP])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:34: -1- AC_SUBST([AR])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([AR])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^AR$])
+m4trace:configure.ac:34: -1- AC_SUBST([STRIP])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([STRIP])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:34: -1- AC_SUBST([RANLIB])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([RANLIB])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^RANLIB$])
+m4trace:configure.ac:34: -1- m4_pattern_allow([LT_OBJDIR])
+m4trace:configure.ac:34: -1- AC_DEFINE_TRACE_LITERAL([LT_OBJDIR])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^LT_OBJDIR$])
+m4trace:configure.ac:34: -1- AH_OUTPUT([LT_OBJDIR], [/* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 @%:@undef LT_OBJDIR])
-m4trace:configure.ac:33: -1- AC_SUBST([lt_ECHO])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([lt_ECHO])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^lt_ECHO$])
-m4trace:configure.ac:33: -1- LT_SUPPORTED_TAG([CC])
-m4trace:configure.ac:33: -1- AC_SUBST([DSYMUTIL])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([DSYMUTIL])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^DSYMUTIL$])
-m4trace:configure.ac:33: -1- AC_SUBST([NMEDIT])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([NMEDIT])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^NMEDIT$])
-m4trace:configure.ac:33: -1- AC_SUBST([LIPO])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([LIPO])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LIPO$])
-m4trace:configure.ac:33: -1- AC_SUBST([OTOOL])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([OTOOL])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^OTOOL$])
-m4trace:configure.ac:33: -1- AC_SUBST([OTOOL64])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([OTOOL64])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^OTOOL64$])
-m4trace:configure.ac:33: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the <dlfcn.h> header file. */
+m4trace:configure.ac:34: -1- AC_SUBST([lt_ECHO])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([lt_ECHO])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^lt_ECHO$])
+m4trace:configure.ac:34: -1- LT_SUPPORTED_TAG([CC])
+m4trace:configure.ac:34: -1- AC_SUBST([DSYMUTIL])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([DSYMUTIL])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^DSYMUTIL$])
+m4trace:configure.ac:34: -1- AC_SUBST([NMEDIT])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([NMEDIT])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^NMEDIT$])
+m4trace:configure.ac:34: -1- AC_SUBST([LIPO])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([LIPO])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^LIPO$])
+m4trace:configure.ac:34: -1- AC_SUBST([OTOOL])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([OTOOL])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^OTOOL$])
+m4trace:configure.ac:34: -1- AC_SUBST([OTOOL64])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([OTOOL64])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^OTOOL64$])
+m4trace:configure.ac:34: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the <dlfcn.h> header file. */
 @%:@undef HAVE_DLFCN_H])
-m4trace:configure.ac:33: -1- AC_SUBST([CPP])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CPP])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:33: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:33: -1- AC_SUBST([CPP])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CPP])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:33: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:33: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
+m4trace:configure.ac:34: -1- AC_SUBST([CPP])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CPP])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:34: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:34: -1- AC_SUBST([CPP])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CPP])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:34: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:34: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
 @%:@undef STDC_HEADERS])
-m4trace:configure.ac:33: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
+m4trace:configure.ac:34: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
 @%:@undef HAVE_SYS_TYPES_H])
-m4trace:configure.ac:33: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
+m4trace:configure.ac:34: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
 @%:@undef HAVE_SYS_STAT_H])
-m4trace:configure.ac:33: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
+m4trace:configure.ac:34: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
 @%:@undef HAVE_STDLIB_H])
-m4trace:configure.ac:33: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
+m4trace:configure.ac:34: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
 @%:@undef HAVE_STRING_H])
-m4trace:configure.ac:33: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
+m4trace:configure.ac:34: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
 @%:@undef HAVE_MEMORY_H])
-m4trace:configure.ac:33: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
+m4trace:configure.ac:34: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
 @%:@undef HAVE_STRINGS_H])
-m4trace:configure.ac:33: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+m4trace:configure.ac:34: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
 @%:@undef HAVE_INTTYPES_H])
-m4trace:configure.ac:33: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+m4trace:configure.ac:34: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
 @%:@undef HAVE_STDINT_H])
-m4trace:configure.ac:33: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
+m4trace:configure.ac:34: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
 @%:@undef HAVE_UNISTD_H])
-m4trace:configure.ac:33: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DLFCN_H])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
-m4trace:configure.ac:33: -1- LT_SUPPORTED_TAG([CXX])
-m4trace:configure.ac:33: -1- AC_SUBST([CXX])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CXX])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:33: -1- AC_SUBST([CXXFLAGS])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CXXFLAGS])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:33: -1- AC_SUBST([LDFLAGS])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([LDFLAGS])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:33: -1- AC_SUBST([LIBS])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([LIBS])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:33: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:33: -1- AC_SUBST([CXX])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CXX])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:33: -1- AC_SUBST([ac_ct_CXX])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([ac_ct_CXX])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:33: -1- AC_SUBST([CXXDEPMODE], [depmode=$am_cv_CXX_dependencies_compiler_type])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CXXDEPMODE])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CXXDEPMODE$])
-m4trace:configure.ac:33: -1- AM_CONDITIONAL([am__fastdepCXX], [
+m4trace:configure.ac:34: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DLFCN_H])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
+m4trace:configure.ac:34: -1- LT_SUPPORTED_TAG([CXX])
+m4trace:configure.ac:34: -1- AC_SUBST([CXX])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CXX])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:34: -1- AC_SUBST([CXXFLAGS])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CXXFLAGS])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:34: -1- AC_SUBST([LDFLAGS])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([LDFLAGS])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:34: -1- AC_SUBST([LIBS])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:34: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:34: -1- AC_SUBST([CXX])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CXX])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:34: -1- AC_SUBST([ac_ct_CXX])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([ac_ct_CXX])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^ac_ct_CXX$])
+m4trace:configure.ac:34: -1- AC_SUBST([CXXDEPMODE], [depmode=$am_cv_CXX_dependencies_compiler_type])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CXXDEPMODE])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CXXDEPMODE$])
+m4trace:configure.ac:34: -1- AM_CONDITIONAL([am__fastdepCXX], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:33: -1- AC_SUBST([am__fastdepCXX_TRUE])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([am__fastdepCXX_TRUE])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
-m4trace:configure.ac:33: -1- AC_SUBST([am__fastdepCXX_FALSE])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
-m4trace:configure.ac:33: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
-m4trace:configure.ac:33: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:33: -1- AC_SUBST([CXXCPP])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CXXCPP])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:33: -1- AC_SUBST([CPPFLAGS])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CPPFLAGS])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:33: -1- AC_SUBST([CXXCPP])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([CXXCPP])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:33: -1- AC_SUBST([LD])
-m4trace:configure.ac:33: -1- AC_SUBST_TRACE([LD])
-m4trace:configure.ac:33: -1- m4_pattern_allow([^LD$])
-m4trace:configure.ac:44: -1- AC_DEFINE_TRACE_LITERAL([MGL_USE_DOUBLE])
-m4trace:configure.ac:44: -1- m4_pattern_allow([^MGL_USE_DOUBLE$])
-m4trace:configure.ac:44: -1- AH_OUTPUT([MGL_USE_DOUBLE], [/* This define enables double precision in MathGL */
+m4trace:configure.ac:34: -1- AC_SUBST([am__fastdepCXX_TRUE])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([am__fastdepCXX_TRUE])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
+m4trace:configure.ac:34: -1- AC_SUBST([am__fastdepCXX_FALSE])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([am__fastdepCXX_FALSE])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
+m4trace:configure.ac:34: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
+m4trace:configure.ac:34: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
+m4trace:configure.ac:34: -1- AC_SUBST([CXXCPP])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CXXCPP])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:34: -1- AC_SUBST([CPPFLAGS])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CPPFLAGS])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:34: -1- AC_SUBST([CXXCPP])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CXXCPP])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:34: -1- AC_SUBST([LD])
+m4trace:configure.ac:34: -1- AC_SUBST_TRACE([LD])
+m4trace:configure.ac:34: -1- m4_pattern_allow([^LD$])
+m4trace:configure.ac:45: -1- AC_DEFINE_TRACE_LITERAL([MGL_USE_DOUBLE])
+m4trace:configure.ac:45: -1- m4_pattern_allow([^MGL_USE_DOUBLE$])
+m4trace:configure.ac:45: -1- AH_OUTPUT([MGL_USE_DOUBLE], [/* This define enables double precision in MathGL */
 @%:@undef MGL_USE_DOUBLE])
-m4trace:configure.ac:46: -1- AC_DEFINE_TRACE_LITERAL([MGL_USE_DOUBLE])
-m4trace:configure.ac:46: -1- m4_pattern_allow([^MGL_USE_DOUBLE$])
-m4trace:configure.ac:46: -1- AH_OUTPUT([MGL_USE_DOUBLE], [/* This define enables double precision in MathGL */
+m4trace:configure.ac:47: -1- AC_DEFINE_TRACE_LITERAL([MGL_USE_DOUBLE])
+m4trace:configure.ac:47: -1- m4_pattern_allow([^MGL_USE_DOUBLE$])
+m4trace:configure.ac:47: -1- AH_OUTPUT([MGL_USE_DOUBLE], [/* This define enables double precision in MathGL */
 @%:@undef MGL_USE_DOUBLE])
-m4trace:configure.ac:72: -1- AC_SUBST([PTHREAD_FLAGS])
-m4trace:configure.ac:72: -1- AC_SUBST_TRACE([PTHREAD_FLAGS])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^PTHREAD_FLAGS$])
-m4trace:configure.ac:75: -1- AC_SUBST([PTHREAD_LIBS])
-m4trace:configure.ac:75: -1- AC_SUBST_TRACE([PTHREAD_LIBS])
-m4trace:configure.ac:75: -1- m4_pattern_allow([^PTHREAD_LIBS$])
-m4trace:configure.ac:77: -1- AM_CONDITIONAL([USE_PTHREAD], [test x$pthread = xtrue])
-m4trace:configure.ac:77: -1- AC_SUBST([USE_PTHREAD_TRUE])
-m4trace:configure.ac:77: -1- AC_SUBST_TRACE([USE_PTHREAD_TRUE])
-m4trace:configure.ac:77: -1- m4_pattern_allow([^USE_PTHREAD_TRUE$])
-m4trace:configure.ac:77: -1- AC_SUBST([USE_PTHREAD_FALSE])
-m4trace:configure.ac:77: -1- AC_SUBST_TRACE([USE_PTHREAD_FALSE])
-m4trace:configure.ac:77: -1- m4_pattern_allow([^USE_PTHREAD_FALSE$])
-m4trace:configure.ac:77: -1- _AM_SUBST_NOTMAKE([USE_PTHREAD_TRUE])
-m4trace:configure.ac:77: -1- _AM_SUBST_NOTMAKE([USE_PTHREAD_FALSE])
-m4trace:configure.ac:89: -1- AC_SUBST([GSL_FLAGS])
-m4trace:configure.ac:89: -1- AC_SUBST_TRACE([GSL_FLAGS])
-m4trace:configure.ac:89: -1- m4_pattern_allow([^GSL_FLAGS$])
-m4trace:configure.ac:90: -1- AC_SUBST([GSL_LIBS])
-m4trace:configure.ac:90: -1- AC_SUBST_TRACE([GSL_LIBS])
-m4trace:configure.ac:90: -1- m4_pattern_allow([^GSL_LIBS$])
-m4trace:configure.ac:100: -1- AC_SUBST([GSL_FLAGS])
-m4trace:configure.ac:100: -1- AC_SUBST_TRACE([GSL_FLAGS])
-m4trace:configure.ac:100: -1- m4_pattern_allow([^GSL_FLAGS$])
-m4trace:configure.ac:102: -1- AM_CONDITIONAL([USE_GSL], [test x$test_gsl = xtrue])
-m4trace:configure.ac:102: -1- AC_SUBST([USE_GSL_TRUE])
-m4trace:configure.ac:102: -1- AC_SUBST_TRACE([USE_GSL_TRUE])
-m4trace:configure.ac:102: -1- m4_pattern_allow([^USE_GSL_TRUE$])
-m4trace:configure.ac:102: -1- AC_SUBST([USE_GSL_FALSE])
-m4trace:configure.ac:102: -1- AC_SUBST_TRACE([USE_GSL_FALSE])
-m4trace:configure.ac:102: -1- m4_pattern_allow([^USE_GSL_FALSE$])
-m4trace:configure.ac:102: -1- _AM_SUBST_NOTMAKE([USE_GSL_TRUE])
-m4trace:configure.ac:102: -1- _AM_SUBST_NOTMAKE([USE_GSL_FALSE])
-m4trace:configure.ac:115: -1- AC_SUBST([GL_LIBS])
-m4trace:configure.ac:115: -1- AC_SUBST_TRACE([GL_LIBS])
-m4trace:configure.ac:115: -1- m4_pattern_allow([^GL_LIBS$])
-m4trace:configure.ac:118: -1- AC_SUBST([GLUT_LIBS])
-m4trace:configure.ac:118: -1- AC_SUBST_TRACE([GLUT_LIBS])
-m4trace:configure.ac:118: -1- m4_pattern_allow([^GLUT_LIBS$])
-m4trace:configure.ac:125: -1- AC_SUBST([GL_LIBS])
-m4trace:configure.ac:125: -1- AC_SUBST_TRACE([GL_LIBS])
-m4trace:configure.ac:125: -1- m4_pattern_allow([^GL_LIBS$])
-m4trace:configure.ac:128: -1- AC_SUBST([GLUT_FLAGS])
-m4trace:configure.ac:128: -1- AC_SUBST_TRACE([GLUT_FLAGS])
-m4trace:configure.ac:128: -1- m4_pattern_allow([^GLUT_FLAGS$])
-m4trace:configure.ac:130: -1- AC_SUBST([GLUT_LIBS])
-m4trace:configure.ac:130: -1- AC_SUBST_TRACE([GLUT_LIBS])
-m4trace:configure.ac:130: -1- m4_pattern_allow([^GLUT_LIBS$])
-m4trace:configure.ac:137: -1- AC_SUBST([GL_LIBS])
-m4trace:configure.ac:137: -1- AC_SUBST_TRACE([GL_LIBS])
-m4trace:configure.ac:137: -1- m4_pattern_allow([^GL_LIBS$])
-m4trace:configure.ac:140: -1- AC_SUBST([GLUT_FLAGS])
-m4trace:configure.ac:140: -1- AC_SUBST_TRACE([GLUT_FLAGS])
-m4trace:configure.ac:140: -1- m4_pattern_allow([^GLUT_FLAGS$])
-m4trace:configure.ac:142: -1- AC_SUBST([GLUT_LIBS])
-m4trace:configure.ac:142: -1- AC_SUBST_TRACE([GLUT_LIBS])
-m4trace:configure.ac:142: -1- m4_pattern_allow([^GLUT_LIBS$])
-m4trace:configure.ac:147: -1- AM_CONDITIONAL([USE_GLUT], [(test x$all = xtrue || test x$glut = xtrue)])
-m4trace:configure.ac:147: -1- AC_SUBST([USE_GLUT_TRUE])
-m4trace:configure.ac:147: -1- AC_SUBST_TRACE([USE_GLUT_TRUE])
-m4trace:configure.ac:147: -1- m4_pattern_allow([^USE_GLUT_TRUE$])
-m4trace:configure.ac:147: -1- AC_SUBST([USE_GLUT_FALSE])
-m4trace:configure.ac:147: -1- AC_SUBST_TRACE([USE_GLUT_FALSE])
-m4trace:configure.ac:147: -1- m4_pattern_allow([^USE_GLUT_FALSE$])
-m4trace:configure.ac:147: -1- _AM_SUBST_NOTMAKE([USE_GLUT_TRUE])
-m4trace:configure.ac:147: -1- _AM_SUBST_NOTMAKE([USE_GLUT_FALSE])
-m4trace:configure.ac:177: -1- AC_SUBST([HDF5_FLAGS])
-m4trace:configure.ac:177: -1- AC_SUBST_TRACE([HDF5_FLAGS])
-m4trace:configure.ac:177: -1- m4_pattern_allow([^HDF5_FLAGS$])
-m4trace:configure.ac:179: -1- AC_SUBST([HDF5_LIBS])
-m4trace:configure.ac:179: -1- AC_SUBST_TRACE([HDF5_LIBS])
-m4trace:configure.ac:179: -1- m4_pattern_allow([^HDF5_LIBS$])
-m4trace:configure.ac:181: -1- AM_CONDITIONAL([USE_HDF5], [(test x$all = xtrue || test x$hdf5 = xtrue || test x$hdf5_18 = xtrue)])
-m4trace:configure.ac:181: -1- AC_SUBST([USE_HDF5_TRUE])
-m4trace:configure.ac:181: -1- AC_SUBST_TRACE([USE_HDF5_TRUE])
-m4trace:configure.ac:181: -1- m4_pattern_allow([^USE_HDF5_TRUE$])
-m4trace:configure.ac:181: -1- AC_SUBST([USE_HDF5_FALSE])
-m4trace:configure.ac:181: -1- AC_SUBST_TRACE([USE_HDF5_FALSE])
-m4trace:configure.ac:181: -1- m4_pattern_allow([^USE_HDF5_FALSE$])
-m4trace:configure.ac:181: -1- _AM_SUBST_NOTMAKE([USE_HDF5_TRUE])
-m4trace:configure.ac:181: -1- _AM_SUBST_NOTMAKE([USE_HDF5_FALSE])
-m4trace:configure.ac:193: -1- AC_SUBST([HDF4_FLAGS])
-m4trace:configure.ac:193: -1- AC_SUBST_TRACE([HDF4_FLAGS])
-m4trace:configure.ac:193: -1- m4_pattern_allow([^HDF4_FLAGS$])
-m4trace:configure.ac:194: -1- AC_SUBST([HDF4_LIBS])
-m4trace:configure.ac:194: -1- AC_SUBST_TRACE([HDF4_LIBS])
-m4trace:configure.ac:194: -1- m4_pattern_allow([^HDF4_LIBS$])
-m4trace:configure.ac:196: -1- AM_CONDITIONAL([USE_HDF4], [(test x$all = xtrue || test x$hdf4 = xtrue)])
-m4trace:configure.ac:196: -1- AC_SUBST([USE_HDF4_TRUE])
-m4trace:configure.ac:196: -1- AC_SUBST_TRACE([USE_HDF4_TRUE])
-m4trace:configure.ac:196: -1- m4_pattern_allow([^USE_HDF4_TRUE$])
-m4trace:configure.ac:196: -1- AC_SUBST([USE_HDF4_FALSE])
-m4trace:configure.ac:196: -1- AC_SUBST_TRACE([USE_HDF4_FALSE])
-m4trace:configure.ac:196: -1- m4_pattern_allow([^USE_HDF4_FALSE$])
-m4trace:configure.ac:196: -1- _AM_SUBST_NOTMAKE([USE_HDF4_TRUE])
-m4trace:configure.ac:196: -1- _AM_SUBST_NOTMAKE([USE_HDF4_FALSE])
-m4trace:configure.ac:205: -1- AC_SUBST([GIF_FLAGS])
-m4trace:configure.ac:205: -1- AC_SUBST_TRACE([GIF_FLAGS])
-m4trace:configure.ac:205: -1- m4_pattern_allow([^GIF_FLAGS$])
-m4trace:configure.ac:208: -1- AC_SUBST([GIF_LIBS])
-m4trace:configure.ac:208: -1- AC_SUBST_TRACE([GIF_LIBS])
-m4trace:configure.ac:208: -1- m4_pattern_allow([^GIF_LIBS$])
-m4trace:configure.ac:210: -1- AM_CONDITIONAL([USE_GIF], [(test x$all = xtrue || test x$gif = xtrue)])
-m4trace:configure.ac:210: -1- AC_SUBST([USE_GIF_TRUE])
-m4trace:configure.ac:210: -1- AC_SUBST_TRACE([USE_GIF_TRUE])
-m4trace:configure.ac:210: -1- m4_pattern_allow([^USE_GIF_TRUE$])
-m4trace:configure.ac:210: -1- AC_SUBST([USE_GIF_FALSE])
-m4trace:configure.ac:210: -1- AC_SUBST_TRACE([USE_GIF_FALSE])
-m4trace:configure.ac:210: -1- m4_pattern_allow([^USE_GIF_FALSE$])
-m4trace:configure.ac:210: -1- _AM_SUBST_NOTMAKE([USE_GIF_TRUE])
-m4trace:configure.ac:210: -1- _AM_SUBST_NOTMAKE([USE_GIF_FALSE])
-m4trace:configure.ac:214: -1- AC_SUBST([PNG_LIBS])
-m4trace:configure.ac:214: -1- AC_SUBST_TRACE([PNG_LIBS])
-m4trace:configure.ac:214: -1- m4_pattern_allow([^PNG_LIBS$])
-m4trace:configure.ac:224: -1- AC_SUBST([JPEG_FLAGS])
-m4trace:configure.ac:224: -1- AC_SUBST_TRACE([JPEG_FLAGS])
-m4trace:configure.ac:224: -1- m4_pattern_allow([^JPEG_FLAGS$])
-m4trace:configure.ac:227: -1- AC_SUBST([JPEG_LIBS])
-m4trace:configure.ac:227: -1- AC_SUBST_TRACE([JPEG_LIBS])
-m4trace:configure.ac:227: -1- m4_pattern_allow([^JPEG_LIBS$])
-m4trace:configure.ac:229: -1- AM_CONDITIONAL([USE_JPEG], [(test x$all = xtrue || test x$jpeg = xtrue)])
-m4trace:configure.ac:229: -1- AC_SUBST([USE_JPEG_TRUE])
-m4trace:configure.ac:229: -1- AC_SUBST_TRACE([USE_JPEG_TRUE])
-m4trace:configure.ac:229: -1- m4_pattern_allow([^USE_JPEG_TRUE$])
-m4trace:configure.ac:229: -1- AC_SUBST([USE_JPEG_FALSE])
-m4trace:configure.ac:229: -1- AC_SUBST_TRACE([USE_JPEG_FALSE])
-m4trace:configure.ac:229: -1- m4_pattern_allow([^USE_JPEG_FALSE$])
-m4trace:configure.ac:229: -1- _AM_SUBST_NOTMAKE([USE_JPEG_TRUE])
-m4trace:configure.ac:229: -1- _AM_SUBST_NOTMAKE([USE_JPEG_FALSE])
-m4trace:configure.ac:240: -1- AC_SUBST([FLTK_FLAGS])
-m4trace:configure.ac:240: -1- AC_SUBST_TRACE([FLTK_FLAGS])
-m4trace:configure.ac:240: -1- m4_pattern_allow([^FLTK_FLAGS$])
-m4trace:configure.ac:241: -1- AC_SUBST([FLTK_LIBS])
-m4trace:configure.ac:241: -1- AC_SUBST_TRACE([FLTK_LIBS])
-m4trace:configure.ac:241: -1- m4_pattern_allow([^FLTK_LIBS$])
-m4trace:configure.ac:250: -1- AM_CONDITIONAL([USE_FLTK], [test x$test_fltk = xtrue])
-m4trace:configure.ac:250: -1- AC_SUBST([USE_FLTK_TRUE])
-m4trace:configure.ac:250: -1- AC_SUBST_TRACE([USE_FLTK_TRUE])
-m4trace:configure.ac:250: -1- m4_pattern_allow([^USE_FLTK_TRUE$])
-m4trace:configure.ac:250: -1- AC_SUBST([USE_FLTK_FALSE])
-m4trace:configure.ac:250: -1- AC_SUBST_TRACE([USE_FLTK_FALSE])
-m4trace:configure.ac:250: -1- m4_pattern_allow([^USE_FLTK_FALSE$])
-m4trace:configure.ac:250: -1- _AM_SUBST_NOTMAKE([USE_FLTK_TRUE])
-m4trace:configure.ac:250: -1- _AM_SUBST_NOTMAKE([USE_FLTK_FALSE])
-m4trace:configure.ac:262: -1- AC_SUBST([WX_FLAGS])
-m4trace:configure.ac:262: -1- AC_SUBST_TRACE([WX_FLAGS])
-m4trace:configure.ac:262: -1- m4_pattern_allow([^WX_FLAGS$])
-m4trace:configure.ac:263: -1- AC_SUBST([WX_LIBS])
-m4trace:configure.ac:263: -1- AC_SUBST_TRACE([WX_LIBS])
-m4trace:configure.ac:263: -1- m4_pattern_allow([^WX_LIBS$])
-m4trace:configure.ac:272: -1- AM_CONDITIONAL([USE_WX], [test x$test_wx = xtrue])
-m4trace:configure.ac:272: -1- AC_SUBST([USE_WX_TRUE])
-m4trace:configure.ac:272: -1- AC_SUBST_TRACE([USE_WX_TRUE])
-m4trace:configure.ac:272: -1- m4_pattern_allow([^USE_WX_TRUE$])
-m4trace:configure.ac:272: -1- AC_SUBST([USE_WX_FALSE])
-m4trace:configure.ac:272: -1- AC_SUBST_TRACE([USE_WX_FALSE])
-m4trace:configure.ac:272: -1- m4_pattern_allow([^USE_WX_FALSE$])
-m4trace:configure.ac:272: -1- _AM_SUBST_NOTMAKE([USE_WX_TRUE])
-m4trace:configure.ac:272: -1- _AM_SUBST_NOTMAKE([USE_WX_FALSE])
-m4trace:configure.ac:282: -1- AC_SUBST([QMAKE])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([QMAKE])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QMAKE$])
-m4trace:configure.ac:282: -1- AC_SUBST([QMAKE])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([QMAKE])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QMAKE$])
-m4trace:configure.ac:282: -1- AC_SUBST([MOC])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([MOC])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^MOC$])
-m4trace:configure.ac:282: -1- AC_SUBST([MOC])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([MOC])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^MOC$])
-m4trace:configure.ac:282: -1- AC_SUBST([UIC])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([UIC])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^UIC$])
-m4trace:configure.ac:282: -1- AC_SUBST([UIC])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([UIC])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^UIC$])
-m4trace:configure.ac:282: -1- AC_SUBST([RCC])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([RCC])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^RCC$])
-m4trace:configure.ac:282: -1- AC_SUBST([RCC])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([RCC])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^RCC$])
-m4trace:configure.ac:282: -1- AC_SUBST([QT_PATH])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([QT_PATH])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_PATH$])
-m4trace:configure.ac:282: -1- AC_SUBST([TMPDIR])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([TMPDIR])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^TMPDIR$])
-m4trace:configure.ac:282: -1- AC_SUBST([QT_VERSION_MAJOR])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([QT_VERSION_MAJOR])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_VERSION_MAJOR$])
-m4trace:configure.ac:282: -1- AC_SUBST([QT_DEFINES], [$at_cv_env_QT_DEFINES])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([QT_DEFINES])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_DEFINES$])
-m4trace:configure.ac:282: -1- AC_SUBST([QT_CFLAGS], [$at_cv_env_QT_CFLAGS])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([QT_CFLAGS])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_CFLAGS$])
-m4trace:configure.ac:282: -1- AC_SUBST([QT_CXXFLAGS], [$at_cv_env_QT_CXXFLAGS])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([QT_CXXFLAGS])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_CXXFLAGS$])
-m4trace:configure.ac:282: -1- AC_SUBST([QT_INCPATH], [$at_cv_env_QT_INCPATH])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([QT_INCPATH])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_INCPATH$])
-m4trace:configure.ac:282: -1- AC_SUBST([QT_CPPFLAGS], ["$at_cv_env_QT_DEFINES $at_cv_env_QT_INCPATH"])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([QT_CPPFLAGS])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_CPPFLAGS$])
-m4trace:configure.ac:282: -1- AC_SUBST([QT_LFLAGS], [$at_cv_env_QT_LDFLAGS])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([QT_LFLAGS])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_LFLAGS$])
-m4trace:configure.ac:282: -1- AC_SUBST([QT_LDFLAGS], [$at_cv_env_QT_LDFLAGS])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([QT_LDFLAGS])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_LDFLAGS$])
-m4trace:configure.ac:282: -1- AC_SUBST([QT_LIBS], [$at_cv_env_QT_LIBS])
-m4trace:configure.ac:282: -1- AC_SUBST_TRACE([QT_LIBS])
-m4trace:configure.ac:282: -1- m4_pattern_allow([^QT_LIBS$])
-m4trace:configure.ac:283: -1- AC_SUBST([QT_VERSION], [$at_cv_QT_VERSION])
-m4trace:configure.ac:283: -1- AC_SUBST_TRACE([QT_VERSION])
-m4trace:configure.ac:283: -1- m4_pattern_allow([^QT_VERSION$])
-m4trace:configure.ac:286: -1- AM_CONDITIONAL([USE_QT], [test x$test_qt = xtrue])
-m4trace:configure.ac:286: -1- AC_SUBST([USE_QT_TRUE])
-m4trace:configure.ac:286: -1- AC_SUBST_TRACE([USE_QT_TRUE])
-m4trace:configure.ac:286: -1- m4_pattern_allow([^USE_QT_TRUE$])
-m4trace:configure.ac:286: -1- AC_SUBST([USE_QT_FALSE])
-m4trace:configure.ac:286: -1- AC_SUBST_TRACE([USE_QT_FALSE])
-m4trace:configure.ac:286: -1- m4_pattern_allow([^USE_QT_FALSE$])
-m4trace:configure.ac:286: -1- _AM_SUBST_NOTMAKE([USE_QT_TRUE])
-m4trace:configure.ac:286: -1- _AM_SUBST_NOTMAKE([USE_QT_FALSE])
-m4trace:configure.ac:296: -1- AC_SUBST([PYTHON_HEADERS])
-m4trace:configure.ac:296: -1- AC_SUBST_TRACE([PYTHON_HEADERS])
-m4trace:configure.ac:296: -1- m4_pattern_allow([^PYTHON_HEADERS$])
-m4trace:configure.ac:297: -1- AC_SUBST([HAVE_SWIG])
-m4trace:configure.ac:297: -1- AC_SUBST_TRACE([HAVE_SWIG])
-m4trace:configure.ac:297: -1- m4_pattern_allow([^HAVE_SWIG$])
-m4trace:configure.ac:300: -1- AC_SUBST([PYTHON])
-m4trace:configure.ac:300: -1- AC_SUBST_TRACE([PYTHON])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^PYTHON$])
-m4trace:configure.ac:300: -1- AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
-m4trace:configure.ac:300: -1- AC_SUBST_TRACE([PYTHON_VERSION])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^PYTHON_VERSION$])
-m4trace:configure.ac:300: -1- AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
-m4trace:configure.ac:300: -1- AC_SUBST_TRACE([PYTHON_PREFIX])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^PYTHON_PREFIX$])
-m4trace:configure.ac:300: -1- AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
-m4trace:configure.ac:300: -1- AC_SUBST_TRACE([PYTHON_EXEC_PREFIX])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^PYTHON_EXEC_PREFIX$])
-m4trace:configure.ac:300: -1- AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
-m4trace:configure.ac:300: -1- AC_SUBST_TRACE([PYTHON_PLATFORM])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^PYTHON_PLATFORM$])
-m4trace:configure.ac:300: -1- AC_SUBST([pythondir], [$am_cv_python_pythondir])
-m4trace:configure.ac:300: -1- AC_SUBST_TRACE([pythondir])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^pythondir$])
-m4trace:configure.ac:300: -1- AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
-m4trace:configure.ac:300: -1- AC_SUBST_TRACE([pkgpythondir])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^pkgpythondir$])
-m4trace:configure.ac:300: -1- AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
-m4trace:configure.ac:300: -1- AC_SUBST_TRACE([pyexecdir])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^pyexecdir$])
-m4trace:configure.ac:300: -1- AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
-m4trace:configure.ac:300: -1- AC_SUBST_TRACE([pkgpyexecdir])
-m4trace:configure.ac:300: -1- m4_pattern_allow([^pkgpyexecdir$])
-m4trace:configure.ac:306: -1- AM_CONDITIONAL([USE_PYTHON], [test x$test_python = xtrue ])
-m4trace:configure.ac:306: -1- AC_SUBST([USE_PYTHON_TRUE])
-m4trace:configure.ac:306: -1- AC_SUBST_TRACE([USE_PYTHON_TRUE])
-m4trace:configure.ac:306: -1- m4_pattern_allow([^USE_PYTHON_TRUE$])
-m4trace:configure.ac:306: -1- AC_SUBST([USE_PYTHON_FALSE])
-m4trace:configure.ac:306: -1- AC_SUBST_TRACE([USE_PYTHON_FALSE])
-m4trace:configure.ac:306: -1- m4_pattern_allow([^USE_PYTHON_FALSE$])
-m4trace:configure.ac:306: -1- _AM_SUBST_NOTMAKE([USE_PYTHON_TRUE])
-m4trace:configure.ac:306: -1- _AM_SUBST_NOTMAKE([USE_PYTHON_FALSE])
-m4trace:configure.ac:316: -1- AC_SUBST([OCTAVE])
-m4trace:configure.ac:316: -1- AC_SUBST_TRACE([OCTAVE])
-m4trace:configure.ac:316: -1- m4_pattern_allow([^OCTAVE$])
-m4trace:configure.ac:322: -1- AC_SUBST([OCTAVE_ARCH], [$OCTAVE_ARCH])
-m4trace:configure.ac:322: -1- AC_SUBST_TRACE([OCTAVE_ARCH])
-m4trace:configure.ac:322: -1- m4_pattern_allow([^OCTAVE_ARCH$])
-m4trace:configure.ac:323: -1- AC_SUBST([OCTAVE_INCFLAGS], [$OCTAVE_INCFLAGS])
-m4trace:configure.ac:323: -1- AC_SUBST_TRACE([OCTAVE_INCFLAGS])
-m4trace:configure.ac:323: -1- m4_pattern_allow([^OCTAVE_INCFLAGS$])
-m4trace:configure.ac:326: -1- AM_CONDITIONAL([USE_OCTAVE], [test x$test_octave = xtrue ])
-m4trace:configure.ac:326: -1- AC_SUBST([USE_OCTAVE_TRUE])
-m4trace:configure.ac:326: -1- AC_SUBST_TRACE([USE_OCTAVE_TRUE])
-m4trace:configure.ac:326: -1- m4_pattern_allow([^USE_OCTAVE_TRUE$])
-m4trace:configure.ac:326: -1- AC_SUBST([USE_OCTAVE_FALSE])
-m4trace:configure.ac:326: -1- AC_SUBST_TRACE([USE_OCTAVE_FALSE])
-m4trace:configure.ac:326: -1- m4_pattern_allow([^USE_OCTAVE_FALSE$])
-m4trace:configure.ac:326: -1- _AM_SUBST_NOTMAKE([USE_OCTAVE_TRUE])
-m4trace:configure.ac:326: -1- _AM_SUBST_NOTMAKE([USE_OCTAVE_FALSE])
-m4trace:configure.ac:335: -1- AM_CONDITIONAL([USE_TESTIO], [test x$testio = xtrue ])
-m4trace:configure.ac:335: -1- AC_SUBST([USE_TESTIO_TRUE])
-m4trace:configure.ac:335: -1- AC_SUBST_TRACE([USE_TESTIO_TRUE])
-m4trace:configure.ac:335: -1- m4_pattern_allow([^USE_TESTIO_TRUE$])
-m4trace:configure.ac:335: -1- AC_SUBST([USE_TESTIO_FALSE])
-m4trace:configure.ac:335: -1- AC_SUBST_TRACE([USE_TESTIO_FALSE])
-m4trace:configure.ac:335: -1- m4_pattern_allow([^USE_TESTIO_FALSE$])
-m4trace:configure.ac:335: -1- _AM_SUBST_NOTMAKE([USE_TESTIO_TRUE])
-m4trace:configure.ac:335: -1- _AM_SUBST_NOTMAKE([USE_TESTIO_FALSE])
-m4trace:configure.ac:345: -1- AC_CONFIG_FILES([texinfo/Makefile texinfo/png/Makefile])
-m4trace:configure.ac:347: -1- AM_CONDITIONAL([USE_DOCS], [(test x$docs = xtrue || test x$all = xtrue) ])
-m4trace:configure.ac:347: -1- AC_SUBST([USE_DOCS_TRUE])
-m4trace:configure.ac:347: -1- AC_SUBST_TRACE([USE_DOCS_TRUE])
-m4trace:configure.ac:347: -1- m4_pattern_allow([^USE_DOCS_TRUE$])
-m4trace:configure.ac:347: -1- AC_SUBST([USE_DOCS_FALSE])
-m4trace:configure.ac:347: -1- AC_SUBST_TRACE([USE_DOCS_FALSE])
-m4trace:configure.ac:347: -1- m4_pattern_allow([^USE_DOCS_FALSE$])
-m4trace:configure.ac:347: -1- _AM_SUBST_NOTMAKE([USE_DOCS_TRUE])
-m4trace:configure.ac:347: -1- _AM_SUBST_NOTMAKE([USE_DOCS_FALSE])
-m4trace:configure.ac:350: -1- AC_SUBST([AM_CXXFLAGS])
-m4trace:configure.ac:350: -1- AC_SUBST_TRACE([AM_CXXFLAGS])
-m4trace:configure.ac:350: -1- m4_pattern_allow([^AM_CXXFLAGS$])
-m4trace:configure.ac:352: -1- AC_CONFIG_FILES([
+m4trace:configure.ac:73: -1- AC_SUBST([PTHREAD_FLAGS])
+m4trace:configure.ac:73: -1- AC_SUBST_TRACE([PTHREAD_FLAGS])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^PTHREAD_FLAGS$])
+m4trace:configure.ac:76: -1- AC_SUBST([PTHREAD_LIBS])
+m4trace:configure.ac:76: -1- AC_SUBST_TRACE([PTHREAD_LIBS])
+m4trace:configure.ac:76: -1- m4_pattern_allow([^PTHREAD_LIBS$])
+m4trace:configure.ac:78: -1- AM_CONDITIONAL([USE_PTHREAD], [test x$pthread = xtrue])
+m4trace:configure.ac:78: -1- AC_SUBST([USE_PTHREAD_TRUE])
+m4trace:configure.ac:78: -1- AC_SUBST_TRACE([USE_PTHREAD_TRUE])
+m4trace:configure.ac:78: -1- m4_pattern_allow([^USE_PTHREAD_TRUE$])
+m4trace:configure.ac:78: -1- AC_SUBST([USE_PTHREAD_FALSE])
+m4trace:configure.ac:78: -1- AC_SUBST_TRACE([USE_PTHREAD_FALSE])
+m4trace:configure.ac:78: -1- m4_pattern_allow([^USE_PTHREAD_FALSE$])
+m4trace:configure.ac:78: -1- _AM_SUBST_NOTMAKE([USE_PTHREAD_TRUE])
+m4trace:configure.ac:78: -1- _AM_SUBST_NOTMAKE([USE_PTHREAD_FALSE])
+m4trace:configure.ac:90: -1- AC_SUBST([GSL_FLAGS])
+m4trace:configure.ac:90: -1- AC_SUBST_TRACE([GSL_FLAGS])
+m4trace:configure.ac:90: -1- m4_pattern_allow([^GSL_FLAGS$])
+m4trace:configure.ac:91: -1- AC_SUBST([GSL_LIBS])
+m4trace:configure.ac:91: -1- AC_SUBST_TRACE([GSL_LIBS])
+m4trace:configure.ac:91: -1- m4_pattern_allow([^GSL_LIBS$])
+m4trace:configure.ac:101: -1- AC_SUBST([GSL_FLAGS])
+m4trace:configure.ac:101: -1- AC_SUBST_TRACE([GSL_FLAGS])
+m4trace:configure.ac:101: -1- m4_pattern_allow([^GSL_FLAGS$])
+m4trace:configure.ac:103: -1- AM_CONDITIONAL([USE_GSL], [test x$test_gsl = xtrue])
+m4trace:configure.ac:103: -1- AC_SUBST([USE_GSL_TRUE])
+m4trace:configure.ac:103: -1- AC_SUBST_TRACE([USE_GSL_TRUE])
+m4trace:configure.ac:103: -1- m4_pattern_allow([^USE_GSL_TRUE$])
+m4trace:configure.ac:103: -1- AC_SUBST([USE_GSL_FALSE])
+m4trace:configure.ac:103: -1- AC_SUBST_TRACE([USE_GSL_FALSE])
+m4trace:configure.ac:103: -1- m4_pattern_allow([^USE_GSL_FALSE$])
+m4trace:configure.ac:103: -1- _AM_SUBST_NOTMAKE([USE_GSL_TRUE])
+m4trace:configure.ac:103: -1- _AM_SUBST_NOTMAKE([USE_GSL_FALSE])
+m4trace:configure.ac:116: -1- AC_SUBST([GL_LIBS])
+m4trace:configure.ac:116: -1- AC_SUBST_TRACE([GL_LIBS])
+m4trace:configure.ac:116: -1- m4_pattern_allow([^GL_LIBS$])
+m4trace:configure.ac:119: -1- AC_SUBST([GLUT_LIBS])
+m4trace:configure.ac:119: -1- AC_SUBST_TRACE([GLUT_LIBS])
+m4trace:configure.ac:119: -1- m4_pattern_allow([^GLUT_LIBS$])
+m4trace:configure.ac:126: -1- AC_SUBST([GL_LIBS])
+m4trace:configure.ac:126: -1- AC_SUBST_TRACE([GL_LIBS])
+m4trace:configure.ac:126: -1- m4_pattern_allow([^GL_LIBS$])
+m4trace:configure.ac:129: -1- AC_SUBST([GLUT_FLAGS])
+m4trace:configure.ac:129: -1- AC_SUBST_TRACE([GLUT_FLAGS])
+m4trace:configure.ac:129: -1- m4_pattern_allow([^GLUT_FLAGS$])
+m4trace:configure.ac:131: -1- AC_SUBST([GLUT_LIBS])
+m4trace:configure.ac:131: -1- AC_SUBST_TRACE([GLUT_LIBS])
+m4trace:configure.ac:131: -1- m4_pattern_allow([^GLUT_LIBS$])
+m4trace:configure.ac:138: -1- AC_SUBST([GL_LIBS])
+m4trace:configure.ac:138: -1- AC_SUBST_TRACE([GL_LIBS])
+m4trace:configure.ac:138: -1- m4_pattern_allow([^GL_LIBS$])
+m4trace:configure.ac:141: -1- AC_SUBST([GLUT_FLAGS])
+m4trace:configure.ac:141: -1- AC_SUBST_TRACE([GLUT_FLAGS])
+m4trace:configure.ac:141: -1- m4_pattern_allow([^GLUT_FLAGS$])
+m4trace:configure.ac:143: -1- AC_SUBST([GLUT_LIBS])
+m4trace:configure.ac:143: -1- AC_SUBST_TRACE([GLUT_LIBS])
+m4trace:configure.ac:143: -1- m4_pattern_allow([^GLUT_LIBS$])
+m4trace:configure.ac:148: -1- AM_CONDITIONAL([USE_GLUT], [(test x$all = xtrue || test x$glut = xtrue)])
+m4trace:configure.ac:148: -1- AC_SUBST([USE_GLUT_TRUE])
+m4trace:configure.ac:148: -1- AC_SUBST_TRACE([USE_GLUT_TRUE])
+m4trace:configure.ac:148: -1- m4_pattern_allow([^USE_GLUT_TRUE$])
+m4trace:configure.ac:148: -1- AC_SUBST([USE_GLUT_FALSE])
+m4trace:configure.ac:148: -1- AC_SUBST_TRACE([USE_GLUT_FALSE])
+m4trace:configure.ac:148: -1- m4_pattern_allow([^USE_GLUT_FALSE$])
+m4trace:configure.ac:148: -1- _AM_SUBST_NOTMAKE([USE_GLUT_TRUE])
+m4trace:configure.ac:148: -1- _AM_SUBST_NOTMAKE([USE_GLUT_FALSE])
+m4trace:configure.ac:178: -1- AC_SUBST([HDF5_FLAGS])
+m4trace:configure.ac:178: -1- AC_SUBST_TRACE([HDF5_FLAGS])
+m4trace:configure.ac:178: -1- m4_pattern_allow([^HDF5_FLAGS$])
+m4trace:configure.ac:180: -1- AC_SUBST([HDF5_LIBS])
+m4trace:configure.ac:180: -1- AC_SUBST_TRACE([HDF5_LIBS])
+m4trace:configure.ac:180: -1- m4_pattern_allow([^HDF5_LIBS$])
+m4trace:configure.ac:182: -1- AM_CONDITIONAL([USE_HDF5], [(test x$all = xtrue || test x$hdf5 = xtrue || test x$hdf5_18 = xtrue)])
+m4trace:configure.ac:182: -1- AC_SUBST([USE_HDF5_TRUE])
+m4trace:configure.ac:182: -1- AC_SUBST_TRACE([USE_HDF5_TRUE])
+m4trace:configure.ac:182: -1- m4_pattern_allow([^USE_HDF5_TRUE$])
+m4trace:configure.ac:182: -1- AC_SUBST([USE_HDF5_FALSE])
+m4trace:configure.ac:182: -1- AC_SUBST_TRACE([USE_HDF5_FALSE])
+m4trace:configure.ac:182: -1- m4_pattern_allow([^USE_HDF5_FALSE$])
+m4trace:configure.ac:182: -1- _AM_SUBST_NOTMAKE([USE_HDF5_TRUE])
+m4trace:configure.ac:182: -1- _AM_SUBST_NOTMAKE([USE_HDF5_FALSE])
+m4trace:configure.ac:194: -1- AC_SUBST([HDF4_FLAGS])
+m4trace:configure.ac:194: -1- AC_SUBST_TRACE([HDF4_FLAGS])
+m4trace:configure.ac:194: -1- m4_pattern_allow([^HDF4_FLAGS$])
+m4trace:configure.ac:195: -1- AC_SUBST([HDF4_LIBS])
+m4trace:configure.ac:195: -1- AC_SUBST_TRACE([HDF4_LIBS])
+m4trace:configure.ac:195: -1- m4_pattern_allow([^HDF4_LIBS$])
+m4trace:configure.ac:197: -1- AM_CONDITIONAL([USE_HDF4], [(test x$all = xtrue || test x$hdf4 = xtrue)])
+m4trace:configure.ac:197: -1- AC_SUBST([USE_HDF4_TRUE])
+m4trace:configure.ac:197: -1- AC_SUBST_TRACE([USE_HDF4_TRUE])
+m4trace:configure.ac:197: -1- m4_pattern_allow([^USE_HDF4_TRUE$])
+m4trace:configure.ac:197: -1- AC_SUBST([USE_HDF4_FALSE])
+m4trace:configure.ac:197: -1- AC_SUBST_TRACE([USE_HDF4_FALSE])
+m4trace:configure.ac:197: -1- m4_pattern_allow([^USE_HDF4_FALSE$])
+m4trace:configure.ac:197: -1- _AM_SUBST_NOTMAKE([USE_HDF4_TRUE])
+m4trace:configure.ac:197: -1- _AM_SUBST_NOTMAKE([USE_HDF4_FALSE])
+m4trace:configure.ac:206: -1- AC_SUBST([GIF_FLAGS])
+m4trace:configure.ac:206: -1- AC_SUBST_TRACE([GIF_FLAGS])
+m4trace:configure.ac:206: -1- m4_pattern_allow([^GIF_FLAGS$])
+m4trace:configure.ac:209: -1- AC_SUBST([GIF_LIBS])
+m4trace:configure.ac:209: -1- AC_SUBST_TRACE([GIF_LIBS])
+m4trace:configure.ac:209: -1- m4_pattern_allow([^GIF_LIBS$])
+m4trace:configure.ac:211: -1- AM_CONDITIONAL([USE_GIF], [(test x$all = xtrue || test x$gif = xtrue)])
+m4trace:configure.ac:211: -1- AC_SUBST([USE_GIF_TRUE])
+m4trace:configure.ac:211: -1- AC_SUBST_TRACE([USE_GIF_TRUE])
+m4trace:configure.ac:211: -1- m4_pattern_allow([^USE_GIF_TRUE$])
+m4trace:configure.ac:211: -1- AC_SUBST([USE_GIF_FALSE])
+m4trace:configure.ac:211: -1- AC_SUBST_TRACE([USE_GIF_FALSE])
+m4trace:configure.ac:211: -1- m4_pattern_allow([^USE_GIF_FALSE$])
+m4trace:configure.ac:211: -1- _AM_SUBST_NOTMAKE([USE_GIF_TRUE])
+m4trace:configure.ac:211: -1- _AM_SUBST_NOTMAKE([USE_GIF_FALSE])
+m4trace:configure.ac:215: -1- AC_SUBST([PNG_LIBS])
+m4trace:configure.ac:215: -1- AC_SUBST_TRACE([PNG_LIBS])
+m4trace:configure.ac:215: -1- m4_pattern_allow([^PNG_LIBS$])
+m4trace:configure.ac:225: -1- AC_SUBST([JPEG_FLAGS])
+m4trace:configure.ac:225: -1- AC_SUBST_TRACE([JPEG_FLAGS])
+m4trace:configure.ac:225: -1- m4_pattern_allow([^JPEG_FLAGS$])
+m4trace:configure.ac:228: -1- AC_SUBST([JPEG_LIBS])
+m4trace:configure.ac:228: -1- AC_SUBST_TRACE([JPEG_LIBS])
+m4trace:configure.ac:228: -1- m4_pattern_allow([^JPEG_LIBS$])
+m4trace:configure.ac:230: -1- AM_CONDITIONAL([USE_JPEG], [(test x$all = xtrue || test x$jpeg = xtrue)])
+m4trace:configure.ac:230: -1- AC_SUBST([USE_JPEG_TRUE])
+m4trace:configure.ac:230: -1- AC_SUBST_TRACE([USE_JPEG_TRUE])
+m4trace:configure.ac:230: -1- m4_pattern_allow([^USE_JPEG_TRUE$])
+m4trace:configure.ac:230: -1- AC_SUBST([USE_JPEG_FALSE])
+m4trace:configure.ac:230: -1- AC_SUBST_TRACE([USE_JPEG_FALSE])
+m4trace:configure.ac:230: -1- m4_pattern_allow([^USE_JPEG_FALSE$])
+m4trace:configure.ac:230: -1- _AM_SUBST_NOTMAKE([USE_JPEG_TRUE])
+m4trace:configure.ac:230: -1- _AM_SUBST_NOTMAKE([USE_JPEG_FALSE])
+m4trace:configure.ac:246: -1- AH_OUTPUT([HAVE_LIBHPDF], [/* Define to 1 if you have the `hpdf\' library (-lhpdf). */
+@%:@undef HAVE_LIBHPDF])
+m4trace:configure.ac:246: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBHPDF])
+m4trace:configure.ac:246: -1- m4_pattern_allow([^HAVE_LIBHPDF$])
+m4trace:configure.ac:252: -1- AH_OUTPUT([HAVE_HPDF_H], [/* Define to 1 if you have the <hpdf.h> header file. */
+@%:@undef HAVE_HPDF_H])
+m4trace:configure.ac:252: -1- AC_DEFINE_TRACE_LITERAL([HAVE_HPDF_H])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^HAVE_HPDF_H$])
+m4trace:configure.ac:257: -1- AM_CONDITIONAL([USE_PDF], [test x$pdf = xtrue])
+m4trace:configure.ac:257: -1- AC_SUBST([USE_PDF_TRUE])
+m4trace:configure.ac:257: -1- AC_SUBST_TRACE([USE_PDF_TRUE])
+m4trace:configure.ac:257: -1- m4_pattern_allow([^USE_PDF_TRUE$])
+m4trace:configure.ac:257: -1- AC_SUBST([USE_PDF_FALSE])
+m4trace:configure.ac:257: -1- AC_SUBST_TRACE([USE_PDF_FALSE])
+m4trace:configure.ac:257: -1- m4_pattern_allow([^USE_PDF_FALSE$])
+m4trace:configure.ac:257: -1- _AM_SUBST_NOTMAKE([USE_PDF_TRUE])
+m4trace:configure.ac:257: -1- _AM_SUBST_NOTMAKE([USE_PDF_FALSE])
+m4trace:configure.ac:259: -1- AC_SUBST([U3D_LIBS], ["-lIDTF -lm -ldl"])
+m4trace:configure.ac:259: -1- AC_SUBST_TRACE([U3D_LIBS])
+m4trace:configure.ac:259: -1- m4_pattern_allow([^U3D_LIBS$])
+m4trace:configure.ac:259: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U3D])
+m4trace:configure.ac:259: -1- m4_pattern_allow([^HAVE_U3D$])
+m4trace:configure.ac:259: -1- AH_OUTPUT([HAVE_U3D], [/* Define if you have libIDTF */
+@%:@undef HAVE_U3D])
+m4trace:configure.ac:268: -1- AH_OUTPUT([HAVE_U3D_SCENECONVERTERLIB_H], [/* Define to 1 if you have the <u3d/SceneConverterLib.h> header file. */
+@%:@undef HAVE_U3D_SCENECONVERTERLIB_H])
+m4trace:configure.ac:268: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U3D_SCENECONVERTERLIB_H])
+m4trace:configure.ac:268: -1- m4_pattern_allow([^HAVE_U3D_SCENECONVERTERLIB_H$])
+m4trace:configure.ac:273: -1- AM_CONDITIONAL([USE_U3D], [test x$u3d = xtrue])
+m4trace:configure.ac:273: -1- AC_SUBST([USE_U3D_TRUE])
+m4trace:configure.ac:273: -1- AC_SUBST_TRACE([USE_U3D_TRUE])
+m4trace:configure.ac:273: -1- m4_pattern_allow([^USE_U3D_TRUE$])
+m4trace:configure.ac:273: -1- AC_SUBST([USE_U3D_FALSE])
+m4trace:configure.ac:273: -1- AC_SUBST_TRACE([USE_U3D_FALSE])
+m4trace:configure.ac:273: -1- m4_pattern_allow([^USE_U3D_FALSE$])
+m4trace:configure.ac:273: -1- _AM_SUBST_NOTMAKE([USE_U3D_TRUE])
+m4trace:configure.ac:273: -1- _AM_SUBST_NOTMAKE([USE_U3D_FALSE])
+m4trace:configure.ac:284: -1- AC_SUBST([FLTK_FLAGS])
+m4trace:configure.ac:284: -1- AC_SUBST_TRACE([FLTK_FLAGS])
+m4trace:configure.ac:284: -1- m4_pattern_allow([^FLTK_FLAGS$])
+m4trace:configure.ac:285: -1- AC_SUBST([FLTK_LIBS])
+m4trace:configure.ac:285: -1- AC_SUBST_TRACE([FLTK_LIBS])
+m4trace:configure.ac:285: -1- m4_pattern_allow([^FLTK_LIBS$])
+m4trace:configure.ac:294: -1- AM_CONDITIONAL([USE_FLTK], [test x$test_fltk = xtrue])
+m4trace:configure.ac:294: -1- AC_SUBST([USE_FLTK_TRUE])
+m4trace:configure.ac:294: -1- AC_SUBST_TRACE([USE_FLTK_TRUE])
+m4trace:configure.ac:294: -1- m4_pattern_allow([^USE_FLTK_TRUE$])
+m4trace:configure.ac:294: -1- AC_SUBST([USE_FLTK_FALSE])
+m4trace:configure.ac:294: -1- AC_SUBST_TRACE([USE_FLTK_FALSE])
+m4trace:configure.ac:294: -1- m4_pattern_allow([^USE_FLTK_FALSE$])
+m4trace:configure.ac:294: -1- _AM_SUBST_NOTMAKE([USE_FLTK_TRUE])
+m4trace:configure.ac:294: -1- _AM_SUBST_NOTMAKE([USE_FLTK_FALSE])
+m4trace:configure.ac:306: -1- AC_SUBST([WX_FLAGS])
+m4trace:configure.ac:306: -1- AC_SUBST_TRACE([WX_FLAGS])
+m4trace:configure.ac:306: -1- m4_pattern_allow([^WX_FLAGS$])
+m4trace:configure.ac:307: -1- AC_SUBST([WX_LIBS])
+m4trace:configure.ac:307: -1- AC_SUBST_TRACE([WX_LIBS])
+m4trace:configure.ac:307: -1- m4_pattern_allow([^WX_LIBS$])
+m4trace:configure.ac:316: -1- AM_CONDITIONAL([USE_WX], [test x$test_wx = xtrue])
+m4trace:configure.ac:316: -1- AC_SUBST([USE_WX_TRUE])
+m4trace:configure.ac:316: -1- AC_SUBST_TRACE([USE_WX_TRUE])
+m4trace:configure.ac:316: -1- m4_pattern_allow([^USE_WX_TRUE$])
+m4trace:configure.ac:316: -1- AC_SUBST([USE_WX_FALSE])
+m4trace:configure.ac:316: -1- AC_SUBST_TRACE([USE_WX_FALSE])
+m4trace:configure.ac:316: -1- m4_pattern_allow([^USE_WX_FALSE$])
+m4trace:configure.ac:316: -1- _AM_SUBST_NOTMAKE([USE_WX_TRUE])
+m4trace:configure.ac:316: -1- _AM_SUBST_NOTMAKE([USE_WX_FALSE])
+m4trace:configure.ac:326: -1- AC_SUBST([QMAKE])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([QMAKE])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QMAKE$])
+m4trace:configure.ac:326: -1- AC_SUBST([QMAKE])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([QMAKE])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QMAKE$])
+m4trace:configure.ac:326: -1- AC_SUBST([MOC])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([MOC])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^MOC$])
+m4trace:configure.ac:326: -1- AC_SUBST([MOC])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([MOC])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^MOC$])
+m4trace:configure.ac:326: -1- AC_SUBST([UIC])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([UIC])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^UIC$])
+m4trace:configure.ac:326: -1- AC_SUBST([UIC])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([UIC])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^UIC$])
+m4trace:configure.ac:326: -1- AC_SUBST([RCC])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([RCC])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^RCC$])
+m4trace:configure.ac:326: -1- AC_SUBST([RCC])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([RCC])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^RCC$])
+m4trace:configure.ac:326: -1- AC_SUBST([QT_PATH])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([QT_PATH])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_PATH$])
+m4trace:configure.ac:326: -1- AC_SUBST([TMPDIR])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([TMPDIR])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^TMPDIR$])
+m4trace:configure.ac:326: -1- AC_SUBST([QT_VERSION_MAJOR])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([QT_VERSION_MAJOR])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_VERSION_MAJOR$])
+m4trace:configure.ac:326: -1- AC_SUBST([QT_DEFINES], [$at_cv_env_QT_DEFINES])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([QT_DEFINES])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_DEFINES$])
+m4trace:configure.ac:326: -1- AC_SUBST([QT_CFLAGS], [$at_cv_env_QT_CFLAGS])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([QT_CFLAGS])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_CFLAGS$])
+m4trace:configure.ac:326: -1- AC_SUBST([QT_CXXFLAGS], [$at_cv_env_QT_CXXFLAGS])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([QT_CXXFLAGS])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_CXXFLAGS$])
+m4trace:configure.ac:326: -1- AC_SUBST([QT_INCPATH], [$at_cv_env_QT_INCPATH])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([QT_INCPATH])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_INCPATH$])
+m4trace:configure.ac:326: -1- AC_SUBST([QT_CPPFLAGS], ["$at_cv_env_QT_DEFINES $at_cv_env_QT_INCPATH"])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([QT_CPPFLAGS])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_CPPFLAGS$])
+m4trace:configure.ac:326: -1- AC_SUBST([QT_LFLAGS], [$at_cv_env_QT_LDFLAGS])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([QT_LFLAGS])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_LFLAGS$])
+m4trace:configure.ac:326: -1- AC_SUBST([QT_LDFLAGS], [$at_cv_env_QT_LDFLAGS])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([QT_LDFLAGS])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_LDFLAGS$])
+m4trace:configure.ac:326: -1- AC_SUBST([QT_LIBS], [$at_cv_env_QT_LIBS])
+m4trace:configure.ac:326: -1- AC_SUBST_TRACE([QT_LIBS])
+m4trace:configure.ac:326: -1- m4_pattern_allow([^QT_LIBS$])
+m4trace:configure.ac:327: -1- AC_SUBST([QT_VERSION], [$at_cv_QT_VERSION])
+m4trace:configure.ac:327: -1- AC_SUBST_TRACE([QT_VERSION])
+m4trace:configure.ac:327: -1- m4_pattern_allow([^QT_VERSION$])
+m4trace:configure.ac:330: -1- AM_CONDITIONAL([USE_QT], [test x$test_qt = xtrue])
+m4trace:configure.ac:330: -1- AC_SUBST([USE_QT_TRUE])
+m4trace:configure.ac:330: -1- AC_SUBST_TRACE([USE_QT_TRUE])
+m4trace:configure.ac:330: -1- m4_pattern_allow([^USE_QT_TRUE$])
+m4trace:configure.ac:330: -1- AC_SUBST([USE_QT_FALSE])
+m4trace:configure.ac:330: -1- AC_SUBST_TRACE([USE_QT_FALSE])
+m4trace:configure.ac:330: -1- m4_pattern_allow([^USE_QT_FALSE$])
+m4trace:configure.ac:330: -1- _AM_SUBST_NOTMAKE([USE_QT_TRUE])
+m4trace:configure.ac:330: -1- _AM_SUBST_NOTMAKE([USE_QT_FALSE])
+m4trace:configure.ac:340: -1- AC_SUBST([PYTHON_HEADERS])
+m4trace:configure.ac:340: -1- AC_SUBST_TRACE([PYTHON_HEADERS])
+m4trace:configure.ac:340: -1- m4_pattern_allow([^PYTHON_HEADERS$])
+m4trace:configure.ac:341: -1- AC_SUBST([HAVE_SWIG])
+m4trace:configure.ac:341: -1- AC_SUBST_TRACE([HAVE_SWIG])
+m4trace:configure.ac:341: -1- m4_pattern_allow([^HAVE_SWIG$])
+m4trace:configure.ac:344: -1- AC_SUBST([PYTHON])
+m4trace:configure.ac:344: -1- AC_SUBST_TRACE([PYTHON])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^PYTHON$])
+m4trace:configure.ac:344: -1- AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
+m4trace:configure.ac:344: -1- AC_SUBST_TRACE([PYTHON_VERSION])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^PYTHON_VERSION$])
+m4trace:configure.ac:344: -1- AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
+m4trace:configure.ac:344: -1- AC_SUBST_TRACE([PYTHON_PREFIX])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^PYTHON_PREFIX$])
+m4trace:configure.ac:344: -1- AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
+m4trace:configure.ac:344: -1- AC_SUBST_TRACE([PYTHON_EXEC_PREFIX])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^PYTHON_EXEC_PREFIX$])
+m4trace:configure.ac:344: -1- AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
+m4trace:configure.ac:344: -1- AC_SUBST_TRACE([PYTHON_PLATFORM])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^PYTHON_PLATFORM$])
+m4trace:configure.ac:344: -1- AC_SUBST([pythondir], [$am_cv_python_pythondir])
+m4trace:configure.ac:344: -1- AC_SUBST_TRACE([pythondir])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^pythondir$])
+m4trace:configure.ac:344: -1- AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
+m4trace:configure.ac:344: -1- AC_SUBST_TRACE([pkgpythondir])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^pkgpythondir$])
+m4trace:configure.ac:344: -1- AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
+m4trace:configure.ac:344: -1- AC_SUBST_TRACE([pyexecdir])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^pyexecdir$])
+m4trace:configure.ac:344: -1- AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
+m4trace:configure.ac:344: -1- AC_SUBST_TRACE([pkgpyexecdir])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^pkgpyexecdir$])
+m4trace:configure.ac:350: -1- AM_CONDITIONAL([USE_PYTHON], [test x$test_python = xtrue ])
+m4trace:configure.ac:350: -1- AC_SUBST([USE_PYTHON_TRUE])
+m4trace:configure.ac:350: -1- AC_SUBST_TRACE([USE_PYTHON_TRUE])
+m4trace:configure.ac:350: -1- m4_pattern_allow([^USE_PYTHON_TRUE$])
+m4trace:configure.ac:350: -1- AC_SUBST([USE_PYTHON_FALSE])
+m4trace:configure.ac:350: -1- AC_SUBST_TRACE([USE_PYTHON_FALSE])
+m4trace:configure.ac:350: -1- m4_pattern_allow([^USE_PYTHON_FALSE$])
+m4trace:configure.ac:350: -1- _AM_SUBST_NOTMAKE([USE_PYTHON_TRUE])
+m4trace:configure.ac:350: -1- _AM_SUBST_NOTMAKE([USE_PYTHON_FALSE])
+m4trace:configure.ac:360: -1- AC_SUBST([OCTAVE])
+m4trace:configure.ac:360: -1- AC_SUBST_TRACE([OCTAVE])
+m4trace:configure.ac:360: -1- m4_pattern_allow([^OCTAVE$])
+m4trace:configure.ac:366: -1- AC_SUBST([OCTAVE_ARCH], [$OCTAVE_ARCH])
+m4trace:configure.ac:366: -1- AC_SUBST_TRACE([OCTAVE_ARCH])
+m4trace:configure.ac:366: -1- m4_pattern_allow([^OCTAVE_ARCH$])
+m4trace:configure.ac:367: -1- AC_SUBST([OCTAVE_INCFLAGS], [$OCTAVE_INCFLAGS])
+m4trace:configure.ac:367: -1- AC_SUBST_TRACE([OCTAVE_INCFLAGS])
+m4trace:configure.ac:367: -1- m4_pattern_allow([^OCTAVE_INCFLAGS$])
+m4trace:configure.ac:370: -1- AM_CONDITIONAL([USE_OCTAVE], [test x$test_octave = xtrue ])
+m4trace:configure.ac:370: -1- AC_SUBST([USE_OCTAVE_TRUE])
+m4trace:configure.ac:370: -1- AC_SUBST_TRACE([USE_OCTAVE_TRUE])
+m4trace:configure.ac:370: -1- m4_pattern_allow([^USE_OCTAVE_TRUE$])
+m4trace:configure.ac:370: -1- AC_SUBST([USE_OCTAVE_FALSE])
+m4trace:configure.ac:370: -1- AC_SUBST_TRACE([USE_OCTAVE_FALSE])
+m4trace:configure.ac:370: -1- m4_pattern_allow([^USE_OCTAVE_FALSE$])
+m4trace:configure.ac:370: -1- _AM_SUBST_NOTMAKE([USE_OCTAVE_TRUE])
+m4trace:configure.ac:370: -1- _AM_SUBST_NOTMAKE([USE_OCTAVE_FALSE])
+m4trace:configure.ac:379: -1- AM_CONDITIONAL([USE_TESTIO], [test x$testio = xtrue ])
+m4trace:configure.ac:379: -1- AC_SUBST([USE_TESTIO_TRUE])
+m4trace:configure.ac:379: -1- AC_SUBST_TRACE([USE_TESTIO_TRUE])
+m4trace:configure.ac:379: -1- m4_pattern_allow([^USE_TESTIO_TRUE$])
+m4trace:configure.ac:379: -1- AC_SUBST([USE_TESTIO_FALSE])
+m4trace:configure.ac:379: -1- AC_SUBST_TRACE([USE_TESTIO_FALSE])
+m4trace:configure.ac:379: -1- m4_pattern_allow([^USE_TESTIO_FALSE$])
+m4trace:configure.ac:379: -1- _AM_SUBST_NOTMAKE([USE_TESTIO_TRUE])
+m4trace:configure.ac:379: -1- _AM_SUBST_NOTMAKE([USE_TESTIO_FALSE])
+m4trace:configure.ac:389: -1- AC_CONFIG_FILES([texinfo/Makefile texinfo/png/Makefile])
+m4trace:configure.ac:391: -1- AM_CONDITIONAL([USE_DOCS], [(test x$docs = xtrue || test x$all = xtrue) ])
+m4trace:configure.ac:391: -1- AC_SUBST([USE_DOCS_TRUE])
+m4trace:configure.ac:391: -1- AC_SUBST_TRACE([USE_DOCS_TRUE])
+m4trace:configure.ac:391: -1- m4_pattern_allow([^USE_DOCS_TRUE$])
+m4trace:configure.ac:391: -1- AC_SUBST([USE_DOCS_FALSE])
+m4trace:configure.ac:391: -1- AC_SUBST_TRACE([USE_DOCS_FALSE])
+m4trace:configure.ac:391: -1- m4_pattern_allow([^USE_DOCS_FALSE$])
+m4trace:configure.ac:391: -1- _AM_SUBST_NOTMAKE([USE_DOCS_TRUE])
+m4trace:configure.ac:391: -1- _AM_SUBST_NOTMAKE([USE_DOCS_FALSE])
+m4trace:configure.ac:394: -1- AC_SUBST([AM_CXXFLAGS])
+m4trace:configure.ac:394: -1- AC_SUBST_TRACE([AM_CXXFLAGS])
+m4trace:configure.ac:394: -1- m4_pattern_allow([^AM_CXXFLAGS$])
+m4trace:configure.ac:396: -1- AC_CONFIG_FILES([
 Makefile
 mgl/Makefile
 examples/Makefile
@@ -897,30 +934,30 @@ lang/Makefile
 utils/Makefile
 widgets/Makefile
 ])
-m4trace:configure.ac:361: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.ac:361: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:361: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:361: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.ac:361: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.ac:361: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:361: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:361: -1- AC_SUBST([am__EXEEXT_TRUE])
-m4trace:configure.ac:361: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
-m4trace:configure.ac:361: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:361: -1- AC_SUBST([am__EXEEXT_FALSE])
-m4trace:configure.ac:361: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
-m4trace:configure.ac:361: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:361: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:361: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:361: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.ac:361: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.ac:361: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.ac:361: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.ac:361: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.ac:361: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.ac:361: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.ac:361: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.ac:361: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.ac:361: -1- AC_SUBST_TRACE([INSTALL])
-m4trace:configure.ac:361: -1- AC_SUBST_TRACE([MKDIR_P])
-m4trace:configure.ac:361: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
+m4trace:configure.ac:405: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:405: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:405: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:405: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:405: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.ac:405: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:405: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:405: -1- AC_SUBST([am__EXEEXT_TRUE])
+m4trace:configure.ac:405: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
+m4trace:configure.ac:405: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:405: -1- AC_SUBST([am__EXEEXT_FALSE])
+m4trace:configure.ac:405: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
+m4trace:configure.ac:405: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:405: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:405: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:405: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:405: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:405: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:405: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:405: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:405: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:405: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:405: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:405: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:405: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:405: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:405: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
index 8245fcd8a5600fe6af02f536226e1d0ed22ccf64..fa5d32b89f774cd08f4924941d11ff1b3a995816 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for mathgl 1.10.
+# Generated by GNU Autoconf 2.67 for mathgl 1.11.
 #
 # Report bugs to <mathgl.abalakin@gmail.com>.
 #
@@ -761,8 +761,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mathgl'
 PACKAGE_TARNAME='mathgl'
-PACKAGE_VERSION='1.10'
-PACKAGE_STRING='mathgl 1.10'
+PACKAGE_VERSION='1.11'
+PACKAGE_STRING='mathgl 1.11'
 PACKAGE_BUGREPORT='mathgl.abalakin@gmail.com'
 PACKAGE_URL=''
 
@@ -856,6 +856,11 @@ USE_FLTK_FALSE
 USE_FLTK_TRUE
 FLTK_LIBS
 FLTK_FLAGS
+USE_U3D_FALSE
+USE_U3D_TRUE
+U3D_LIBS
+USE_PDF_FALSE
+USE_PDF_TRUE
 USE_JPEG_FALSE
 USE_JPEG_TRUE
 JPEG_LIBS
@@ -1025,6 +1030,8 @@ enable_hdf5_18
 enable_hdf4
 enable_gif
 enable_jpeg
+enable_u3d
+enable_pdf
 enable_fltk
 enable_wx
 enable_qt
@@ -1590,7 +1597,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mathgl 1.10 to adapt to many kinds of systems.
+\`configure' configures mathgl 1.11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1660,7 +1667,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mathgl 1.10:";;
+     short | recursive ) echo "Configuration of mathgl 1.11:";;
    esac
   cat <<\_ACEOF
 
@@ -1686,6 +1693,8 @@ Optional Features:
   --enable-hdf4    Turn on hdf4
   --enable-gif    Turn on gif
   --enable-jpeg    Turn on jpeg
+  --enable-u3d    Turn on u3d functions
+  --enable-pdf    Turn on u3d and pdf functions
   --enable-fltk    Turn on fltk
   --enable-wx    Turn on wxWidget
   --enable-qt    Turn on Qt
@@ -1782,7 +1791,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mathgl configure 1.10
+mathgl configure 1.11
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2178,12 +2187,12 @@ fi
 
 } # ac_fn_cxx_try_link
 
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
+# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
 # Tests whether HEADER exists, giving a warning if it cannot be compiled using
 # the include files in INCLUDES and setting the cache variable VAR
 # accordingly.
-ac_fn_c_check_header_mongrel ()
+ac_fn_cxx_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   if eval "test \"\${$3+set}\"" = set; then :
@@ -2204,7 +2213,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_header_compiler=yes
 else
   ac_header_compiler=no
@@ -2220,7 +2229,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <$2>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   ac_header_preproc=yes
 else
   ac_header_preproc=no
@@ -2230,7 +2239,7 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 $as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
   yes:no: )
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
 $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
@@ -2267,12 +2276,12 @@ $as_echo "$ac_res" >&6; }
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
-} # ac_fn_c_check_header_mongrel
+} # ac_fn_cxx_check_header_mongrel
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mathgl $as_me 1.10, which was
+It was created by mathgl $as_me 1.11, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2621,7 +2630,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-MGL_RELEASE=1.10
+MGL_RELEASE=1.11
 
 
 
@@ -2657,6 +2666,12 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 ac_config_headers="$ac_config_headers include/mgl/config.h"
 
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
 
 #MGL_RELEASE=1.4
 #AC_SUBST(MGL_RELEASE)
@@ -3110,7 +3125,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mathgl'
- VERSION='1.10'
+ VERSION='1.11'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3935,11 +3950,11 @@ if test "x$ac_cv_prog_cc_c89" != xno; then :
 
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -4381,11 +4396,11 @@ else
     CXXFLAGS=
   fi
 fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 depcc="$CXX"  am_compiler_list=
 
@@ -5503,13 +5518,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5506: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5521: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5509: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5524: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5512: output\"" >&5)
+  (eval echo "\"\$as_me:5527: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6712,7 +6727,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6715 "configure"' > conftest.$ac_ext
+  echo '#line 6730 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7992,11 +8007,11 @@ else
     CXXFLAGS=
   fi
 fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 depcc="$CXX"  am_compiler_list=
 
@@ -8254,11 +8269,11 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 _lt_caught_CXX_error=yes; }
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 else
   _lt_caught_CXX_error=yes
@@ -8760,11 +8775,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8763: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8778: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8767: \$? = $ac_status" >&5
+   echo "$as_me:8782: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9099,11 +9114,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9102: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9117: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9106: \$? = $ac_status" >&5
+   echo "$as_me:9121: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9204,11 +9219,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9207: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9222: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9211: \$? = $ac_status" >&5
+   echo "$as_me:9226: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9259,11 +9274,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9262: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9277: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9266: \$? = $ac_status" >&5
+   echo "$as_me:9281: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11643,7 +11658,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11646 "configure"
+#line 11661 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11739,7 +11754,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11742 "configure"
+#line 11757 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11938,11 +11953,11 @@ $as_echo "$enable_static" >&6; }
 
 
 fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 CC="$lt_save_CC"
 
@@ -13695,11 +13710,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13698: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13713: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13702: \$? = $ac_status" >&5
+   echo "$as_me:13717: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13794,11 +13809,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13797: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13812: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13801: \$? = $ac_status" >&5
+   echo "$as_me:13816: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13846,11 +13861,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13849: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13864: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13853: \$? = $ac_status" >&5
+   echo "$as_me:13868: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
   lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
 fi # test "$_lt_caught_CXX_error" != yes
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 
@@ -14871,7 +14886,8 @@ else
   pthread=true
 fi
 
-ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+
+ac_fn_cxx_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
 if test "x$ac_cv_header_pthread_h" = x""yes; then :
   (test x$all = xtrue || test x$pthread = xtrue) && PTHREAD_FLAGS=-DHAVE_PTHREAD
 else
@@ -14899,7 +14915,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_pthread_main=yes
 else
   ac_cv_lib_pthread_main=no
@@ -15057,7 +15073,7 @@ case "${host}" in
 
   *w32*)
        GL_LIBS=opengl32
-       ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
+       ac_fn_cxx_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
 if test "x$ac_cv_header_GL_gl_h" = x""yes; then :
 
 else
@@ -15085,7 +15101,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
   eval "$as_ac_Lib=no"
@@ -15104,7 +15120,7 @@ else
 fi
 
        GLUT_LIBS=glut32
-       ac_fn_c_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default"
+       ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default"
 if test "x$ac_cv_header_GL_glut_h" = x""yes; then :
   (test x$all = xtrue || test x$glut = xtrue) && GLUT_FLAGS=-DHAVE_GLUT
 else
@@ -15132,7 +15148,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
   eval "$as_ac_Lib=no"
@@ -15154,7 +15170,7 @@ fi
 
        *)
        GL_LIBS=GL
-       ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
+       ac_fn_cxx_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
 if test "x$ac_cv_header_GL_gl_h" = x""yes; then :
 
 else
@@ -15182,7 +15198,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
   eval "$as_ac_Lib=no"
@@ -15201,7 +15217,7 @@ else
 fi
 
        GLUT_LIBS=glut
-       ac_fn_c_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default"
+       ac_fn_cxx_check_header_mongrel "$LINENO" "GL/glut.h" "ac_cv_header_GL_glut_h" "$ac_includes_default"
 if test "x$ac_cv_header_GL_glut_h" = x""yes; then :
   (test x$all = xtrue || test x$glut = xtrue) && GLUT_FLAGS=-DHAVE_GLUT
 else
@@ -15229,7 +15245,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
   eval "$as_ac_Lib=no"
@@ -15291,7 +15307,7 @@ else
 fi
 
 #AC_CHECK_HEADER(hdf5.h,[(test x$all = xtrue || test x$hdf5 = xtrue || test x$hdf5_18 = xtrue) && HDF5_FLAGS=-DHAVE_HDF5 AC_SUBST(HDF5_FLAGS)],
-ac_fn_c_check_header_mongrel "$LINENO" "hdf5.h" "ac_cv_header_hdf5_h" "$ac_includes_default"
+ac_fn_cxx_check_header_mongrel "$LINENO" "hdf5.h" "ac_cv_header_hdf5_h" "$ac_includes_default"
 if test "x$ac_cv_header_hdf5_h" = x""yes; then :
   (test x$all = xtrue || test x$hdf5 = xtrue || test x$hdf5_18 = xtrue) && HDF5_FLAGS=-DHAVE_HDF5
 else
@@ -15322,7 +15338,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_hdf5_main=yes
 else
   ac_cv_lib_hdf5_main=no
@@ -15360,7 +15376,7 @@ else
   hdf4=false
 fi
 
-ac_fn_c_check_header_mongrel "$LINENO" "hdf/mfhdf.h" "ac_cv_header_hdf_mfhdf_h" "$ac_includes_default"
+ac_fn_cxx_check_header_mongrel "$LINENO" "hdf/mfhdf.h" "ac_cv_header_hdf_mfhdf_h" "$ac_includes_default"
 if test "x$ac_cv_header_hdf_mfhdf_h" = x""yes; then :
   (test x$all = xtrue || test x$hdf4 = xtrue) && HDF4_FLAGS=-DHAVE_HDF4
 else
@@ -15388,7 +15404,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_df_main=yes
 else
   ac_cv_lib_df_main=no
@@ -15425,7 +15441,7 @@ else
   gif=false
 fi
 
-ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
+ac_fn_cxx_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
 if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
   (test x$all = xtrue || test x$gif = xtrue) && GIF_FLAGS=-DHAVE_GIF
 else
@@ -15453,7 +15469,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_gif_main=yes
 else
   ac_cv_lib_gif_main=no
@@ -15479,7 +15495,7 @@ else
 fi
 
 
-ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
+ac_fn_cxx_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
 if test "x$ac_cv_header_png_h" = x""yes; then :
 
 else
@@ -15507,7 +15523,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_png_main=yes
 else
   ac_cv_lib_png_main=no
@@ -15536,7 +15552,7 @@ else
   jpeg=false
 fi
 
-ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
+ac_fn_cxx_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
 if test "x$ac_cv_header_jpeglib_h" = x""yes; then :
   (test x$all = xtrue || test x$jpeg = xtrue) && JPEG_FLAGS=-DHAVE_JPEG
 else
@@ -15564,7 +15580,7 @@ return main ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_jpeg_main=yes
 else
   ac_cv_lib_jpeg_main=no
@@ -15590,6 +15606,179 @@ else
 fi
 
 
+# Check whether --enable-u3d was given.
+if test "${enable_u3d+set}" = set; then :
+  enableval=$enable_u3d; case "${enableval}" in
+  yes) u3d=true ;;
+  no)  u3d=false ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-u3d" "$LINENO" 5  ;;
+esac
+else
+  u3d=false
+fi
+
+# Check whether --enable-pdf was given.
+if test "${enable_pdf+set}" = set; then :
+  enableval=$enable_pdf; case "${enableval}" in
+  yes) pdf=true; u3d=true ;;
+  no)  pdf=false ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-pdf" "$LINENO" 5  ;;
+esac
+else
+  pdf=false
+fi
+
+if test "x$pdf" == xtrue; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lhpdf" >&5
+$as_echo_n "checking for main in -lhpdf... " >&6; }
+if test "${ac_cv_lib_hpdf_main+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lhpdf  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_hpdf_main=yes
+else
+  ac_cv_lib_hpdf_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hpdf_main" >&5
+$as_echo "$ac_cv_lib_hpdf_main" >&6; }
+if test "x$ac_cv_lib_hpdf_main" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBHPDF 1
+_ACEOF
+
+  LIBS="-lhpdf $LIBS"
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "--enable-pdf was given, but test for libharu failed
+See \`config.log' for more details" "$LINENO" 5 ; }
+
+fi
+
+fi
+if test "x$pdf" == xtrue; then :
+  for ac_header in hpdf.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "hpdf.h" "ac_cv_header_hpdf_h" "$ac_includes_default"
+if test "x$ac_cv_header_hpdf_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_HPDF_H 1
+_ACEOF
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "--enable-pdf was given, but test for headers failed
+See \`config.log' for more details" "$LINENO" 5 ; }
+
+fi
+
+done
+
+fi
+ if test x$pdf = xtrue; then
+  USE_PDF_TRUE=
+  USE_PDF_FALSE='#'
+else
+  USE_PDF_TRUE='#'
+  USE_PDF_FALSE=
+fi
+
+
+if test "x$u3d" == xtrue; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lIDTF" >&5
+$as_echo_n "checking for main in -lIDTF... " >&6; }
+if test "${ac_cv_lib_IDTF_main+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lIDTF -lm -ldl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_IDTF_main=yes
+else
+  ac_cv_lib_IDTF_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_IDTF_main" >&5
+$as_echo "$ac_cv_lib_IDTF_main" >&6; }
+if test "x$ac_cv_lib_IDTF_main" = x""yes; then :
+  U3D_LIBS="-lIDTF -lm -ldl"
+
+
+$as_echo "#define HAVE_U3D 1" >>confdefs.h
+
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "--enable-u3d was given, but test for libIDTF failed
+See \`config.log' for more details" "$LINENO" 5 ; }
+fi
+
+fi
+if test "x$u3d" == xtrue; then :
+  for ac_header in u3d/SceneConverterLib.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "u3d/SceneConverterLib.h" "ac_cv_header_u3d_SceneConverterLib_h" "$ac_includes_default"
+if test "x$ac_cv_header_u3d_SceneConverterLib_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_U3D_SCENECONVERTERLIB_H 1
+_ACEOF
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "--enable-u3d was given, but test for headers failed
+See \`config.log' for more details" "$LINENO" 5 ; }
+
+fi
+
+done
+
+fi
+ if test x$u3d = xtrue; then
+  USE_U3D_TRUE=
+  USE_U3D_FALSE='#'
+else
+  USE_U3D_TRUE='#'
+  USE_U3D_FALSE=
+fi
+
+
 # Check whether --enable-fltk was given.
 if test "${enable_fltk+set}" = set; then :
   enableval=$enable_fltk; case "${enableval}" in
@@ -16974,7 +17163,7 @@ else
 fi
 
 
-AM_CXXFLAGS="-Wall $GSL_FLAGS"
+AM_CXXFLAGS="$AM_CXXFLAGS -Wall $GSL_FLAGS"
 
 
 ac_config_files="$ac_config_files Makefile mgl/Makefile examples/Makefile include/Makefile lang/Makefile utils/Makefile widgets/Makefile"
@@ -17129,6 +17318,14 @@ if test -z "${USE_JPEG_TRUE}" && test -z "${USE_JPEG_FALSE}"; then
   as_fn_error $? "conditional \"USE_JPEG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_PDF_TRUE}" && test -z "${USE_PDF_FALSE}"; then
+  as_fn_error $? "conditional \"USE_PDF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_U3D_TRUE}" && test -z "${USE_U3D_FALSE}"; then
+  as_fn_error $? "conditional \"USE_U3D\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${USE_FLTK_TRUE}" && test -z "${USE_FLTK_FALSE}"; then
   as_fn_error $? "conditional \"USE_FLTK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17565,7 +17762,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mathgl $as_me 1.10, which was
+This file was extended by mathgl $as_me 1.11, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17631,7 +17828,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-mathgl config.status 1.10
+mathgl config.status 1.11
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
index b4afae5231e1bf7d05c50a7066a2fda8b234e89c..fc443057f91138542e17429e13625dd703c1c27c 100644 (file)
@@ -1,12 +1,13 @@
-AC_INIT([mathgl], [1.10], [mathgl.abalakin@gmail.com])
+AC_INIT([mathgl], [1.11], [mathgl.abalakin@gmail.com])
 
-MGL_RELEASE=1.10
+MGL_RELEASE=1.11
 AC_SUBST(MGL_RELEASE)
 
 AC_CONFIG_MACRO_DIR([config])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR(mgl)
 AC_CONFIG_HEADER(include/mgl/config.h)
+AC_LANG([C++])
 
 #MGL_RELEASE=1.4
 #AC_SUBST(MGL_RELEASE)
@@ -228,6 +229,49 @@ AC_CHECK_LIB([jpeg], [main], [(test x$all = xtrue || test x$jpeg = xtrue) && JPE
     [(test x$all = xtrue || test x$jpeg = xtrue) && echo "Please install jpeg library" && exit])
 AM_CONDITIONAL(USE_JPEG, (test x$all = xtrue || test x$jpeg = xtrue))
 
+AC_ARG_ENABLE(u3d,
+[  --enable-u3d    Turn on u3d functions],
+[case "${enableval}" in
+  yes) u3d=true ;;
+  no)  u3d=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-u3d) ;;
+esac],[u3d=false])
+AC_ARG_ENABLE(pdf,
+[  --enable-pdf    Turn on u3d and pdf functions],
+[case "${enableval}" in
+  yes) pdf=true; u3d=true ;;
+  no)  pdf=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-pdf) ;;
+esac],[pdf=false])
+AS_IF([test "x$pdf" == xtrue],
+  [AC_CHECK_LIB([hpdf], [main],
+   [],
+   [AC_MSG_FAILURE(
+   [--enable-pdf was given, but test for libharu failed])]
+  )])
+AS_IF([test "x$pdf" == xtrue],
+  [AC_CHECK_HEADERS([hpdf.h], [],
+  [AC_MSG_FAILURE(
+  [--enable-pdf was given, but test for headers failed])]
+  )])
+AM_CONDITIONAL(USE_PDF, test x$pdf = xtrue)
+
+AS_IF([test "x$u3d" == xtrue],
+  [AC_CHECK_LIB([IDTF], [main],
+  [AC_SUBST([U3D_LIBS], ["-lIDTF -lm -ldl"])
+  AC_DEFINE([HAVE_U3D], [1],
+  [Define if you have libIDTF])
+  ],
+  [AC_MSG_FAILURE(
+  [--enable-u3d was given, but test for libIDTF failed])],
+  [-lm -ldl])])
+AS_IF([test "x$u3d" == xtrue],
+  [AC_CHECK_HEADERS([u3d/SceneConverterLib.h], [],
+  [AC_MSG_FAILURE(
+  [--enable-u3d was given, but test for headers failed])]
+  )])
+AM_CONDITIONAL(USE_U3D, test x$u3d = xtrue)
+
 AC_ARG_ENABLE(fltk,
 [  --enable-fltk    Turn on fltk],
 [case "${enableval}" in
@@ -346,7 +390,7 @@ if (test x$docs = xtrue || test x$all = xtrue) ;then
 fi
 AM_CONDITIONAL(USE_DOCS, (test x$docs = xtrue || test x$all = xtrue) )
 
-AM_CXXFLAGS="-Wall $GSL_FLAGS"
+AM_CXXFLAGS="$AM_CXXFLAGS -Wall $GSL_FLAGS"
 AC_SUBST(AM_CXXFLAGS)
 
 AC_CONFIG_FILES([
index 0979b41bb3465f67fe52a3a4553a774c4286bfe5..f9fd0c206b2dc3a6dd410c9823e55044d2eb8536 100644 (file)
@@ -286,6 +286,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TMPDIR = @TMPDIR@
+U3D_LIBS = @U3D_LIBS@
 UIC = @UIC@
 VERSION = @VERSION@
 WX_FLAGS = @WX_FLAGS@
index df3af66326ffafa99331d357137e6823f7c4fa1f..0827244b799d20ab3a115fa352a4d3bd599bdf6d 100644 (file)
@@ -91,6 +91,8 @@ static struct option longopts[] =
        { "gif",                        no_argument,    &type,          6 },
        { "none",                       no_argument,    &type,          7 },
        { "bps",                        no_argument,    &type,          8 },
+       { "u3d",                        no_argument,    &type,          9 },
+       { "pdf",                        no_argument,    &type,          10 },
        { "help",                       no_argument,    NULL,           '?' },
        { NULL,                         0,                              NULL,           0 }
 };
@@ -104,6 +106,8 @@ void usage()
                "-mini                  - png picture is 200x133\n"             \
                "-big                   - png picture is 1200x800\n"    \
                "-idtf                  - output idtf\n"                                \
+               "-u3d                   - output u3d\n"                         \
+               "-pdf                   - output pdf\n"                         \
                "-eps                   - output EPS\n"                                 \
                "-jpeg                  - output JPEG\n"                                \
                "-solid                 - output solid PNG\n"                   \
@@ -149,6 +153,12 @@ void save(mglGraph *gr,const char *name,const char *suf="")
                        sprintf(buf,"%s%s.png",name,suf);
                        gr->WritePNG(buf,0,false);
                        break;
+               case 9: // U3D
+                       sprintf(buf,"%s%s.u3d",name,suf);
+                       gr->WriteU3D(buf);      break;
+               case 10:        // PDF
+                       sprintf(buf,"%s%s.pdf",name,suf);
+                       gr->WritePDF(buf);      break;
                default:// PNG (no alpha)
                        sprintf(buf,"%s%s.png",name,suf);
                        gr->WritePNG(buf,0,false);      break;
@@ -183,6 +193,9 @@ void smgl_fonts(mglGraph *gr)       // ticks features
 //-----------------------------------------------------------------------------
 void smgl_stick(mglGraph *gr)  // column plot
 {
+       if(type==5 || type==9 || type==10)      
+               gr->Puts(mglPoint(0,0),"Does not work in 3D\\n for reasons I do not care to investigate till 2.0");
+
        gr->SetRanges(-1, 1, -1, 1, 0, 1);      gr->Light(true);
        gr->StickPlot(3, 0, 40, 30);            gr->Axis("xyz_");
        gr->Surf("exp(-10*y^2-6*x^2)");
@@ -354,7 +367,7 @@ void smgl_pde(mglGraph *gr) // PDE and Ray sample
        a.Transpose("yxz");
        gr->CAxis(0, 1);
        gr->Dens(a,"wyrRk");
-       gr->Plot("-x", "k|", type==5?0.01:NAN);
+       gr->Plot("-x", "k|", (type==5 || type==9 || type==10)?0.01:NAN);
        gr->Puts(mglPoint(0, 0.85), "absorption: (x+z)/2 for x+z>0");
        gr->Title("Equation: ik_0\\partial_zu + \\Delta u + x\\cdot u + i \\frac{x+z}{2}\\cdot u = 0", "C", -float(width)/height);
        gr->Compression(false);  //put setting back
@@ -467,6 +480,7 @@ void smgl_samplec(mglGraph *gr)     // error boxes
        for(int i=0;i<10;i++)
                gr->Error(mglPoint(mgl_rnd()-0.5,mgl_rnd()-0.5,mgl_rnd()-0.5), mglPoint(0.1,0.1,0.1),"bo");
        gr->Axis();
+       gr->Rotate(0,0); // for unrotate in IDTF
 }
 //-----------------------------------------------------------------------------
 void smgl_sampleb(mglGraph *gr)        // Gaussian beam
@@ -561,6 +575,8 @@ void smgl_sample8(mglGraph *gr)     // 1d plot
 
        gr->SubPlot(2,2,3);     gr->Rotate(60,40);
        gr->Bars(x,y0,z,"ri");          gr->Box();
+       
+       gr->Rotate(0,0); // for unrotate in IDTF
 }
 //-----------------------------------------------------------------------------
 void smgl_sample7(mglGraph *gr)        // smoothing
@@ -600,7 +616,7 @@ void smgl_sample6(mglGraph *gr)     // differentiate
 //-----------------------------------------------------------------------------
 void smgl_sample5(mglGraph *gr)        // pen styles
 {
-       if(type==5)     gr->Puts(mglPoint(0,1.2),"line styles not supported","rL");
+       if(type==5 || type==9 || type==10)      gr->Puts(mglPoint(0,1.2),"line styles not supported","rL");
        mreal d,x1,x2,x0,y=0.95;
        d=0.3, x0=0.2, x1=0.5, x2=0.6;
        gr->Line(mglPoint(x0,1-0*d),mglPoint(x1,1-0*d),"k-");   gr->Puts(mglPoint(x2,y-0*d),"Solid '-'","rL");
@@ -732,6 +748,8 @@ void smgl_sample2(mglGraph *gr)     // axis and grid
        gr->Label('z',"Z axis",0);
        gr->Puts(mglPoint(0,0,1.5),"Remove X axis, and");
        gr->Puts(mglPoint(0,0,1.2),"decrease number of ticks");
+       
+       gr->Rotate(0,0); // for unrotate in IDTF
 }
 //-----------------------------------------------------------------------------
 void smgl_sample1(mglGraph *gr)        // transformation
@@ -757,6 +775,7 @@ void smgl_sample1(mglGraph *gr)     // transformation
        gr->Aspect(1,2,2);
        gr->Box();
        gr->Text(mglPoint(0,0,1.5),"Aspect in other direction");
+       gr->Rotate(0,0); // for unrotate in IDTF
 }
 //-----------------------------------------------------------------------------
 void mgls_prepare1d(mglData *y, mglData *y1=0, mglData *y2=0, mglData *x1=0, mglData *x2=0)
@@ -1021,6 +1040,7 @@ void smgl_stereo(mglGraph *gr)
        gr->Box();      gr->Surf(a);
        gr->SubPlot(2,1,1);     gr->Rotate(40,60-3);
        gr->Box();      gr->Surf(a);
+       gr->Rotate(0,0); // for unrotate in IDTF
 }
 //-----------------------------------------------------------------------------
 void smgl_tile(mglGraph *gr)
@@ -1083,7 +1103,7 @@ void smgl_surf_fog(mglGraph *gr)
 {
        mglData a;      mgls_prepare2d(&a);
        gr->Light(true);        gr->Rotate(40,60);      gr->Fog(1);     gr->Box();
-       type==5?gr->Text(mglPoint(),"Fog not supported") : gr->Surf(a);
+       (type==5 || type==9 || type==10)?gr->Text(mglPoint(),"Fog not supported") : gr->Surf(a);
        gr->Fog(0);
 }
 //-----------------------------------------------------------------------------
@@ -1205,7 +1225,7 @@ void smgl_cloudp(mglGraph *gr)
        mglData c;      mgls_prepare3d(&c);
        gr->Rotate(40,60);      gr->Alpha(true);        gr->VertexColor(false);
        gr->Box();
-       if(type==5)     gr->Text(mglPoint(0,0,0),"Point clouds not supported");
+       if(type==5 || type==9 || type==10)      gr->Text(mglPoint(0,0,0),"Point clouds not supported");
        else            gr->CloudP(c,"wyrRk");
 }
 //-----------------------------------------------------------------------------
@@ -1361,14 +1381,14 @@ void smgl_legend(mglGraph *gr)
        }
        gr->Axis(mglPoint(0), mglPoint(1));
        gr->Box();      gr->Plot(f);    gr->Axis("xy");
-       if(type==5)     gr->LegendBox = false;
+       if(type==5 || type==9 || type==10)      gr->LegendBox = false;
        gr->AddLegend("sin(\\pi {x^2})","b");   gr->AddLegend("sin(\\pi x)","g*");
        gr->AddLegend("sin(\\pi \\sqrt{x})","r+");      gr->Legend();
 }
 //-----------------------------------------------------------------------------
 void smgl_type0(mglGraph *gr)  // TranspType = 0
 {
-       if(type==5)     return;
+       if(type==5 || type==9 || type==10)      return;
        gr->Alpha(true);        gr->Light(true);        gr->Light(0,mglPoint(0,0,1));
        mglData a;      mgls_prepare2d(&a);
        gr->TranspType = 0;     gr->Clf();
@@ -1380,7 +1400,7 @@ void smgl_type0(mglGraph *gr)     // TranspType = 0
 //-----------------------------------------------------------------------------
 void smgl_type1(mglGraph *gr)  // TranspType = 1
 {
-       if(type==5)     return;
+       if(type==5 || type==9 || type==10)      return;
        gr->Alpha(true);        gr->Light(true);        gr->Light(0,mglPoint(0,0,1));
        mglData a;      mgls_prepare2d(&a);
        gr->TranspType = 1;     gr->Clf();
@@ -1392,7 +1412,7 @@ void smgl_type1(mglGraph *gr)     // TranspType = 1
 //-----------------------------------------------------------------------------
 void smgl_type2(mglGraph *gr)  // TranspType = 2
 {
-       if(type==5)     return;
+       if(type==5 || type==9 || type==10)      return;
        gr->Alpha(true);        gr->Light(true);        gr->Light(0,mglPoint(0,0,1));
        mglData a;      mgls_prepare2d(&a);
        gr->TranspType = 2;     gr->Clf();
@@ -1624,7 +1644,7 @@ void smgl_flow_dens(mglGraph *gr) // flow threads and density plot
 {
        mglData a,b,d;  mgls_prepare2v(&a,&b);  d = a;
        for(int i=0;i<a.nx*a.ny;i++)    d.a[i] = hypot(a.a[i],b.a[i]);
-       gr->Flow(a,b,"br",5,true,type==5?-0.99:NAN);
+       gr->Flow(a,b,"br",5,true,(type==5 || type==9 || type==10)?-0.99:NAN);
        gr->Dens(d,"BbcyrR");   gr->Box();
 }
 //-----------------------------------------------------------------------------
@@ -1756,9 +1776,17 @@ int main(int argc,char **argv)
                        default:        usage();        return 0;
                }
 
-       if(type==5)                     gr = &u3d;
-       else if(type==1 || type==2 || type==8)  gr = &ps;
+       if(type==5 || type==9 || type==10)
+       {
+               u3d.unrotate_flag = true;
+               gr = &u3d;
+       }
+       else 
+       {
+               if(type==1 || type==2 || type==8)       gr = &ps;
        else                            gr = &zb;
+       }
+
        if(mini)                {       gr->SetSize(200,133);   suf = "_sm";    }
        else if(big)
        {       gr->SetSize(1200,800);  suf = "_lg";    gr->BaseLineWidth = 2;  }
index 8c7d80272d7f2db1c906bb54003cfa3b9474573b..f7b99e05de58a210a7758db99af18ef64e2d5bae 100644 (file)
@@ -193,6 +193,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TMPDIR = @TMPDIR@
+U3D_LIBS = @U3D_LIBS@
 UIC = @UIC@
 VERSION = @VERSION@
 WX_FLAGS = @WX_FLAGS@
index 5f5e6941527062d93021cf19567d86bf4f4f0c33..217c5a8991afb655866d3ec5a839217da9efa126 100644 (file)
@@ -3,9 +3,15 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
+/* Define to 1 if you have the <hpdf.h> header file. */
+#undef HAVE_HPDF_H
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `hpdf' library (-lhpdf). */
+#undef HAVE_LIBHPDF
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* Define if you have libIDTF */
+#undef HAVE_U3D
+
+/* Define to 1 if you have the <u3d/SceneConverterLib.h> header file. */
+#undef HAVE_U3D_SCENECONVERTERLIB_H
+
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
index b9aa8a4c905b9fa64f83a5bbe10c58ab4c70f94f..5ebe75d6dc706a7f67f592ce6246a61216ed6339 100644 (file)
@@ -177,6 +177,10 @@ public:
        virtual void WriteSVG(const char *fname,const char *descr=0);\r
        /// Write the frame in file using IDTF format\r
        virtual void WriteIDTF(const char *fname,const char *descr=0);\r
+       /// Write the frame in file using U3D format\r
+       virtual void WriteU3D(const char *fname,const char *descr=0);\r
+       /// Write the frame in file using PDF format\r
+       virtual void WritePDF(const char *fname,const char *descr=0);\r
        /// Write the frame in file using GIF format (only for current frame!)\r
        virtual void WriteGIF(const char *fname,const char *descr=0);\r
        /// Write the frame in file (depending extension, write current frame if fname is empty)\r
@@ -215,11 +219,11 @@ public:
        /// Switch on/off the specified light source.\r
        virtual void Light(int n, bool enable); //=0\r
        /// Add a light source.\r
-       void Light(int n,mglPoint p, char c='w', mreal bright=0.5, bool infty=true);\r
+       void Light(int n,mglPoint p, char c='w', mreal bright=0.5, bool infty=true, mreal ap=0);\r
        inline void AddLight(int n, mreal x, mreal y, mreal z, char col='w')\r
        {       Light(n, mglPoint(x,y,z), col); };\r
        /// Add a light source.\r
-       virtual void Light(int n,mglPoint p, mglColor c, mreal bright=0.5, bool infty=true); //=0\r
+       virtual void Light(int n,mglPoint p, mglColor c, mreal bright=0.5, bool infty=true, mreal ap=0); //=0\r
        /// Set ambient light brightness\r
        virtual void Ambient(mreal bright=0.5);\r
        /// Set relative width of rectangles in Bars, Barh, BoxPlot\r
@@ -294,7 +298,7 @@ public:
        /// Set angle of view indepently from mglGraph::Rotate().\r
        virtual void View(mreal tetx,mreal tetz,mreal tety=0);
        inline int GetWarn()    {       return WarnCode;        };\r
-       void DefaultPlotParam();        ///< Set default parameter for plotting\r
+       virtual void DefaultPlotParam();        ///< Set default parameter for plotting\r
        /// Zoom in or zoom out (if Zoom(0, 0, 1, 1)) a part of picture\r
        void Zoom(mreal x1, mreal y1, mreal x2, mreal y2);\r
        /// Clear transformation matrix.\r
@@ -317,7 +321,7 @@ public:
        /// Set aspect ratio for further plotting.\r
        virtual void Aspect(mreal Ax,mreal Ay,mreal Az)=0;\r
        /// Rotate a further plotting.\r
-       void Rotate(mreal TetX,mreal TetZ,mreal TetY=0);\r
+       virtual void Rotate(mreal TetX,mreal TetZ,mreal TetY=0);\r
        /// Rotate a further plotting around vector {x,y,z}.\r
        virtual void RotateN(mreal Tet,mreal x,mreal y,mreal z)=0;\r
        /// Set perspective (in range [0,1)) for plot. Set to zero for switching off.\r
index 862f52afc295d9e6105054e55a2c2a17d24cd337..9b293468a86e12e57af2c6ac4ab81b16860fd182 100644 (file)
@@ -52,9 +52,11 @@ using mglGraph::Legend;
        bool Alpha(bool enable);\r
        bool Light(bool enable);\r
        void Light(int n, bool enable);\r
-       void Light(int n,mglPoint p, mglColor c=WC, mreal br=0.5, bool infty=true);\r
+       void Light(int n,mglPoint p, mglColor c=WC, mreal br=0.5, bool infty=true, mreal ap=0);\r
 \r
-       void InPlot(mreal x1,mreal x2,mreal y1,mreal y2, bool rel=false);\r
+       virtual void InPlot(mreal x1,mreal x2,mreal y1,mreal y2, bool rel=false);\r
+       virtual void DefaultPlotParam();        ///< Set default parameter for plotting\r
+       virtual void Rotate(mreal TetX,mreal TetZ,mreal TetY=0);\r
        void StickPlot(int num, int i, mreal tet, mreal phi);\r
        void Aspect(mreal Ax,mreal Ay,mreal Az);\r
        void RotateN(mreal Tet,mreal x,mreal y,mreal z);\r
index 0039db9fef07f1c759f6f4079aeb5bba2fd0ff0e..d877d76f4bb3bdd4d10a57c3eb49810300d03b5d 100644 (file)
@@ -371,6 +371,9 @@ mglData mglRay(const char *ham, mglPoint r0, mglPoint p0, mreal dt=0.1, mreal tm
 mglData mglJacobian(const mglData &x, const mglData &y);\r
 /// Calculate Jacobian determinant for D{x(u,v,w), y(u,v,w), z(u,v,w)}\r
 mglData mglJacobian(const mglData &x, const mglData &y, const mglData &z);\r
+// Do something like Delone triangulation
+mglData mglTriangulation(const mglData &x, const mglData &y, const mglData &z, mreal er);\r
+mglData mglTriangulation(const mglData &x, const mglData &y, mreal er);\r
 //-----------------------------------------------------------------------------\r
 #endif\r
 #endif\r
index 6c85c13f48a8a2343f6e16312ee7488d4c91eafd..fdba9fd34ddded5a70ead53422a6c8b0e5cfc81d 100644 (file)
@@ -31,6 +31,7 @@
 
 //#ifdef WIN32
 #ifdef _MSC_VER
+#define chdir  _chdir // BORLAND has chdir
 #include <float.h>
 const unsigned long mgl_nan[2] = {0xffffffff, 0x7fffffff};
 #define NANd   (*(double*)mgl_nan)
@@ -40,9 +41,6 @@ const unsigned long mgl_nan[2] = {0xffffffff, 0x7fffffff};
 #else
 #define NAN            NANd
 #endif
-#ifdef _MSC_VER
-#define chdir  _chdir // BORLAND has chdir
-#endif
 #endif
 
 #ifndef M_PI
index 198e8a62d4ec6e859f96edd15f9e90984c269279..7c390944845b4d0d0aac74c5252801791397d492 100644 (file)
@@ -285,6 +285,9 @@ public:
        void Flush() { points_finished = lines_finished = mesh_finished = true; };\r
        void Light ( int n,mglPoint p, mglColor c=NC, mreal br=0.5, bool infty=true );\r
        void InPlot ( mreal x1,mreal x2,mreal y1,mreal y2, bool rel=false );\r
+       void DefaultPlotParam();        ///< Set default parameter for plotting\r
+       void Rotate(mreal TetX,mreal TetZ,mreal TetY=0);\r
+       void SetSize(int ,int ) {};\r
        void Clf ( mglColor Back=NC );\r
        /// Print string \a str in position \a p with font size \a size.\r
        void Putsw(mglPoint p,const wchar_t *text,const char *font=0,mreal size=-1,char dir=0,mreal shift=0);\r
@@ -293,6 +296,8 @@ public:
 \r
        void Ball ( mreal x,mreal y,mreal z,mglColor col=RC,mreal alpha=1 );\r
        void WriteIDTF ( const char *fname,const char *descr=0 );\r
+       void WriteU3D ( const char *fname,const char *descr=0 );\r
+       void WritePDF ( const char *fname,const char *descr=0 );\r
        friend class u3dModel;\r
        friend class u3dMesh;\r
        friend class u3dBall;\r
@@ -372,6 +377,8 @@ protected:
 \r
        mreal* col2col ( const mreal *c, const mreal *n, mreal *r );\r
        void MakeTransformMatrix( mreal position[4][4], mreal invpos[4][4] );\r
+\r
+       mreal rotX, rotY, rotZ;\r
 };\r
 //-----------------------------------------------------------------------------\r
 #endif\r
index af618328428b882df570f599270e90814149e7cc..c4722bda2c077b53387e079ea711d1b633062287 100644 (file)
@@ -220,6 +220,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TMPDIR = @TMPDIR@
+U3D_LIBS = @U3D_LIBS@
 UIC = @UIC@
 VERSION = @VERSION@
 WX_FLAGS = @WX_FLAGS@
index 3d7c7896cd24c52e6e73442a08308e76d2ea4a59..2bbf8eaa9c34621193b536c21964a155948a4118 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
        <Workspace title="Workspace">
-               <Project filename="mathgl.cbp" active="1" />
+               <Project filename="mathgl.cbp" />
                <Project filename="mgl-glut.cbp" />
                <Project filename="mgl-fltk.cbp" />
                <Project filename="mgl2png.cbp" />
@@ -10,6 +10,6 @@
                <Project filename="mgl2gif.cbp" />
                <Project filename="mgl2cpp.cbp" />
                <Project filename="mglview.cbp" />
-               <Project filename="mgl_example.cbp" />
+               <Project filename="mgl_example.cbp" active="1" />
        </Workspace>
 </CodeBlocks_workspace_file>
index 6016ce012fd35652d1f8554a5f8e089ac649bf8a..b2e9dfafebaf6a6d3d8ce44f0ab0150e92f5d3c6 100644 (file)
@@ -14,6 +14,19 @@ set_target_properties(mgl-static PROPERTIES OUTPUT_NAME "mgl")
 set_target_properties(mgl PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 set_target_properties(mgl-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 
+if(use_u3d)
+#      include_directories( IDTFGen ${U3D_INCLUDE_DIR} )
+       add_definitions(-DHAVE_U3D)
+       target_link_libraries(mgl ${U3D_LIB} )
+       target_link_libraries(mgl-static ${U3D_LIB} )
+       include_directories(${U3D_INCLUDE_DIR})
+       if(HPDF_INCLUDE_DIR AND HPDF_LIB)
+               include_directories(${HPDF_INCLUDE_DIR})
+               target_link_libraries(mgl ${HPDF_LIB} )
+               add_definitions(-DHAVE_HPDF_H)
+       endif(HPDF_INCLUDE_DIR AND HPDF_LIB)
+endif(use_u3d)
+
 if(use_qt)
        add_definitions(-DHAVE_QT)
 endif(use_qt)
index c2ad4a485c978712531b82692556b21150bf6dc5..9af01946234318ce4100ea9d6a99beed6c3d0bbc 100644 (file)
@@ -48,6 +48,10 @@ if USE_JPEG
 libmgl_la_LIBADD += $(JPEG_LIBS)
 endif
 
+if USE_U3D
+libmgl_la_LIBADD += $(U3D_LIBS)
+endif
+
 libmgl_la_SOURCES = \
 mgl_data_cf.cpp           mgl_axis.cpp     mgl_data_png.cpp  mgl_zb2.cpp \
 mgl_c.cpp          mgl_eps.cpp      mgl_font.cpp      mgl_zb.cpp \
index 899e46b111bcdfba99f0a6a185d56fc7766dd3c9..877f8aab53200c6d4726ff0b59401bc2081975eb 100644 (file)
@@ -44,6 +44,7 @@ host_triplet = @host@
 @USE_HDF5_TRUE@am__append_8 = $(HDF5_LIBS)
 @USE_GIF_TRUE@am__append_9 = $(GIF_LIBS)
 @USE_JPEG_TRUE@am__append_10 = $(JPEG_LIBS)
+@USE_U3D_TRUE@am__append_11 = $(U3D_LIBS)
 subdir = mgl
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -85,10 +86,12 @@ am__DEPENDENCIES_1 =
 @USE_HDF5_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
 @USE_GIF_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
 @USE_JPEG_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+@USE_U3D_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
 libmgl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
        $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
-       $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7)
+       $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7) \
+       $(am__DEPENDENCIES_8)
 am_libmgl_la_OBJECTS = libmgl_la-mgl_data_cf.lo libmgl_la-mgl_axis.lo \
        libmgl_la-mgl_data_png.lo libmgl_la-mgl_zb2.lo \
        libmgl_la-mgl_c.lo libmgl_la-mgl_eps.lo libmgl_la-mgl_font.lo \
@@ -240,6 +243,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TMPDIR = @TMPDIR@
+U3D_LIBS = @U3D_LIBS@
 UIC = @UIC@
 VERSION = @VERSION@
 WX_FLAGS = @WX_FLAGS@
@@ -306,7 +310,7 @@ WIDGETS = $(am__append_1) $(am__append_2) $(am__append_3) \
        $(am__append_4)
 libmgl_la_LIBADD = $(PNG_LIBS) $(GL_LIBS) $(LOPENMP) $(am__append_5) \
        $(am__append_6) $(am__append_7) $(am__append_8) \
-       $(am__append_9) $(am__append_10)
+       $(am__append_9) $(am__append_10) $(am__append_11)
 libmgl_la_LDFLAGS = -no-undefined -version-info $(MGL_CURRENT):$(MGL_REVISION):$(MGL_AGE)
 libmgl_la_CXXFLAGS = $(WIDGETS) -DMGL_FONT_PATH=\"$(datadir)/$(PACKAGE)/fonts/\" \
     -DMOD_LIB_DIR=\"$(libdir)/mgl/\" $(HDF5_FLAGS) $(HDF4_FLAGS) $(GIF_FLAGS) $(JPEG_FLAGS) \
index 53dba12ca33997b4adec58df506dfcbcd40d3c25..072df2f7566cbbc114e2e773b4a19eafa7ff895a 100644 (file)
@@ -2,24 +2,24 @@
  * mgl_ab.cpp is part of Math Graphic Library\r
  * Copyright (C) 2007 Alexey Balakin <balakin@appl.sci-nnov.ru>            *\r
  *                                                                         *\r
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Library General Public License as       *
- *   published by the Free Software Foundation; either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU Library General Public     *
- *   License along with this program; if not, write to the                 *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
+ *   This program is free software; you can redistribute it and/or modify  *\r
+ *   it under the terms of the GNU Library General Public License as       *\r
+ *   published by the Free Software Foundation; either version 3 of the    *\r
+ *   License, or (at your option) any later version.                       *\r
+ *                                                                         *\r
+ *   This program is distributed in the hope that it will be useful,       *\r
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *\r
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *\r
+ *   GNU General Public License for more details.                          *\r
+ *                                                                         *\r
+ *   You should have received a copy of the GNU Library General Public     *\r
+ *   License along with this program; if not, write to the                 *\r
+ *   Free Software Foundation, Inc.,                                       *\r
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *\r
+ ***************************************************************************/\r
 #include <stdlib.h>\r
 #include <time.h>\r
-#include <wchar.h>
+#include <wchar.h>\r
 \r
 #include "mgl/mgl_ab.h"\r
 #define imax(a,b)      (a)>(b) ? (a) : (b)\r
@@ -46,6 +46,16 @@ mglGraphAB::mglGraphAB(int w,int h) : mglGraph()
 mglGraphAB::~mglGraphAB()\r
 {      if(G)   {       delete []G;     delete []G4;    delete []OI;    }       }\r
 //-----------------------------------------------------------------------------\r
+void mglGraphAB::DefaultPlotParam()\r
+{\r
+       mglGraph::DefaultPlotParam();\r
+}\r
+//-----------------------------------------------------------------------------\r
+void mglGraphAB::Rotate(mreal TetX,mreal TetZ,mreal TetY)\r
+{\r
+       mglGraph::Rotate( TetX,TetZ,TetY );\r
+}\r
+//-----------------------------------------------------------------------------\r
 void mglGraphAB::Pop()\r
 {\r
        if(st_pos<0)    return;\r
@@ -126,7 +136,7 @@ void mglGraphAB::RotateN(mreal Tet,mreal x,mreal y,mreal z)
        {\r
                mreal m=(fabs(B[3])+fabs(B[4])+fabs(B[5]))/inH;\r
                mreal n=(fabs(B[0])+fabs(B[1])+fabs(B[2]))/inW;\r
-               PlotFactor = 1.55+0.6147*(m<n ? (n-1):(m-1));
+               PlotFactor = 1.55+0.6147*(m<n ? (n-1):(m-1));\r
        }\r
 }\r
 //-----------------------------------------------------------------------------\r
@@ -154,7 +164,7 @@ void mglGraphAB::InPlot(mreal x1,mreal x2,mreal y1,mreal y2, bool rel)
                B[8] = sqrt(B[0]*B[4]);\r
                B1[11]= zPos = (1.f-B[8]/(2*Depth))*Depth;\r
                memcpy(B1,B,9*sizeof(mreal));\r
-       }
+       }\r
        inW = B[0];     inH=B[4];\r
        font_factor = B[0] < B[4] ? B[0] : B[4];\r
        if(AutoPlotFactor) PlotFactor = 1.55;   // Automatically change plot factor !!!\r
@@ -173,21 +183,21 @@ void mglGraphAB::Aspect(mreal Ax,mreal Ay,mreal Az)
 }\r
 //-----------------------------------------------------------------------------\r
 void mglGraphAB::StickPlot(int num, int id, mreal tet, mreal phi)\r
-{
-       mreal dx,dy,w0,h0, p[6]={-1,0,0,1,0,0};
-       InPlot(0,1,0,1,true);   Rotate(tet, phi);       PostScale(p,2);
-       w0=1/(1+(num-1)*fabs(p[3]-p[0])/inW);           dx=(p[3]-p[0])*w0/inW;
-       h0=1/(1+(num-1)*fabs(p[4]-p[1])/inH);           dy=(p[4]-p[1])*h0/inH;
-
-       p[0]=-1;        p[3]=1;         p[1]=p[2]=p[4]=p[5]=0;  // extra widening
-       InPlot(dx>0?0:1-w0, dx>0?w0:1, dy>0?0:1-h0, dy>0?h0:1, true);
-       Rotate(tet,phi);        PostScale(p,2);
-       w0=1/(1+(num-1)*fabs(p[3]-p[0])/inW);           dx=(p[3]-p[0])*w0/inW;
-       h0=1/(1+(num-1)*fabs(p[4]-p[1])/inH);           dy=(p[4]-p[1])*h0/inH;
-
-       mreal x1=dx>0?dx*id:1-w0+dx*id, x2=dx>0?w0+dx*id:1+dx*id;
-       mreal y1=dy>0?dy*id:1-h0+dy*id, y2=dy>0?h0+dy*id:1+dy*id;
-       InPlot(x1, x2, y1, y2, true);   Rotate(tet,phi);
+{\r
+       mreal dx,dy,w0,h0, p[6]={-1,0,0,1,0,0};\r
+       InPlot(0,1,0,1,true);   Rotate(tet, phi);       PostScale(p,2);\r
+       w0=1/(1+(num-1)*fabs(p[3]-p[0])/inW);           dx=(p[3]-p[0])*w0/inW;\r
+       h0=1/(1+(num-1)*fabs(p[4]-p[1])/inH);           dy=(p[4]-p[1])*h0/inH;\r
+\r
+       p[0]=-1;        p[3]=1;         p[1]=p[2]=p[4]=p[5]=0;  // extra widening\r
+       InPlot(dx>0?0:1-w0, dx>0?w0:1, dy>0?0:1-h0, dy>0?h0:1, true);\r
+       Rotate(tet,phi);        PostScale(p,2);\r
+       w0=1/(1+(num-1)*fabs(p[3]-p[0])/inW);           dx=(p[3]-p[0])*w0/inW;\r
+       h0=1/(1+(num-1)*fabs(p[4]-p[1])/inH);           dy=(p[4]-p[1])*h0/inH;\r
+\r
+       mreal x1=dx>0?dx*id:1-w0+dx*id, x2=dx>0?w0+dx*id:1+dx*id;\r
+       mreal y1=dy>0?dy*id:1-h0+dy*id, y2=dy>0?h0+dy*id:1+dy*id;\r
+       InPlot(x1, x2, y1, y2, true);   Rotate(tet,phi);\r
 }\r
 //-----------------------------------------------------------------------------\r
 void mglGraphAB::NormScale(mreal *p,long n)\r
@@ -256,18 +266,18 @@ mglPoint mglGraphAB::CalcXYZ(int xs, int ys)
                                        Min.y + (Max.y-Min.y)*(y+1)/2,\r
                                        Min.z + (Max.z-Min.z)*(z+1)/2);\r
        return LastMousePos;\r
-}
-//-----------------------------------------------------------------------------\r
-void mglGraphAB::CalcScr(mglPoint p, int *xs, int *ys)
-{
-       mreal pp[3]={p.x,p.y,p.z};
-       ScalePoint(pp[0],pp[1],pp[2]);
-       PostScale (pp,1);
-       if(xs)  *xs=int(pp[0]);
-       if(ys)  *ys=int(pp[1]);
-}
-//-----------------------------------------------------------------------------\r
-mglPoint mglGraphAB::CalcScr(mglPoint p)
+}\r
+//-----------------------------------------------------------------------------\r
+void mglGraphAB::CalcScr(mglPoint p, int *xs, int *ys)\r
+{\r
+       mreal pp[3]={p.x,p.y,p.z};\r
+       ScalePoint(pp[0],pp[1],pp[2]);\r
+       PostScale (pp,1);\r
+       if(xs)  *xs=int(pp[0]);\r
+       if(ys)  *ys=int(pp[1]);\r
+}\r
+//-----------------------------------------------------------------------------\r
+mglPoint mglGraphAB::CalcScr(mglPoint p)\r
 {      int x,y;        CalcScr(p,&x,&y);       return mglPoint(x,y);   }\r
 //-----------------------------------------------------------------------------\r
 void mglGraphAB::LightScale()\r
@@ -293,10 +303,11 @@ void mglGraphAB::Light(int n, bool enable)
        nLight[n] = enable;\r
 }\r
 //-----------------------------------------------------------------------------\r
-void mglGraphAB::Light(int n, mglPoint p, mglColor c, mreal br, bool inf)\r
+void mglGraphAB::Light(int n, mglPoint p, mglColor c, mreal br, bool inf, mreal ap)\r
 {\r
        if(n<0 || n>9)  {       SetWarn(mglWarnLId);    return; }\r
-       nLight[n] = true;       aLight[n] = 3;  bLight[n] = br; iLight[n] = inf;\r
+       nLight[n] = true;       aLight[n] = ap>0?ap*ap:3;\r
+       bLight[n] = br;         iLight[n] = inf;\r
        rLight[3*n] = p.x;      rLight[3*n+1] = p.y;    rLight[3*n+2] = p.z;\r
        cLight[3*n] = c.r;      cLight[3*n+1] = c.g;    cLight[3*n+2] = c.b;\r
 }\r
@@ -351,27 +362,27 @@ mreal mglGraphAB::Putsw(mglPoint p,mglPoint n,const wchar_t *str,char font,mreal
 }\r
 //-----------------------------------------------------------------------------\r
 void mglGraphAB::Putsw(mglPoint p, const wchar_t *wcs, const char *font, mreal size, char dir, mreal sh)\r
-{
+{\r
        static int nl_shift = 0;\r
-       static int cgid=1;      StartGroup("Putsw",cgid++);
+       static int cgid=1;      StartGroup("Putsw",cgid++);\r
        if(font && strchr(font, 'A'))   {       Labelw(p.x, p.y, wcs,font,size,false);  return; }\r
-       if(font && strchr(font, 'a'))   {       Labelw(p.x, p.y, wcs,font,size,true);   return; }
-
-       wchar_t *wcl;
-       unsigned wn=0;
-       const wchar_t *wnl=0;
-       for(wn=0;wn<wcslen(wcs);wn++)
-               if(wcs[wn]=='\n' || (wcs[wn]=='\\' && wcs[wn+1]=='n' && strchr(" \t,.{[]1234567890",wcs[wn+2])))
-               {       wnl = wcs+wn;   break;  }
-       if(wnl)
-       {
-               wcl = new wchar_t[wn+1];        memcpy(wcl,wcs,wn*sizeof(wchar_t));
-               wcl[wn]=0;      Putsw(p, wcl, font, size, dir, sh);
-               wnl = wcs[wn]=='\n'?wnl+1:wnl+2;
-               if(*wnl<=' ')   wnl++;
-               nl_shift++;     Putsw(p, wnl, font, size, dir, sh);     nl_shift--;
-               return;
-       }
+       if(font && strchr(font, 'a'))   {       Labelw(p.x, p.y, wcs,font,size,true);   return; }\r
+\r
+       wchar_t *wcl;\r
+       unsigned wn=0;\r
+       const wchar_t *wnl=0;\r
+       for(wn=0;wn<wcslen(wcs);wn++)\r
+               if(wcs[wn]=='\n' || (wcs[wn]=='\\' && wcs[wn+1]=='n' && strchr(" \t,.{[]1234567890",wcs[wn+2])))\r
+               {       wnl = wcs+wn;   break;  }\r
+       if(wnl)\r
+       {\r
+               wcl = new wchar_t[wn+1];        memcpy(wcl,wcs,wn*sizeof(wchar_t));\r
+               wcl[wn]=0;      Putsw(p, wcl, font, size, dir, sh);\r
+               wnl = wcs[wn]=='\n'?wnl+1:wnl+2;\r
+               if(*wnl<=' ')   wnl++;\r
+               nl_shift++;     Putsw(p, wnl, font, size, dir, sh);     nl_shift--;\r
+               return;\r
+       }\r
 \r
        bool upside = ( (((_sx==-1) ^ (Org.y==Max.y || Org.z==Max.z)) && (dir=='x' || dir=='X')) ||\r
                                        (((_sy==-1) ^ (Org.x==Max.x || Org.z==Max.z)) && (dir=='y' || dir=='Y')) ||\r
@@ -448,7 +459,7 @@ void mglGraphAB::Putsw(mglPoint p, const wchar_t *wcs, const char *font, mreal s
                mreal ss = (pp[3]>pp[0] || tet==-90) ? 1 : -1;\r
                xPos = pp[0]+shift*ss*(pp[4]-pp[1])/sqrt(ll) - B[1]*0.02f;\r
                yPos = pp[1]-shift*ss*(pp[3]-pp[0])/sqrt(ll) - B[4]*0.02f;\r
-               zPos = pp[2];
+               zPos = pp[2];\r
        }\r
        else\r
        {\r
@@ -473,7 +484,7 @@ void mglGraphAB::Putsw(mglPoint p, const wchar_t *wcs, const char *font, mreal s
                        strcat(font1,ch);\r
                }\r
        }\r
-       zoomx1=x1;      zoomx2=x2;      zoomy1=y1;      zoomy2=y2;
+       zoomx1=x1;      zoomx2=x2;      zoomy1=y1;      zoomy2=y2;\r
        yPos -= nl_shift*0.11/PlotFactor*fsize;\r
        fnt->Puts(wcs,font1,col);\r
        Pop();  delete []font1; EndGroup();\r
@@ -488,7 +499,7 @@ void mglGraphAB::Legend(int n, wchar_t **text,char **style, mreal x, mreal y,
        static int cgid=1;      StartGroup("Legend",cgid++);\r
        mreal pp[15], r=GetRatio(), rh, rw, s3=PlotFactor;\r
        if(size<=0)     size = -size*FontSize;\r
-       if(!font || !(*font))   font="L";
+       if(!font || !(*font))   font="L";\r
        char *pA, *ff = new char[strlen(font)+1];       strcpy(ff,font);\r
        llen *= 1.5;\r
 \r
@@ -503,12 +514,12 @@ void mglGraphAB::Legend(int n, wchar_t **text,char **style, mreal x, mreal y,
                w = w>j ? w:j;\r
        }\r
        w = (w + llen*1.1f);    // add space for lines\r
-
-       bool rel = true;
-       if((pA=strchr(ff,'A')))
-       {
-               *pA = 'L';
-               rel = false;
+\r
+       bool rel = true;\r
+       if((pA=strchr(ff,'A')))\r
+       {\r
+               *pA = 'L';\r
+               rel = false;\r
        }\r
        Push(); Identity(rel);  //      memcpy(B,B1,9*sizeof(mreal));\r
        if(LegendBox)   // draw bounding box\r
@@ -536,12 +547,12 @@ void mglGraphAB::Legend(int n, wchar_t **text,char **style, mreal x, mreal y,
 //             ScalePoint(pp[0],pp[1],pp[2]);  ScalePoint(pp[3],pp[4],pp[5]);  ScalePoint(pp[6],pp[7],pp[8]);\r
 \r
                pPos=0; curv_plot(2,pp,0);\r
-               if(m)   for(int j=0;j<LegendMarks;j++)
-               {
+               if(m)   for(int j=0;j<LegendMarks;j++)\r
+               {\r
                        pp[8] = s3;     pp[7] = y+i*h+0.45f*h;\r
-                       pp[6] = x+0.1f*llen + (j+1)*0.8f*llen/(1.+LegendMarks);
-//                     ScalePoint(pp[6],pp[7],pp[8]);
-                       Mark(pp[6],pp[7],pp[8],m);
+                       pp[6] = x+0.1f*llen + (j+1)*0.8f*llen/(1.+LegendMarks);\r
+//                     ScalePoint(pp[6],pp[7],pp[8]);\r
+                       Mark(pp[6],pp[7],pp[8],m);\r
                }\r
                SelectPen(TranspType!=2 ? "k-1":"w-1");\r
                Putsw(mglPoint(x+(style[i][0]!=0?llen:0), y+i*h+0.3f*h, s3), text[i], ff, size);\r
@@ -613,16 +624,16 @@ void mglGraphAB::colorbar(const mglData &vv, const mglColor *cs, int where, mrea
                if(d<4) m = 1+int(2*d+0.5);\r
                else    m = 1+int(d+0.5);\r
                if(m<5) m = 5;\r
-       }*/
-       if(dc<0) m=int(0.5-dc);
-       if(dc>0) m=int(0.5+(Cmax-Cmin)/dc);
-       if(dc==0 && Cmax*Cmin>0)        m = 1+int(0.5+fabs(log10(Cmax/Cmin)));
-       if(m<2) m=2;
+       }*/\r
+       if(dc<0) m=int(0.5-dc);\r
+       if(dc>0) m=int(0.5+(Cmax-Cmin)/dc);\r
+       if(dc==0 && Cmax*Cmin>0)        m = 1+int(0.5+fabs(log10(Cmax/Cmin)));\r
+       if(m<2) m=2;\r
        if(m>n) m=n;\r
 \r
        mreal dv=(vv.Maximal()-v1)/m;\r
        for(i=0;i<m;i++)\r
-       {
+       {\r
                t = vv.a[(n-1)*i/(m-1)];        d = GetA(t);    p.z = s3+1;\r
                p.x = (ss*d+s3)*w+x*s3;\r
                p.y = (ss*d+s3)*h+y*s3;\r
@@ -633,15 +644,15 @@ void mglGraphAB::colorbar(const mglData &vv, const mglColor *cs, int where, mrea
                        case 3: p.y = (y+0.13*h)*s3;    break;\r
                        default:p.x = (x-0.13*w)*s3;    break;\r
                }\r
-               if(ctt[0])      mglprintf(str, 64, ctt, t);
-               else if(dc==0)
-               {
-                       long kk=int(floor(0.1+log10(fabs(t))));
-                       mglprintf(str,64,L"%.2g\\cdot 10^{%d}",t/pow(10,kk), kk);
+               if(ctt[0])      mglprintf(str, 64, ctt, t);\r
+               else if(dc==0)\r
+               {\r
+                       long kk=int(floor(0.1+log10(fabs(t))));\r
+                       mglprintf(str,64,L"%.2g\\cdot 10^{%d}",t/pow(10,kk), kk);\r
                }\r
                else    _mgl_tick_text(t,v1,dv/100,v,kind,str);\r
                wcstrim_mgl(str);       Putsw(p,str,a,FontSize);\r
-               // draw "grid" lines
+               // draw "grid" lines\r
                pp[0] = pp[3] = (ss*d+s3)*w+x*s3;\r
                pp[1] = pp[4] = (ss*d+s3)*h+y*s3;\r
                pp[2] = pp[5] = s3+1;\r
@@ -651,9 +662,9 @@ void mglGraphAB::colorbar(const mglData &vv, const mglColor *cs, int where, mrea
                        case 2: pp[1]= (y-0.1*h)*s3;    pp[4] = y*s3;   break;\r
                        case 3: pp[1]= y*s3;    pp[4] = (y+0.1*h)*s3;   break;\r
                        default:pp[0]  = (x-0.1*w)*s3;  pp[3] = x*s3;   break;\r
-               }
-               memset(cc,0,6*sizeof(mreal));   PostScale (pp,2);
-               line_plot(pp,pp+3,cc,cc+3,true);
+               }\r
+               memset(cc,0,6*sizeof(mreal));   PostScale (pp,2);\r
+               line_plot(pp,pp+3,cc,cc+3,true);\r
        }\r
        switch(where)\r
        {\r
@@ -675,7 +686,7 @@ void mglGraphAB::SetSize(int w,int h)
        zPos = 0;//long(2*Depth*sqrt(3.));\r
        if(G)   {       delete []G;     delete []G4;    delete []OI;    }\r
        G = new unsigned char[w*h*3];\r
-       G4= new unsigned char[w*h*4];
+       G4= new unsigned char[w*h*4];\r
        OI= new int[w*h];\r
        Clf();\r
        InPlot(0,1,0,1);        SetDrawReg(1,1,0);      Persp = 0;\r
@@ -793,8 +804,9 @@ unsigned char **mglGraphAB::GetRGBLines(long &w, long &h, unsigned char *&f, boo
        return p;\r
 }\r
 //-----------------------------------------------------------------------------\r
+/* for 72pdi, FontSize=6 --> 26pt */\r
 void mglGraphAB::SetFontSizePT(mreal pt, int dpi)\r
-{      FontSize = pt*Height*0.0675/dpi;        }\r
+{      FontSize = 16.6154*pt/dpi;      }\r
 //-----------------------------------------------------------------------------\r
 void mglGraphAB::FindOptOrg(mreal ax[3], mreal ay[3], mreal az[3])\r
 {\r
@@ -925,14 +937,14 @@ void mglGraphAB::DrawTick(mreal *pp,bool sub)
        ScalePoint(pp[0],pp[1],pp[2]);\r
        ScalePoint(pp[3],pp[4],pp[5]);\r
        ScalePoint(pp[6],pp[7],pp[8]);\r
-       PostScale(pp,3);
-       double dx,dy,dz,dd,ll=TickLen*(B1[0]<B1[4] ? B1[0]:B1[4])/3.5;
-       if(sub) ll/=sqrt(1.+st_t);
-       dx=pp[0]-pp[3]; dy=pp[1]-pp[4]; dz=pp[2]-pp[5];
-       dd=sqrt(dx*dx+dy*dy+dz*dz);     if(dd)  dd = ll/dd;
-       pp[0]=pp[3]+dd*dx;      pp[1]=pp[4]+dd*dy;      pp[2]=pp[5]+dd*dz;
-       dx=pp[6]-pp[3]; dy=pp[7]-pp[4]; dz=pp[8]-pp[5];
-       dd=sqrt(dx*dx+dy*dy+dz*dz);     if(dd)  dd = ll/dd;
+       PostScale(pp,3);\r
+       double dx,dy,dz,dd,ll=TickLen*(B1[0]<B1[4] ? B1[0]:B1[4])/3.5;\r
+       if(sub) ll/=sqrt(1.+st_t);\r
+       dx=pp[0]-pp[3]; dy=pp[1]-pp[4]; dz=pp[2]-pp[5];\r
+       dd=sqrt(dx*dx+dy*dy+dz*dz);     if(dd)  dd = ll/dd;\r
+       pp[0]=pp[3]+dd*dx;      pp[1]=pp[4]+dd*dy;      pp[2]=pp[5]+dd*dz;\r
+       dx=pp[6]-pp[3]; dy=pp[7]-pp[4]; dz=pp[8]-pp[5];\r
+       dd=sqrt(dx*dx+dy*dy+dz*dz);     if(dd)  dd = ll/dd;\r
        pp[6]=pp[3]+dd*dx;      pp[7]=pp[4]+dd*dy;      pp[8]=pp[5]+dd*dz;\r
        line_plot(pp,pp+3,CDef,CDef);\r
        line_plot(pp+3,pp+6,CDef,CDef);\r
index d25fd254e00fda634e80a37a52261c4917393110..ff87b8cd9610f9fdf8dd110f2829c10c50d4cb97 100644 (file)
@@ -81,33 +81,20 @@ void mglGraph::TriPlot(const mglData &nums, const mglData &x, const mglData &y,
 void mglGraph::tricont_line(mreal val, long i, long k1, long k2, long k3, const mglData &x, const mglData &y, 
                                        const mglData &z, const mglData &a, mreal zVal)
 {
-       mreal d1,d2,p1[3],p2[3],c1[4],c2[4];
+       mreal d1,d2,pp[6];
        mglColor q1,q2,q3;
        d1 = _d(val,z.a[k1],z.a[k2]);
        d2 = _d(val,z.a[k1],z.a[k3]);
        if(d1<0 || d1>1 || d2<0 || d2>1)        return;
-       p1[2] = p2[2] = zVal;
+       pp[2] = pp[5] = zVal;
 
-       p1[0] = x.a[k1]*(1-d1)+x.a[k2]*d1;
-       p1[1] = y.a[k1]*(1-d1)+y.a[k2]*d1;
-       if(!ScalePoint(p1[0],p1[1],p1[2]))      return;
-       p2[0] = x.a[k1]*(1-d2)+x.a[k3]*d2;
-       p2[1] = y.a[k1]*(1-d2)+y.a[k3]*d2;
-       if(!ScalePoint(p1[0],p1[1],p1[2]))      return;
-       if(a.nx==x.nx)
-       {
-               q1 = GetC(a.a[k1]);     q2 = GetC(a.a[k2]);     q3 = GetC(a.a[k3]);
-               c1[0] = q1.r*(1-d1)+q2.r*d1;    c2[0] = q1.r*(1-d2)+q3.r*d2;
-               c1[2] = q1.g*(1-d1)+q2.g*d1;    c2[2] = q1.g*(1-d2)+q3.g*d2;
-               c1[3] = q1.b*(1-d1)+q2.b*d1;    c2[3] = q1.b*(1-d2)+q3.b*d2;
-               c1[3]=c2[3]=1;\r
-       }
-       else
-       {
-               q1 = GetC(a.a[i]);      c1[0]=q1.r;     c1[1]=q1.g;     c1[2]=q1.b;     c1[3]=1;\r
-               memcpy(c2,c1,4*sizeof(mreal));\r
-       }
-       line_plot(p1,p2,c1,c2);
+       pp[0] = x.a[k1]*(1-d1)+x.a[k2]*d1;
+       pp[1] = y.a[k1]*(1-d1)+y.a[k2]*d1;
+       if(!ScalePoint(pp[0],pp[1],pp[2]))      return;
+       pp[3] = x.a[k1]*(1-d2)+x.a[k3]*d2;
+       pp[4] = y.a[k1]*(1-d2)+y.a[k3]*d2;
+       if(!ScalePoint(pp[3],pp[4],pp[5]))      return;
+       curv_plot(2,pp,0);
 }\r
 //-----------------------------------------------------------------------------\r
 void mglGraph::TriContV(const mglData &v, const mglData &nums, const mglData &x, const mglData &y, const mglData &z, const mglData &a, const char *sch,mreal zVal)\r
@@ -126,6 +113,7 @@ void mglGraph::TriContV(const mglData &v, const mglData &nums, const mglData &x,
                k2 = long(nums.a[3*i+1]+0.1);   if(k2<0 || k2>=n)       continue;\r
                k3 = long(nums.a[3*i+2]+0.1);   if(k3<0 || k3>=n)       continue;
                val = isnan(zVal) ? v.a[k] : zVal;
+               DefColor(GetC(v.a[k]));
                tricont_line(v.a[k], i,k1,k2,k3,x,y,z,a,val);\r
                tricont_line(v.a[k], i,k2,k1,k3,x,y,z,a,val);\r
                tricont_line(v.a[k], i,k3,k2,k1,x,y,z,a,val);\r
@@ -133,7 +121,7 @@ void mglGraph::TriContV(const mglData &v, const mglData &nums, const mglData &x,
 }\r
 //-----------------------------------------------------------------------------\r
 void mglGraph::TriCont(const mglData &nums, const mglData &x, const mglData &y, const mglData &z, const mglData &a, const char *sch, int Num, mreal zVal)\r
-{\r
+{
        if(Num<1)       {       SetWarn(mglWarnCnt,"Cont");     return; }\r
        mglData v(Num);\r
        for(long i=0;i<Num;i++) v.a[i] = Cmin + (Cmax-Cmin)*mreal(i+1)/(Num+1);\r
@@ -240,40 +228,48 @@ void mglGraph::Dots(const mglData &tr, const char *sch)
                AVertex(tr.a[m*i], tr.a[m*i+1], tr.a[m*i+2], tr.a[m*i+3], 1);\r
        EndGroup();\r
 }\r
-//-----------------------------------------------------------------------------\r
-//\r
-//     Crust series\r
+//-----------------------------------------------------------------------------
+//
+//     mglTriangulation
 //\r
 //-----------------------------------------------------------------------------\r
+long mgl_crust_new(long n,const mreal *pp,long **nn,mreal ff);\r
 long mgl_crust(long n,mreal *pp,long **nn,mreal rs);\r
-void mglGraph::Crust(const mglData &x, const mglData &y, const mglData &z, const char *sch,mreal er)\r
+mglData mglTriangulation(const mglData &x, const mglData &y, const mglData &z, mreal er)\r
 {\r
+       mglData nums;
        long n = x.nx, m;\r
-       if(y.nx!=n || z.nx!=n)  {       SetWarn(mglWarnDim,"Crust");    return; }\r
-       static int cgid=1;      StartGroup("Crust",cgid++);\r
+       if(y.nx!=n || z.nx!=n)  return nums;\r
        register long i;\r
        mreal *pp = new mreal[3*n];\r
        long *nn=0;\r
        for(i=0;i<n;i++)\r
        {       pp[3*i] = x.a[i];       pp[3*i+1] = y.a[i];     pp[3*i+2] = z.a[i];     }\r
-\r
-       m = mgl_crust(n,pp,&nn,er);\r
-       if(m<=0)        {       delete []pp;    if(nn)  free(nn);       return; }\r
-\r
-       SetScheme(sch);\r
-       mglColor c;\r
-       mreal *cc = new mreal[4*n];\r
-       bool *tt = new bool[n];\r
-       for(i=0;i<n;i++)\r
-       {\r
-               c = GetC(pp[3*i],pp[3*i+1],pp[3*i+2]);\r
-               cc[4*i] = c.r;          cc[4*i+1] = c.g;\r
-               cc[4*i+2] = c.b;        cc[4*i+3] = 1;\r
-               tt[i] = ScalePoint(pp[3*i],pp[3*i+1],pp[3*i+2]);\r
-       }\r
-       trigs_plot(m,nn,n,pp,cc,tt,sch && strchr(sch,'#'));\r
-       EndGroup();\r
-       delete []tt;    delete []cc;    delete []pp;    free(nn);\r
+       m = mgl_crust(n,pp,&nn,er);
+
+       if(m>0)
+       {
+               nums.Create(3,m);
+               for(i=0;i<3*m;i++)      nums.a[i]=nn[i];
+       }
+       delete []pp;    free(nn);       return nums;\r
+}\r
+//-----------------------------------------------------------------------------\r
+mglData mglTriangulation(const mglData &x, const mglData &y, mreal er)\r
+{
+       mglData z(x.nx);
+       return mglTriangulation(x,y,z,er);\r
+}\r
+//-----------------------------------------------------------------------------\r
+//\r
+//     Crust series\r
+//\r
+//-----------------------------------------------------------------------------\r
+void mglGraph::Crust(const mglData &x, const mglData &y, const mglData &z, const char *sch,mreal er)\r
+{\r
+       if(y.nx!=x.nx || z.nx!=x.nx)    {       SetWarn(mglWarnDim,"Crust");    return; }
+       mglData nums=mglTriangulation(x,y,z,er);
+       TriPlot(nums,x,y,z,sch);
 }\r
 //-----------------------------------------------------------------------------\r
 void mglGraph::Crust(const mglData &tr, const char *sch,mreal er)\r
@@ -282,11 +278,11 @@ void mglGraph::Crust(const mglData &tr, const char *sch,mreal er)
        Crust(tr.SubData(0), tr.SubData(1), tr.SubData(2),sch,er);\r
 }\r
 //-----------------------------------------------------------------------------\r
-mreal mgl_dist(mreal *p1, mreal *p2)\r
+mreal mgl_dist(const mreal *p1, const mreal *p2)\r
 {\r
        return (p1[0]-p2[0])*(p1[0]-p2[0])+(p1[1]-p2[1])*(p1[1]-p2[1])+(p1[2]-p2[2])*(p1[2]-p2[2]);\r
 }\r
-mreal mgl_mult(mreal *p1, mreal *p2, mreal *p0)\r
+mreal mgl_mult(const mreal *p1, const mreal *p2, const mreal *p0)\r
 {\r
        return (p1[0]-p0[0])*(p2[0]-p0[0])+(p1[1]-p0[1])*(p2[1]-p0[1])+(p1[2]-p0[2])*(p2[2]-p0[2]);\r
 }\r
@@ -384,6 +380,96 @@ long mgl_crust(long n,mreal *pp,long **nn,mreal ff)
        }\r
        return m;\r
 }\r
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+#define sqr(a) (a)*(a)
+void mgl_add_trig(long i1,long i2,long n,const mreal *pp,long **nn,long *c,long *m,mreal ff,char *tt)
+{
+       register long i,im=-1,ii=-1;
+       register mreal cm=2,c2=2,co,fm,f,g=0;
+       const mreal *p1=pp+3*i1,*p2=pp+3*i2,*pi;
+       fm =(sqr(p2[0]-p1[0])+sqr(p2[1]-p1[1])+sqr(p2[2]-p1[2]));       fm*=4*fm*ff;
+       for(i=0;i<n;i++)
+       {
+               if(tt[i]>1 || i==i1 || i==i2)   continue;       // this is other surface
+               pi = pp+3*i;
+               co=(pi[0]-p1[0])*(pi[0]-p2[0])+(pi[1]-p1[1])*(pi[1]-p2[1])+(pi[2]-p1[2])*(pi[2]-p2[2]);
+               f = (sqr(pi[0]-p1[0])+sqr(pi[1]-p1[1])+sqr(pi[2]-p1[2])) *
+                       (sqr(pi[0]-p2[0])+sqr(pi[1]-p2[1])+sqr(pi[2]-p2[2]));
+               co /= sqrt(f);
+               if(co<cm && f<fm && tt[i]==0)   {       g=f;    cm=co;  im=i;   }
+               if(co<c2 && f<fm && tt[i]==1)   {       g=f;    c2=co;  ii=i;   }
+//             if(co<cm && f<fm)       {       cm=co;  im=i;   }
+       }
+       bool ok=(im>0); // try best variant
+       register long k[3]={i1,i2,im};
+       if(i2<i1)               {k[0]=i2;       k[1]=i1;}       // sort vertexes
+       if(im<k[0])             {k[2]=k[1];     k[0]=im;}
+       if(k[2]<k[1])   {i=k[1];        k[1]=k[2];      k[2]=i; }
+       for(i=0;i<*c;i++)       // check if already exist
+               if(!memcmp(nn+3*i,k,3*sizeof(long)))
+               {       ok = false;     break;  }
+printf("B(%g,%g,%d):%ld,%ld,%ld -- %ld of %ld\n",g,fm,ok,i1,i2,im,*c,n);
+
+       if(!ok)                 // try worse variant
+       {
+               im=ii;          ok=(im>0);
+               register long k[3]={i1,i2,im};
+               if(i2<i1)               {k[0]=i2;       k[1]=i1;}       // sort vertexes
+               if(im<k[0])             {k[2]=k[1];     k[0]=im;}
+               if(k[2]<k[1])   {i=k[1];        k[1]=k[2];      k[2]=i; }
+               for(i=0;i<*c;i++)       // check if already exist
+                       if(!memcmp(nn+3*i,k,3*sizeof(long)))
+                       {       ok = false;     break;  }
+       }
+printf("B(%g,%g,%d):%ld,%ld,%ld -- %ld of %ld\n",g,fm,ok,i1,i2,im,*c,n);
+       if(!ok) return;
+       
+       if(*c>=*m)                      // trig is OK -- add it
+       {
+               *m+=n;
+               *nn=(long*)realloc(*nn,(*m)*sizeof(long));
+       }
+       memcpy(nn+3*(*c),k,3*sizeof(long));     *c+=1;  tt[im]=1;
+printf("Add %ld,%ld,%ld -- %ld of %ld\n",i1,i2,im,*c,n);
+       mgl_add_trig(i1,im,n,pp,nn,c,m,ff,tt);  // parse bound
+       mgl_add_trig(i2,im,n,pp,nn,c,m,ff,tt);  // NOTE: it may require HUGE stack!!!
+}
+long mgl_crust_new(long n,const mreal *pp,long **nn,mreal ff)\r
+{\r
+       register long i,j,k=0;\r
+       register mreal r,rm;\r
+       if(ff==0)       ff=1;\r
+       char *tt=new char[n],ok=1;      memset(tt,0,n*sizeof(char));
+       long c=0,m=n;
+       *nn = (long*)malloc(m*sizeof(long));
+
+       while(ok)
+       {
+               j=-1;
+               for(rm=FLT_MAX,i=0;i<n;i++)     // find closest\r
+               {\r
+                       r = mgl_dist(pp+3*i,pp);\r
+                       if(rm>r && !tt[i] && i!=k)      {       j=i;    rm = r; }\r
+               }
+printf("closest -- %ld-%ld of %g\n",k,j,rm);
+               if(j>0)
+               {
+                       tt[0]=tt[j]=1;
+                       mgl_add_trig(k,j,n,pp,nn,&c,&m,ff,tt);
+               }
+printf("first iteration done -- %ld of %ld\n",m,n);
+               ok = 0;
+               for(i=0;i<n;i++)        // check if one more surface is existed
+                       if(tt[k])       tt[k]=2;
+                       else    {       ok=1;   k=i;    }
+       }
+       delete []tt;\r
+       return c;\r
+}\r
 //-----------------------------------------------------------------------------\r
 /// Draw triangle mesh for points in arrays \a x, \a y, \a z.\r
 void mgl_triplot_xyzc(HMGL gr, const HMDT nums, const HMDT x, const HMDT y, const HMDT z, const HMDT c, const char *sch)\r
index caf525c7823bc1bfae7bd098b46fe161e6791da2..23441753b39fd3eb0980307b9b8eebede18447f5 100644 (file)
@@ -914,13 +914,13 @@ void mglData::Fill(const char *eq, mglPoint r1, mglPoint r2, const mglData *v, c
 void mglData::ReadHDF4(const char *fname,const char *data)\r
 {
 #ifdef HAVE_HDF4
-       int sd = SDstart(fname,DFACC_READ), nn, i;
+       int32 sd = SDstart(fname,DFACC_READ), nn, i;
        if(sd==-1)      return; // is not a HDF4 file
        char name[64];
        SDfileinfo(sd,&nn,&i);
        for(i=0;i<nn;i++)
        {
-               int sds, rank, dims[32], type, attr, in[2]={0,0};
+               int32 sds, rank, dims[32], type, attr, in[2]={0,0};
                sds = SDselect(sd,i);
                SDgetinfo(sds,name,&rank,dims,&type,&attr);
                if(!strcmp(name,data))  // as I understand there are possible many datas with the same name
index 11dcc6607f363292a9bc32f845f77fc73c236425..22fc89a7979679e7756d99bccaace56c3b72d02c 100644 (file)
@@ -420,7 +420,8 @@ mreal mglFormula::Calc(mreal x,mreal y,mreal t,mreal u) const
        a1['x'-'a'] = a1['r'-'a'] = x;
        a1['y'-'a'] = a1['n'-'a'] = a1['v'-'a'] = y;
        a1['z'-'a'] = a1['t'-'a'] = t;
-       return CalcIn(a1);
+       mreal a = CalcIn(a1);
+       return isfinite(a) ? a : NAN;
 }
 //-----------------------------------------------------------------------------
 // evaluate formula for 'x'='r', 'y'='n', 't'='z', 'u'='a', 'v'='b', 'w'='c' variables
@@ -434,21 +435,24 @@ mreal mglFormula::Calc(mreal x,mreal y,mreal t,mreal u,mreal v,mreal w) const
        a1['x'-'a'] = a1['r'-'a'] = x;
        a1['y'-'a'] = a1['n'-'a'] = y;
        a1['z'-'a'] = a1['t'-'a'] = t;
-       return CalcIn(a1);
+       mreal a = CalcIn(a1);
+       return isfinite(a) ? a : NAN;
 }
 //-----------------------------------------------------------------------------
 // evaluate formula for arbitrary set of variables
 mreal mglFormula::Calc(const mreal var[MGL_VS]) const
 {
        Error=0;
-       return CalcIn(var);
+       mreal a = CalcIn(var);
+       return isfinite(a) ? a : NAN;
 }
 //-----------------------------------------------------------------------------
 // evaluate derivate of formula respect to 'diff' variable for arbitrary set of other variables
 mreal mglFormula::CalcD(const mreal var[MGL_VS], char diff) const
 {
        Error=0;
-       return CalcDIn(diff-'a', var);
+       mreal a = CalcDIn(diff-'a', var);
+       return isfinite(a) ? a : NAN;
 }
 //-----------------------------------------------------------------------------
 double cand(double a,double b) {return a&&b?1:0;}
@@ -512,53 +516,45 @@ mreal mglFormula::CalcIn(const mreal *a1) const
 #endif
                };
 //     if(Error)       return 0;
-       if(Kod==EQ_A)   return a1[(int)Res];
-       if(Kod==EQ_RND) return mgl_rnd();
-       if(Kod==EQ_NUM) return Res;
-
-       double a = Left->CalcIn(a1);
-       if(isnan(a))    return NAN;
-
-       if(Kod<EQ_SIN)
+       if(Kod<EQ_LT)
        {
-               double b = Right->CalcIn(a1);
-               if(isnan(b))    return NAN;
-               if(Kod==EQ_POW && ((a<0 && b>0) || (a<=0 && b<=0)))
-               { Error=MGL_ERR_LOG; return NAN; }
-               if(Kod==EQ_LOG && (a<=0 || b<=0))       { Error=MGL_ERR_LOG; return NAN; }
-               return f2[Kod-EQ_LT](a,b);
+               if(Kod==EQ_RND) return mgl_rnd();
+               else    return (Kod==EQ_A) ? a1[int(Res)] : Res;
        }
-       else if(Kod<EQ_SN)
+       double a = Left->CalcIn(a1);
+       if(!isnan(a))
        {
-               if((Kod==EQ_ACOS || Kod==EQ_ASIN) && fabs(a)>1) { Error=MGL_ERR_ARC; return NAN; }
-               if((Kod==EQ_LG || Kod==EQ_LN) && a<=0)  { Error=MGL_ERR_LOG; return NAN; }
-               if(Kod==EQ_SQRT && a<0) { Error=MGL_ERR_SQRT; return NAN; }
-               return f1[Kod-EQ_SIN](a);
-       }
+               if(Kod<EQ_SIN)
+               {
+                       double b = Right->CalcIn(a1);
+                       return !isnan(b) ? f2[Kod-EQ_LT](a,b) : NAN;
+               }
+               else if(Kod<EQ_SN)      return f1[Kod-EQ_SIN](a);
 #ifndef NO_GSL
-       else if(Kod<=EQ_DC)
-       {
-               double sn=0,cn=0,dn=0,b = Right->CalcIn(a1);
-               if(isnan(b))    return NAN;
-               gsl_sf_elljac_e(a,b, &sn, &cn, &dn);
-               switch(Kod)
+               else if(Kod<=EQ_DC)
                {
-               case EQ_SN:             return sn;
-               case EQ_SC:             return sn/cn;
-               case EQ_SD:             return sn/dn;
-               case EQ_CN:             return cn;
-               case EQ_CS:             return cn/sn;
-               case EQ_CD:             return cn/dn;
-               case EQ_DN:             return dn;
-               case EQ_DS:             return dn/sn;
-               case EQ_DC:             return dn/cn;
-               case EQ_NS:             return 1./sn;
-               case EQ_NC:             return 1./cn;
-               case EQ_ND:             return 1./dn;
+                       double sn=0,cn=0,dn=0,b = Right->CalcIn(a1);
+                       if(isnan(b))    return NAN;
+                       gsl_sf_elljac_e(a,b, &sn, &cn, &dn);
+                       switch(Kod)
+                       {
+                       case EQ_SN:             return sn;
+                       case EQ_SC:             return sn/cn;
+                       case EQ_SD:             return sn/dn;
+                       case EQ_CN:             return cn;
+                       case EQ_CS:             return cn/sn;
+                       case EQ_CD:             return cn/dn;
+                       case EQ_DN:             return dn;
+                       case EQ_DS:             return dn/sn;
+                       case EQ_DC:             return dn/cn;
+                       case EQ_NS:             return 1./sn;
+                       case EQ_NC:             return 1./cn;
+                       case EQ_ND:             return 1./dn;
+                       }
                }
-       }
 #endif
-       return Res;
+       }
+       return NAN;
 }
 //-----------------------------------------------------------------------------
 double mgp(double ,double )    {return 1;}
@@ -635,51 +631,42 @@ mreal mglFormula::CalcDIn(int id, const mreal *a1) const
 #endif
                };
 //     if(Error)       return 0;
-       if(Kod==EQ_A)   return id==(int)Res?1:0;
-       if(Kod==EQ_RND || Kod==EQ_NUM) return 0;
+       if(Kod<EQ_LT)   return (Kod==EQ_A && id==(int)Res)?1:0;
 
        double a = Left->CalcIn(a1), d = Left->CalcDIn(id,a1);
-       if(isnan(a))    return NAN;
-
-       if(Kod<EQ_SIN)
-       {
-               double b = Right->CalcIn(a1);
-               if(isnan(b))    return NAN;
-               if(Kod==EQ_POW && a<=0)         { Error=MGL_ERR_LOG; return NAN; }
-               if(Kod==EQ_LOG && (a<=0 || b<=0))       { Error=MGL_ERR_LOG; return NAN; }
-               return f21[Kod-EQ_LT](a,b)*d + f22[Kod-EQ_LT](a,b)*Right->CalcDIn(id,a1);
-       }
-       else if(Kod<EQ_SN)
+       if(!isnan(a) && !isnan(d))
        {
-               if((Kod==EQ_ACOS || Kod==EQ_ASIN) && fabs(a)>1) { Error=MGL_ERR_ARC; return NAN; }
-               if((Kod==EQ_LG || Kod==EQ_LN) && a<=0)  { Error=MGL_ERR_LOG; return NAN; }
-               if(Kod==EQ_SQRT && a<0) { Error=MGL_ERR_SQRT; return NAN; }
-               return f11[Kod-EQ_SIN](a)*d;
-       }
+               if(Kod<EQ_SIN)
+               {
+                       double b = Right->CalcIn(a1);
+                       return !isnan(b) ? f21[Kod-EQ_LT](a,b)*d + f22[Kod-EQ_LT](a,b)*Right->CalcDIn(id,a1) : NAN;
+               }
+               else if(Kod<EQ_SN)      return f11[Kod-EQ_SIN](a)*d;
 #ifndef NO_GSL
-       else if(Kod<=EQ_DC)
-       {
-               double sn=0,cn=0,dn=0,b = Right->CalcIn(a1);
-               if(isnan(b))    return NAN;
-               gsl_sf_elljac_e(a,b, &sn, &cn, &dn);
-               switch(Kod)     // At this moment parse only differentiation or argument NOT mu !!!
+               else if(Kod<=EQ_DC)
                {
-               case EQ_SN:             return cn*dn*d;
-               case EQ_SC:             return dn*d/(cn*cn);
-               case EQ_SD:             return cn*d/(dn*dn);
-               case EQ_CN:             return -dn*sn*d;
-               case EQ_CS:             return dn*d/(sn*sn);
-               case EQ_CD:             return (b-1)*d*sn/(dn*dn);
-               case EQ_DN:             return -b*d*cn*sn;
-               case EQ_DS:             return -cn*d/(sn*sn);
-               case EQ_DC:             return (1-b)*sn*d/(cn*cn);
-               case EQ_NS:             return -cn*dn*d/(sn*sn);
-               case EQ_NC:             return dn*sn*d/(cn*cn);
-               case EQ_ND:             return b*cn*sn*d/(dn*dn);
+                       double sn=0,cn=0,dn=0,b = Right->CalcIn(a1);
+                       if(isnan(b))    return NAN;
+                       gsl_sf_elljac_e(a,b, &sn, &cn, &dn);
+                       switch(Kod)     // At this moment parse only differentiation or argument NOT mu !!!
+                       {
+                       case EQ_SN:             return cn*dn*d;
+                       case EQ_SC:             return dn*d/(cn*cn);
+                       case EQ_SD:             return cn*d/(dn*dn);
+                       case EQ_CN:             return -dn*sn*d;
+                       case EQ_CS:             return dn*d/(sn*sn);
+                       case EQ_CD:             return (b-1)*d*sn/(dn*dn);
+                       case EQ_DN:             return -b*d*cn*sn;
+                       case EQ_DS:             return -cn*d/(sn*sn);
+                       case EQ_DC:             return (1-b)*sn*d/(cn*cn);
+                       case EQ_NS:             return -cn*dn*d/(sn*sn);
+                       case EQ_NC:             return dn*sn*d/(cn*cn);
+                       case EQ_ND:             return b*cn*sn*d/(dn*dn);
+                       }
                }
-       }
 #endif
-       return Res;
+       }
+       return NAN;
 }
 //-----------------------------------------------------------------------------
 // ïðîâåðêà êîððåêòíîñòè ñêîáîê
index f0b9c4c3dc68ebdfe300de3811440447d3c9d2c8..9c9a0a6ea16ba63aa6ec3a1137e869928031e4ef 100644 (file)
@@ -1139,13 +1139,13 @@ int mgls_grad(mglGraph *gr, long , mglArg *a, int k[10])
 void mglc_grad(wchar_t out[1024], long , mglArg *a, int k[10])
 {
        if(k[0]==1 && k[1]==1 && k[2]==1 && k[3]==1)
-               mglprintf(out,1024,L"gr->Grad(%s, %s, %s, %s, \"%s\", %d, %g);", 
+               mglprintf(out,1024,L"gr->Grad(%s, %s, %s, %s, \"%s\", %d, %g);",
                        a[0].s, a[1].s, a[2].s, a[3].s, k[4]==2?a[4].s:"", k[5]==3?iint(a[5].v):5);
        else if(k[0]==1 && k[1]==1 && k[2]==1)
-               mglprintf(out,1024,L"gr->Grad(%s, %s, %s, \"%s\", %d, %g);", 
+               mglprintf(out,1024,L"gr->Grad(%s, %s, %s, \"%s\", %d, %g);",
                        a[0].s, a[1].s, a[2].s, k[3]==2?a[3].s:"", k[4]==3?iint(a[4].v):5, k[5]==3?a[5].v:NAN);
        else if(k[0]==1)
-               mglprintf(out,1024,L"gr->Grad(%s, \"%s\", %d, %g);", 
+               mglprintf(out,1024,L"gr->Grad(%s, \"%s\", %d, %g);",
                        a[0].s, k[1]==2?a[1].s:"", k[2]==3?iint(a[2].v):5, k[3]==3?a[3].v:NAN);
 }
 //-----------------------------------------------------------------------------
@@ -1166,7 +1166,7 @@ void mglc_fill(wchar_t out[1024], long , mglArg *a, int k[10])
                mglprintf(out,1024,L"%s.Fill(%g, %g, '%c');", a[0].s, a[1].v,a[2].v, k[3]==2?a[3].s[0]:'x');
 }
 //-----------------------------------------------------------------------------
-int mgls_fillsample(mglGraph *gr, long , mglArg *a, int k[10])
+int mgls_fillsample(mglGraph *, long , mglArg *a, int k[10])
 {
        if(k[0]==1 && k[1]==3 && k[2]==2)       a[0].d->FillSample(iint(a[1].v), a[2].s);
        else    return 1;
@@ -1289,7 +1289,7 @@ int mgls_light(mglGraph *gr, long , mglArg *a, int k[10])
        else if(k[1]!=3)        gr->Light(a[0].v!=0);
        else if(k[2]==3 && k[3]==3)
                gr->Light(iint(a[0].v),mglPoint(a[1].v,a[2].v,a[3].v),
-                       k[4]==2?a[4].s[0]:'w',k[5]==3?a[5].v:0.5,true);
+                       k[4]==2?a[4].s[0]:'w',k[5]==3?a[5].v:0.5,true,k[6]==3?a[6].v:0);
        else    gr->Light(iint(a[0].v),a[1].v!=0);
        return 0;
 }
@@ -1299,7 +1299,8 @@ void mglc_light(wchar_t out[1024], long , mglArg *a, int k[10])
        else if(k[0]!=3)        return;
        else if(k[1]!=3)        mglprintf(out,1024,L"gr->Light(%s);", a[0].v!=0 ? "true":"false");
        else if(k[2]==3 && k[3]==3)
-               mglprintf(out,1024,L"gr->Light(%d, mglPoint(%g, %g, %g), '%c', %g, true);", iint(a[0].v), a[1].v, a[2].v, a[3].v, k[4]==2?a[4].s[0]:'w', k[5]==3?a[5].v:0.5);
+               mglprintf(out,1024,L"gr->Light(%d, mglPoint(%g, %g, %g), '%c', %g, true, %g);",
+               iint(a[0].v), a[1].v, a[2].v, a[3].v, k[4]==2?a[4].s[0]:'w', k[5]==3?a[5].v:0.5, k[6]==3?a[6].v:0);
        else    mglprintf(out,1024,L"gr->Light(%d, %s);", iint(a[0].v), a[1].v!=0 ? "true":"false");
 }
 //-----------------------------------------------------------------------------
@@ -1833,7 +1834,7 @@ int mgls_squeeze(mglGraph *, long , mglArg *a, int k[10])
 void mglc_squeeze(wchar_t out[1024], long , mglArg *a, int k[10])
 {
        if(k[0]==1 && k[1]==3)
-               mglprintf(out,1024,L"%s.Squeeze(%d, %d, %d, %s);", a[0].s, iint(a[1].v), 
+               mglprintf(out,1024,L"%s.Squeeze(%d, %d, %d, %s);", a[0].s, iint(a[1].v),
                        k[2]==3?iint(a[2].v):1, k[3]==3?iint(a[3].v):1, k[4]==3 && a[4].v>0 ? "true":"false");
 }
 //-----------------------------------------------------------------------------
@@ -2273,8 +2274,8 @@ int mgls_tricont(mglGraph *gr, long , mglArg *a, int k[10])
                gr->TriContV(*(a[0].d),*(a[1].d),*(a[2].d),*(a[3].d),*(a[4].d),*(a[5].d),k[6]==2?a[6].s:0,k[7]==3?a[7].v:NAN);
        else if(k[0]==1 && k[1]==1 && k[2]==1 && k[3]==1 && k[4]==1)
                gr->TriContV(*(a[0].d),*(a[1].d),*(a[2].d),*(a[3].d),*(a[4].d),k[5]==2?a[5].s:0,k[6]==3?a[6].v:NAN);
-       else if(k[0]==1 && k[1]==1 && k[2]==1 && k[5]==1)
-               gr->TriCont(*(a[0].d),*(a[1].d),*(a[2].d),*(a[3].d),k[4]==2?a[4].s:0,k[5]==3?a[5].v:NAN);
+       else if(k[0]==1 && k[1]==1 && k[2]==1 && k[3]==1)
+               gr->TriCont(*(a[0].d),*(a[1].d),*(a[2].d),*(a[3].d),k[4]==2?a[4].s:0,7,k[5]==3?a[5].v:NAN);
        else    return 1;
        return 0;
 }
@@ -2287,7 +2288,7 @@ void mglc_tricont(wchar_t out[1024], long , mglArg *a, int k[10])
                mglprintf(out,1024,L"gr->TriContV(%s, %s, %s, %s, %s, \"%s\", %g);",
                        a[0].s, a[1].s, a[2].s, a[3].s, a[4].s, k[5]==2?a[5].s:"",k[6]==3?a[6].v:NAN);
        else if(k[0]==1 && k[1]==1 && k[2]==1 && k[3]==1)
-               mglprintf(out,1024,L"gr->TriCont(%s, %s, %s, %s, \"%s\", %g);",
+               mglprintf(out,1024,L"gr->TriCont(%s, %s, %s, %s, \"%s\", 7, %g);",
                        a[0].s, a[1].s, a[2].s, a[3].s, k[4]==2?a[4].s:"", k[5]==3?a[5].v:NAN);
 }
 //-----------------------------------------------------------------------------
@@ -3489,6 +3490,23 @@ void mglc_roll(wchar_t out[1024], long , mglArg *a, int k[10])
            a[0].s, a[1].s[0], iint(a[2].v));
 }
 //-----------------------------------------------------------------------------
+int mgls_triangulate(mglGraph *, long , mglArg *a, int k[10])
+{
+       if(k[0]==1 && k[1]==1 && k[2]==1 && k[3]==1)
+               *(a[0].d) = mglTriangulation(*(a[1].d), *(a[2].d), *(a[3].d), k[4]==3?a[4].v:0);
+       else if(k[0]==1 && k[1]==1 && k[2]==1)
+               *(a[0].d) = mglTriangulation(*(a[1].d), *(a[2].d), k[3]==3?a[3].v:0);
+       else    return 1;
+       return 0;
+}
+void mglc_triangulate(wchar_t out[1024], long , mglArg *a, int k[10])
+{
+       if(k[0]==1 && k[1]==1 && k[2]==1 && k[3]==1)
+               mglprintf(out,1024,L"%s = mglTriangulation(%s, %s, %s, %g);",a[0].s, a[1].s, a[2].s, a[3].s, k[4]==3?a[4].v:0);
+       else if(k[0]==1 && k[1]==1 && k[2]==1)
+               mglprintf(out,1024,L"%s = mglTriangulation(%s, %s, %g);",a[0].s, a[1].s, a[2].s, k[3]==3?a[3].v:0);
+}
+//-----------------------------------------------------------------------------
 mglCommand mgls_base_cmd[] = {
        {L"addlegend",L"Add legend entry",L"addlegend 'txt' 'fmt'", mgls_addlegend, mglc_addlegend, false, 2},
        {L"addto",L"Add data or number",L"addto Var Dat|Var num", mgls_addto, mglc_addto, false, 3},
@@ -3680,6 +3698,7 @@ mglCommand mgls_base_cmd[] = {
        {L"transparent",L"Switch off transparency",L"transparent val", mgls_transparent, mglc_transparent, false, 2}, //!!! OLD !!!
        {L"transpose",L"Transpose data array",L"transpose Dat ['dir']", mgls_transpose, mglc_transpose, false, 3},
        {L"transptype",L"Set type transparency",L"transptype val", mgls_transptype, mglc_transptype, false, 2},
+       {L"triangulate",L"Find triangles of randomly placed points",L"triangulate Res Xdat Ydat [er]|Res Xdat Ydat Zdat [er]", mgls_triangulate, mglc_triangulate, true, 3},
        {L"tricont",L"Draw contour lines for surface of triangles",L"tricont Vdat Idat Xdat Ydat ['fmt']|Vdat Idat Xdat Ydat Zdat ['fmt']|Vdat Idat Xdat Ydat Zdat Cdat ['fmt'] ", mgls_tricont, mglc_tricont, false, 0},
        {L"triplot",L"Draw surface of triangles",L"triplot Idat Xdat Ydat ['fmt']|Idat Xdat Ydat Zdat ['fmt']|Idat Xdat Ydat Zdat Cdat ['fmt'] ", mgls_triplot, mglc_triplot, false, 0},
        {L"tube",L"Draw curve by tube",L"tube Ydat Rdat ['fmt' zval]|Ydat rval ['fmt' zval]|Xdat Ydat Rdat ['fmt' zval]|Xdat Ydat rval ['fmt' zval]|Xdat Ydat Zdat Rdat ['fmt']|Xdat Ydat Zdat rval ['fmt']", mgls_tube, mglc_tube, false, 0},
index 77dfcd556caf4cc46efb2641d0a99f687bcc88b4..ec8ca811ee37dbe540fe90e53f0a9dc03d93fb35 100644 (file)
@@ -47,6 +47,8 @@ unsigned char **mglGraph::GetRGBLines(long &, long &, unsigned char *&f, bool )
 //-----------------------------------------------------------------------------
 void mglGraph::WriteSVG(const char *,const char *)     {}
 void mglGraph::WriteIDTF(const char *,const char *)    {}
+void mglGraph::WriteU3D(const char *,const char *)     {}
+void mglGraph::WritePDF(const char *,const char *)     {}
 void mglGraph::DoubleSided(bool )      {}
 void mglGraph::VertexColor(bool )      {}
 void mglGraph::TextureColor(bool ){}
@@ -389,6 +391,8 @@ void mglGraph::WriteFrame(const char *fname, const char *descr)
        if(!strcmp(fname+len-4,".jpg")) WriteJPEG(fname,descr);
        if(!strcmp(fname+len-5,".jpeg"))WriteJPEG(fname,descr);
        if(!strcmp(fname+len-5,".idtf"))WriteIDTF(fname,descr);
+       if(!strcmp(fname+len-4,".u3d")) WriteU3D(fname,descr);
+       if(!strcmp(fname+len-4,".pdf")) WritePDF(fname,descr);
        if(!strcmp(fname+len-4,".png")) WritePNG(fname,descr,false);
        if(!strcmp(fname+len-4,".eps")) WriteEPS(fname,descr);
        if(!strcmp(fname+len-4,".svg")) WriteSVG(fname,descr);
@@ -450,6 +454,28 @@ void mgl_write_idtf_(uintptr_t *gr, const char *fname,const char *descr,int l,in
        _GR_->WriteIDTF(s,f);   delete []s;             delete []f;
 }
 //-----------------------------------------------------------------------------
+/// Write the frame in file using U3D format
+void mgl_write_u3d(HMGL gr, const char *fname,const char *descr)
+{      gr->WriteU3D(fname,descr);      }
+/// Write the frame in file using U3D format
+void mgl_write_u3d_(uintptr_t *gr, const char *fname,const char *descr,int l,int n)
+{
+       char *s=new char[l+1];  memcpy(s,fname,l);      s[l]=0;
+       char *f=new char[n+1];  memcpy(f,descr,n);      f[n]=0;
+       _GR_->WriteU3D(s,f);    delete []s;             delete []f;
+}
+//-----------------------------------------------------------------------------
+/// Write the frame in file using PDF format
+void mgl_write_pdf(HMGL gr, const char *fname,const char *descr)
+{      gr->WritePDF(fname,descr);      }
+/// Write the frame in file using PDF format
+void mgl_write_pdf_(uintptr_t *gr, const char *fname,const char *descr,int l,int n)
+{
+       char *s=new char[l+1];  memcpy(s,fname,l);      s[l]=0;
+       char *f=new char[n+1];  memcpy(f,descr,n);      f[n]=0;
+       _GR_->WritePDF(s,f);    delete []s;             delete []f;
+}
+//-----------------------------------------------------------------------------
 /// Write the frame in file using PNG format
 void mgl_write_gif(HMGL gr, const char *fname,const char *descr)
 {      gr->WriteGIF(fname,descr);      }
index b92712cf908471740b312dfae1641baa2a2ca9d4..e86d18b61620a02795f5205ca77ed88184cdfee7 100644 (file)
@@ -686,7 +686,13 @@ bool mglFont::Load(const char *base, const char *path)
        char str[256];\r
        setlocale(LC_NUMERIC,"C");\r
        unsigned cur=0;\r
-       if(!path)       path = MGL_FONT_PATH;\r
+\r
+       if(!path)\r
+               if (strlen(MGL_FONT_PATH)!=0)\r
+                       path = MGL_FONT_PATH;\r
+               else\r
+                       path = ".";\r
+       \r
        if(base)\r
        {\r
                buf = new char[strlen(base)+1];\r
index e20d05f05c4188bc7eaa1f74e90e8c992aecc472..c31fff5442b7659311c6fedddfe8e5c6ebd48fb6 100644 (file)
@@ -49,28 +49,30 @@ int strcasecmp (const char *s1,const char *s2)
 // #define IDTFROUND(x) ldexpf(roundf(ldexpf((x),20)),-20)
 // const static bool dbg = true;
 #ifdef HAVE_U3D
+#ifdef HAVE_HPDF_H
 #include <stdlib.h>
 #include <setjmp.h>
 #include <math.h>
 #include <hpdf.h>
 #include <hpdf_u3d.h>
 #include <hpdf_annotation.h>
+#endif // HAVE_HPDF_H
 
-#include "IFXResult.h"
-#include "IFXOSLoader.h"
+#include "u3d/IFXResult.h"
+#include "u3d/IFXOSLoader.h"
 
-#include "ConverterResult.h"
-#include "IFXDebug.h"
-#include "IFXCOM.h"
+#include "u3d/ConverterResult.h"
+#include "u3d/IFXDebug.h"
+#include "u3d/IFXCOM.h"
 
-#include "ConverterOptions.h"
-#include "SceneConverter.h"
-#include "SceneUtilities.h"
-#include "IFXOSUtilities.h"
+#include "u3d/ConverterOptions.h"
+#include "u3d/SceneConverterLib.h"
+#include "u3d/SceneUtilities.h"
+#include "u3d/IFXOSUtilities.h"
 
-#include "File.h"
-#include "Tokens.h"
-#include "Point.h"
+#include "u3d/File.h"
+#include "u3d/Tokens.h"
+#include "u3d/Point.h"
 #endif // HAVE_U3D
 
 
@@ -1437,7 +1439,7 @@ mglGraphIDTF::mglGraphIDTF() : mglGraphAB ( 1,1 ),
                diff_int ( 0.8f ), spec_int ( 0.4f ), emis_int ( 0.25f ),
                double_sided_flag ( true ), vertex_color_flag ( false ), textures_flag ( true ), disable_compression_flag ( true ), unrotate_flag ( false ), ball_is_point_flag ( false ),
                points_finished ( true ), lines_finished ( true ), mesh_finished ( true ),
-               CurrentGroup ( NULL )
+               CurrentGroup ( NULL ), rotX(0), rotY(0), rotZ(0)
 {      Width = Height = Depth = 1;     }
 //-----------------------------------------------------------------------------
 mglGraphIDTF::~mglGraphIDTF() {}
@@ -1467,6 +1469,12 @@ void mglGraphIDTF::Clf ( mglColor Back )
        lines_finished = true;
        mesh_finished = true;
 }
+//-----------------------------------------------------------------------------
+void mglGraphIDTF::DefaultPlotParam()
+{
+    rotX = rotY = rotZ = 0;
+       mglGraphAB::DefaultPlotParam();
+}
 
 void mglGraphIDTF::StartGroup ( const char *name )
 {
@@ -1698,13 +1706,24 @@ void mglGraphIDTF::mark_plot ( mreal *pp, char type )
        {
                mreal pw = PenWidth;    PenWidth = BaseLineWidth;
                unsigned pd = PDef;     PDef = 0xffff;
+               // mreal zv = strchr("oOVDTS",type) ? pp[2]+BaseLineWidth : pp[2];
+               if(!strchr("xsSoO",type))       ss *= 1.1;
                switch ( type )
                {
+                       case 'P':
+                               line_plot ( pnt ( -1,-1 ), pnt ( 1,-1 ) );
+                               line_plot ( pnt ( 1,-1 ), pnt ( 1, 1 ) );
+                               line_plot ( pnt ( 1 ,1 ), pnt ( -1, 1 ) );
+                               line_plot ( pnt ( -1, 1 ), pnt ( -1,-1 ) );
                        case '+':
-                               ss = ss*1.1;
                                line_plot ( pnt ( -1, 0 ), pnt ( 1, 0 ) );
                                line_plot ( pnt ( 0,-1 ), pnt ( 0, 1 ) );
                                break;
+                       case 'X':
+                               line_plot ( pnt ( -1,-1 ), pnt ( 1,-1 ) );
+                               line_plot ( pnt ( 1,-1 ), pnt ( 1, 1 ) );
+                               line_plot ( pnt ( 1 ,1 ), pnt ( -1, 1 ) );
+                               line_plot ( pnt ( -1, 1 ), pnt ( -1,-1 ) );
                        case 'x':
                                line_plot ( pnt ( -1,-1 ), pnt ( 1, 1 ) );
                                line_plot ( pnt ( 1,-1 ), pnt ( -1, 1 ) );
@@ -1716,30 +1735,64 @@ void mglGraphIDTF::mark_plot ( mreal *pp, char type )
                                line_plot ( pnt ( -1, 1 ), pnt ( -1,-1 ) );
                                break;
                        case 'd':
-                               ss = ss*1.1;
                                line_plot ( pnt ( 0,-1 ), pnt ( 1, 0 ) );
                                line_plot ( pnt ( 1, 0 ), pnt ( 0, 1 ) );
                                line_plot ( pnt ( 0, 1 ), pnt ( -1, 0 ) );
                                line_plot ( pnt ( -1, 0 ), pnt ( 0,-1 ) );
                                break;
                        case '*':
-                               ss = ss*1.1;
                                line_plot ( pnt ( -1, 0 ), pnt ( 1, 0 ) );
                                line_plot ( pnt ( -0.6,-0.8 ), pnt ( 0.6, 0.8 ) );
                                line_plot ( pnt ( -0.6, 0.8 ), pnt ( 0.6,-0.8 ) );
                                break;
+                       case 'Y':
+                               line_plot ( pnt (  0.0,-1.0 ), pnt ( 0, 0 ) );
+                               line_plot ( pnt ( -0.8, 0.6 ), pnt ( 0, 0 ) );
+                               line_plot ( pnt (  0.8, 0.6 ), pnt ( 0, 0 ) );
+                               break;
+
                        case '^':
-                               ss = ss*1.1;
-                               line_plot ( pnt ( 0, 1 ), pnt ( 0.7,-0.5 ) );
+                               line_plot ( pnt (  0.0, 1.0 ), pnt (  0.7,-0.5 ) );
                                line_plot ( pnt ( 0.7,-0.5 ), pnt ( -0.7,-0.5 ) );
-                               line_plot ( pnt ( -0.7,-0.5 ), pnt ( 0,   1 ) );
+                               line_plot ( pnt ( -0.7,-0.5 ), pnt (  0.0, 1.0 ) );
                                break;
                        case 'v':
-                               ss = ss*1.1;
-                               line_plot ( pnt ( 0,  -1 ), pnt ( 0.7, 0.5 ) );
+                               line_plot ( pnt (  0.0,-1.0 ), pnt (  0.7, 0.5 ) );
                                line_plot ( pnt ( 0.7, 0.5 ), pnt ( -0.7, 0.5 ) );
-                               line_plot ( pnt ( -0.7, 0.5 ), pnt ( 0,  -1 ) );
+                               line_plot ( pnt ( -0.7, 0.5 ), pnt (  0.0,-1.0 ) );
+                               break;
+
+                       case 'R':
+                               trig_plot ( pnt ( -0.5, 1.0 ), pnt ( -0.5,-1.0 ), pnt (  1.0, 0.0 ) );
+                               break;
+                       case '>':
+                               line_plot ( pnt ( -0.5,-1.0 ), pnt ( -0.5, 1.0 ) );
+                               line_plot ( pnt ( -0.5, 1.0 ), pnt (  1.0, 0.0 ) );
+                               line_plot ( pnt (  1.0, 0.0 ), pnt ( -0.5,-1.0 ) );
                                break;
+                       case 'L':
+                               trig_plot ( pnt (  0.5,-1.0 ), pnt (  0.5, 1.0 ), pnt ( -1.0, 0.0 ) );
+                               break;
+                       case '<':
+                               line_plot ( pnt (  0.5,-1.0 ), pnt (  0.5, 1.0 ) );
+                               line_plot ( pnt (  0.5, 1.0 ), pnt ( -1.0, 0.0 ) );
+                               line_plot ( pnt ( -1.0, 0.0 ), pnt (  0.5,-1.0 ) );
+                               break;
+
+                       case 'S':
+                               quad_plot ( pnt ( -1,-1 ), pnt (  1,-1 ), pnt ( -1, 1 ), pnt (  1, 1 ) );
+                               break;
+                       case 'D':
+                               quad_plot ( pnt (  0,-1 ), pnt (  1, 0 ), pnt ( -1, 0 ), pnt (  0, 1 ) );
+                               break;
+                       case 'T':
+                               trig_plot ( pnt ( -1.0,-0.5 ), pnt (  1.0,-0.5 ), pnt (  0.0, 1.0 ) );
+                               break;
+                       case 'V':
+                               trig_plot ( pnt (  0.0,-1.0 ), pnt (  1.0, 0.5 ), pnt ( -1.0, 0.5 ) );
+                               break;
+                       case 'C':
+                               point_plot ( p, mglColor( CDef[0], CDef[1], CDef[2] ) );
                        case 'o':
                                p1 = pnt ( 1, 0 );
                                for ( int i=1;i<32;i++ )
@@ -2465,7 +2518,12 @@ void mglGraphIDTF::InPlot ( mreal x1,mreal x2,mreal y1,mreal y2, bool rel )
        points_finished = lines_finished = mesh_finished = true;
 }
 //-----------------------------------------------------------------------------
-#ifndef HAVE_U3D
+void mglGraphIDTF::Rotate(mreal TetX,mreal TetZ,mreal TetY)
+{
+       rotX = TetX; rotY = TetY; rotZ = TetZ;
+       mglGraphAB::Rotate( TetX,TetZ,TetY );
+}
+//-----------------------------------------------------------------------------
 void mglGraphIDTF::WriteIDTF ( const char *fname,const char * )
 {
        std::ofstream ostr ( fname );
@@ -2562,14 +2620,20 @@ void mglGraphIDTF::WriteIDTF ( const char *fname,const char * )
 
 // Make inverse coordinate transform with the model, if so desired
        if (unrotate_flag)
+    {
+        SubPlot(1,1,0);
+        Rotate(rotX, rotZ, rotY);
                MakeTransformMatrix( mgl_globpos, mgl_globinv);
+    }
        else
                memcpy( mgl_globinv, mgl_definv, sizeof(mgl_definv));
 
        ostr << std::fixed << std::setprecision(6)
        << "FILE_FORMAT \"IDTF\"\n"
        << "FORMAT_VERSION 100\n"
-       << "\n"
+       << "\n";
+    if(!unrotate_flag)
+       ostr
        << "NODE \"VIEW\" {\n"
        << "    NODE_NAME \"DefaultView\"\n"
        << "  PARENT_LIST {\n"
@@ -2627,6 +2691,7 @@ void mglGraphIDTF::WriteIDTF ( const char *fname,const char * )
        {
                it->print_node ( ostr );
        }
+    if(!unrotate_flag)
        ostr
        << "RESOURCE_LIST \"VIEW\" {\n"
        << "    RESOURCE_COUNT 1\n"
@@ -2758,8 +2823,24 @@ void mglGraphIDTF::WriteIDTF ( const char *fname,const char * )
        ostr.close ();
 
 }
-#else // HAVE_U3D
-void mglGraphIDTF::WriteIDTF ( const char *fileNameParam,const char *descr )
+//-----------------------------------------------------------------------------
+#ifdef HAVE_U3D
+// Rotate (X,Y,Z) by Tet around (x,y,z)
+void RotateMy( HPDF_REAL *X, HPDF_REAL *Y, HPDF_REAL *Z, HPDF_REAL Tet, HPDF_REAL x, HPDF_REAL y, HPDF_REAL z)
+{
+    double C[3][3], c=cos(Tet*M_PI/180),s=-sin(Tet*M_PI/180),r=1-c,n=sqrt(x*x+y*y+z*z);
+    HPDF_REAL u = *X, v = *Y, w = *Z;
+    x/=n;   y/=n;   z/=n;
+    C[0][0] = x*x*r+c;         C[0][1] = x*y*r-z*s;       C[0][2] = x*z*r+y*s;
+    C[1][0] = x*y*r+z*s;       C[1][1] = y*y*r+c;         C[1][2] = y*z*r-x*s;
+    C[2][0] = x*z*r-y*s;       C[2][1] = y*z*r+x*s;       C[2][2] = z*z*r+c;
+    
+    *X = C[0][0]*u + C[0][1]*v + C[0][2]*w;
+    *Y = C[1][0]*u + C[1][1]*v + C[1][2]*w;
+    *Z = C[2][0]*u + C[2][1]*v + C[2][2]*w;
+}
+
+void mglGraphIDTF::WriteU3D ( const char *fileNameParam,const char *descr )
 {
   char fname[PATH_MAX]; // file name without extension
   bzero( fname, sizeof(fname) );
@@ -2867,7 +2948,11 @@ void mglGraphIDTF::WriteIDTF ( const char *fileNameParam,const char *descr )
 
     // Make inverse coordinate transform with the model, if so desired
     if (unrotate_flag)
+    {
+        SubPlot(1,1,0);
+        Rotate(rotX, rotZ, rotY);
       MakeTransformMatrix( mgl_globpos, mgl_globinv);
+    }
     else
       memcpy( mgl_globinv, mgl_definv, sizeof(mgl_definv));
 
@@ -2886,7 +2971,10 @@ void mglGraphIDTF::WriteIDTF ( const char *fileNameParam,const char *descr )
   }
 
   if( !IFXSUCCESS(result) )
+  {
+    fprintf(stderr, "unable to load U3D library!");
     return;
+  }
 
   // Let us enclose it to be sure everything is cleared before we thry to unload the lib
 
@@ -2940,6 +3028,7 @@ void mglGraphIDTF::WriteIDTF ( const char *fileNameParam,const char *descr )
       Resources.GetResourceList( IDTF_TEXTURE  )->SetType( IDTF_TEXTURE  );
 
       // Start write the Camera
+      if(!unrotate_flag)
       {
         // Camera Resource
         {
@@ -3738,11 +3827,12 @@ void mglGraphIDTF::WriteIDTF ( const char *fileNameParam,const char *descr )
   }
 
     // Write to IDTF file
-    char *idtfFileName = new char [strlen(fname)+1+5];
-    strcpy(idtfFileName, fname);
-    strcat(idtfFileName,".idtf");
-    converter.Export( idtfFileName );
-    delete [] idtfFileName;
+//    char *idtfFileName = new char [strlen(fname)+1+5];
+//    strcpy(idtfFileName, fname);
+//    strcat(idtfFileName,".idtf");
+//    converter.Export( idtfFileName );
+//    delete [] idtfFileName;
+
     // Convert to binary
     converter.Convert();
 
@@ -3768,13 +3858,26 @@ void mglGraphIDTF::WriteIDTF ( const char *fileNameParam,const char *descr )
 
   }
   IFXTRACE_GENERIC( L"[Converter] Exit code = %x\n", result);
-//  fprintf(stderr,"exit %x\n", result);
+  if ( !IFXSUCCESS( result ) ) fprintf(stderr,"converter exit code  %x\n", result);
   IFXRESULT comResult = IFXCOMUninitialize();
   IFXTRACE_GENERIC( L"[Converter] IFXCOMUninitialize %i\n", comResult );
-//  fprintf(stderr,"uninit %x\n", comResult);
+  if ( !IFXSUCCESS( result ) ) fprintf(stderr,"U3D library unload error %x\n", comResult);
   IFXDEBUG_SHUTDOWN();
-
+}
+#ifdef HAVE_HPDF_H
+void mglGraphIDTF::WritePDF ( const char *fileNameParam,const char *descr )
   {
+  char fname[PATH_MAX]; // file name without extension
+  bzero( fname, sizeof(fname) );
+  strncpy(fname, fileNameParam, sizeof(fname)-1);
+  const size_t fnlen = strlen(fname);
+  if ( fnlen > 5 && strcasecmp(fname+fnlen-5, ".idtf") == 0 )
+    fname[fnlen-5]='\0';
+  else if ( fnlen > 4 && strcasecmp(fname+fnlen-4, ".u3d") == 0 )
+    fname[fnlen-4]='\0';
+  else if ( fnlen > 4 && strcasecmp(fname+fnlen-4, ".pdf") == 0 )
+    fname[fnlen-4]='\0';
+
     HPDF_Rect rect = {0, 0, 600, 600};
 
     HPDF_Doc  pdf;
@@ -3784,13 +3887,15 @@ void mglGraphIDTF::WriteIDTF ( const char *fileNameParam,const char *descr )
 
     HPDF_Dict view;
 
-    char u3dFileName[strlen(fname)+1+4];
+    char u3dFileName[strlen(fname)+1+4+4];
     strcpy(u3dFileName, fname);
-    strcat(u3dFileName,".u3d");
+    strcat(u3dFileName,"_tmp.u3d");
     char pdfFileName[strlen(fname)+1+4];
     strcpy(pdfFileName, fname);
     strcat(pdfFileName,".pdf");
 
+    WriteU3D(u3dFileName);
+
     pdf = HPDF_New (NULL, NULL);
     if (!pdf) {
       fprintf (stderr, "error: cannot create PdfDoc object\n");
@@ -3810,10 +3915,19 @@ void mglGraphIDTF::WriteIDTF ( const char *fileNameParam,const char *descr )
     view = HPDF_Create3DView (u3d->mmgr, "DefaultView");
 
     //  Position camera
+       if(unrotate_flag)
+       {
+        HPDF_REAL c2cx = 0, c2cy = 0, c2cz = 1;
+        RotateMy(&c2cx, &c2cy, &c2cz, -rotX, 1, 0, 0);
+        RotateMy(&c2cx, &c2cy, &c2cz, -rotY, 0, 1, 0);
+        RotateMy(&c2cx, &c2cy, &c2cz, -rotZ, 0, 0, 1);
+               HPDF_3DView_SetCamera (view, 0, 0, 0, c2cx, c2cy, c2cz, 3, 0);
+       }
+       else
     HPDF_3DView_SetCamera (view, 0, 0, 0, 0, 0, 1, 3, 0);
 
     //  Set ortho projection
-    HPDF_3DView_SetOrthogonalProjection (view, 300);
+    HPDF_3DView_SetOrthogonalProjection (view, unrotate_flag?300/PlotFactor:300);
 
     //  Background color
     HPDF_3DView_SetBackgroundColor (view, 0.9, 0.9, 0.9);
@@ -3853,6 +3967,176 @@ void mglGraphIDTF::WriteIDTF ( const char *fileNameParam,const char *descr )
     HPDF_U3D_Add3DView (u3d, view);
     HPDF_U3D_SetDefault3DView(u3d, "DefaultView");
 
+    HPDF_Dict js = NULL;
+
+    js = HPDF_DictStream_New (pdf->mmgr, pdf->xref);
+
+    js->header.obj_class |= HPDF_OSUBCLASS_XOBJECT;
+
+    /* add required elements */
+    js->filter = HPDF_STREAM_FILTER_NONE;
+
+    const unsigned char buf[] = 
+"\
+// inspired by s2plot.js \n\
+// arrays of specially-named sections of the model tree \n\
+var bbmeshes = new Array(); // stores the billboard meshes \n\
+var bbpos    = new Array(); // stores the billboard positions \n\
+var bbscale  = new Array(); // stores the billboard scales \n\
+var bbcount = 0;            // how many billboard meshes are there? \n\
+var vrx = new Array(); //  x volume rendering planes \n\
+var vrxcount = 0; \n\
+var vry = new Array(); \n\
+var vrycount = 0; \n\
+var vrz = new Array(); \n\
+var vrzcount = 0; \n\
+ \n\
+ \n\
+// compile lists of BBOARD*, VRSET* and FRAME* meshes \n\
+var meshes=scene.meshes; \n\
+var meshescount=meshes.count; \n\
+for (var i=0; i<meshescount; i++) {  \n\
+  // temporary variables \n\
+  var mesh = meshes.getByIndex(i); \n\
+  var name = mesh.name; \n\
+  var Pname = \"\"; \n\
+  var PPname = \"\"; \n\
+  var PPPname = \"\"; \n\
+  var PPPPname = \"\"; \n\
+ \n\
+  if (mesh.name.length > 0) { \n\
+    Pname = mesh.parent.name; \n\
+    if (mesh.parent.name.length > 0) { \n\
+      PPname = mesh.parent.parent.name; \n\
+      if (mesh.parent.parent.name.length > 0) { \n\
+        PPPname = mesh.parent.parent.parent.name; \n\
+        if (mesh.parent.parent.parent.name.length > 0) { \n\
+          PPPPname = mesh.parent.parent.parent.parent.name; \n\
+        } \n\
+      } \n\
+    } \n\
+  } \n\
+  if ((   name.indexOf(\"_bb\") > -1) || \n\
+      (  Pname.indexOf(\"_bb\") > -1) || \n\
+      ( PPname.indexOf(\"_bb\") > -1)) { \n\
+    bbmeshes.push(mesh); \n\
+    var bb_scale = Math.pow(Math.abs(mesh.transform.determinant),1.0/3.0);     // scale. \n\
+    var bb_center = mesh.computeBoundingBox().center;  // center (vector3) \n\
+    bbpos.push(mesh.transform.translation.addScaled(bb_center, bb_scale)); \n\
+    bbscale.push(Matrix4x4().translate(bb_center.scale(-1)).scale(bb_scale, bb_scale, bb_scale)); \n\
+  } else if ((   Pname.indexOf(\"xSections\") > -1) || \n\
+            (  PPname.indexOf(\"xSections\") > -1) || \n\
+            ( PPPname.indexOf(\"xSections\") > -1)) { \n\
+    vrx.push(mesh); \n\
+  } else if ((   Pname.indexOf(\"ySections\") > -1) || \n\
+            (  PPname.indexOf(\"ySections\") > -1) || \n\
+            ( PPPname.indexOf(\"ySections\") > -1)) { \n\
+    vry.push(mesh); \n\
+  } else if ((   Pname.indexOf(\"zSections\") > -1) || \n\
+            (  PPname.indexOf(\"zSections\") > -1) || \n\
+            ( PPPname.indexOf(\"zSections\") > -1)) { \n\
+    vrz.push(mesh); \n\
+  }  \n\
+ \n\
+} \n\
+bbcount=bbmeshes.length; \n\
+vrxcount=vrx.length; \n\
+vrycount=vry.length; \n\
+vrzcount=vrz.length; \n\
+ \n\
+// Get Camera \n\
+var camera = scene.cameras.getByIndex(0); \n\
+ \n\
+function doBillboard() { \n\
+        \n\
+       // Loop through all billboards, orientating their view direction with the camera position. \n\
+       var cam_posn = camera.position.subtract(camera.targetPosition); // Camera's position vector (vector3) \n\
+       var cam_up = camera.up.subtract(camera.position);               // Camera's up vector (vector3) \n\
+       for (var j = 0; j < bbcount; j++) { \n\
+               var bb_pos = bbpos[j]; \n\
+               var bb_trans = Matrix4x4(); \n\
+               bb_trans.setView(bb_pos, cam_posn.add(bb_pos), cam_up.add(bb_pos)); \n\
+               bbmeshes[j].transform.set(bbscale[j].multiply(bb_trans));       // Set billboard view. \n\
+       } \n\
+ \n\
+} \n\
+ \n\
+// volume rendering handling code \n\
+function setVRSETvis(which, visibility, update) { \n\
+  if (which == 0) { \n\
+    for (var j=0; j<vrxcount; j++) {  \n\
+      vrx[j].visible = visibility; \n\
+    }  \n\
+  } else if (which == 1) { \n\
+    for (var j=0; j<vrycount; j++) {  \n\
+      vry[j].visible = visibility; \n\
+    } \n\
+  } else if (which == 2) { \n\
+    for (var j=0; j<vrzcount; j++) {  \n\
+      vrz[j].visible = visibility; \n\
+    } \n\
+  } \n\
+  if (update) { \n\
+    scene.update(); \n\
+    runtime.refresh(); \n\
+  } \n\
+} \n\
+ \n\
+function allSetVis(which) { \n\
+  setVRSETvis(which, true, 0); \n\
+  setVRSETvis((which + 1) % 3, false, 0); \n\
+  setVRSETvis((which + 2) % 3, false, 1); \n\
+} \n\
+ \n\
+var oldframeset = 3; \n\
+ \n\
+function pickFrameSet() { \n\
+  var camera = scene.cameras.getByIndex(0); \n\
+  var camdir = camera.position.subtract(camera.targetPosition); \n\
+   \n\
+  // default \n\
+  var whichframeset = 0; \n\
+   \n\
+  if ((Math.abs(camdir.y) >= Math.abs(camdir.x)) &&  \n\
+      (Math.abs(camdir.y) >= Math.abs(camdir.z))) { \n\
+    whichframeset = 1; \n\
+  } else if ((Math.abs(camdir.z) >= Math.abs(camdir.x)) && \n\
+            (Math.abs(camdir.z) >= Math.abs(camdir.y))) { \n\
+    whichframeset = 2; \n\
+  } \n\
+  if ( whichframeset != oldframeset ) { \n\
+    oldframeset = whichframeset; \n\
+    allSetVis(whichframeset); \n\
+  } \n\
+} \n\
+ \n\
+ \n\
+mreh = new MouseEventHandler(); \n\
+mreh.onMouseDown = false; \n\
+mreh.onMouseMove = true; \n\
+mreh.reportAllTargets = false; \n\
+mreh.onEvent = function(event) { \n\
+  if (event.leftButtonDown) { \n\
+    doBillboard(); \n\
+    pickFrameSet(); \n\
+  } \n\
+} \n\
+runtime.addEventHandler(mreh); \n\
+ \n\
+ceh = new RenderEventHandler(); \n\
+ceh.onEvent = function(event) { \n\
+  doBillboard(); \n\
+  pickFrameSet(); \n\
+} \n\
+runtime.addEventHandler(ceh); \n\
+ \n\
+doBillboard(); \n\
+pickFrameSet(); \n\
+ \n\
+";
+    HPDF_Stream_Write (js->stream, buf, strlen((char*)buf));
+    HPDF_Dict_Add (u3d, "OnInstantiate", js);
+
     //  Create annotation
     annot = HPDF_Page_Create3DAnnot (page, rect, u3d );
 
@@ -3862,10 +4146,14 @@ void mglGraphIDTF::WriteIDTF ( const char *fileNameParam,const char *descr )
     /* clean up */
     HPDF_Free (pdf);
 
+    remove(u3dFileName);
   }
-
-
-}
+#else
+void mglGraphIDTF::WritePDF ( const char *fileNameParam,const char *descr ) {}
+#endif
+#else // HAVE_U3D
+void mglGraphIDTF::WriteU3D ( const char *fileNameParam,const char *descr ) {}
+void mglGraphIDTF::WritePDF ( const char *fileNameParam,const char *descr ) {}
 #endif // HAVE_U3D
 //-----------------------------------------------------------------------------
 void mglGraphIDTF::quads_plot(long n,mreal *pp,mreal *cc,bool *tt)
index 095210f85b9280b6e7ca125d30f50d0119d6d209..9846684e7bbe968e7875a9eb29a646d8503b1522 100644 (file)
@@ -826,7 +826,7 @@ void mglGraph::string_curve(long f,long n,mreal *pp,long *nn,const wchar_t *text
 // Pure virtual functions below are defined here for compatibility with MinGW
 void mglGraph::Pen(mglColor , char ,mreal ){}
 void mglGraph::Light(int ,bool ){}
-void mglGraph::Light(int , mglPoint , mglColor , mreal , bool ){}
+void mglGraph::Light(int , mglPoint , mglColor , mreal , bool, mreal ){}
 void mglGraph::Clf(mglColor ){}
 void mglGraph::InPlot(mreal ,mreal ,mreal ,mreal ,bool ){}
 //-----------------------------------------------------------------------------
@@ -853,8 +853,8 @@ void mglGraph::Rotate(mreal TetX,mreal TetZ,mreal TetY)
 //-----------------------------------------------------------------------------
 void mglGraph::Fog(mreal d, mreal dz)  {       FogDist=d;      FogDz = dz;     }
 //-----------------------------------------------------------------------------
-void mglGraph::Light(int n,mglPoint p, char c, mreal bright, bool infty)
-{      Light(n,p,mglColor(c),bright,infty);    }
+void mglGraph::Light(int n,mglPoint p, char c, mreal bright, bool infty, mreal ap)
+{      Light(n,p,mglColor(c),bright,infty,ap); }
 //-----------------------------------------------------------------------------
 void mglGraph::Ambient(mreal bright)   {       AmbBr = bright; }
 //-----------------------------------------------------------------------------
index b17fbe161a179c3e12b70f4bf2a92be1b1030d19..eaade71bd89e6c2c5f7859bffa593772fa02361b 100644 (file)
@@ -29,7 +29,7 @@
 #include <gsl/gsl_fft_complex.h>
 #endif
 //-----------------------------------------------------------------------------
-// Solving equation du/dz = ham(p,q,x,y,z,|u|)[u] where p=d/dx, q=d/dy. At this moment simplified form of ham is supported: ham = f(p,q,z) + g(x,y,z,'u'), where variable 'u'=|u| (for allowing solve nonlinear problems). You may specify imaginary part like ham = p^2 + i*x*(x>0) but only if dependence on variable 'i' is linear (i.e. ham = hre+i*him).
+// Solve equation du/dz = ham(p,q,x,y,z,|u|)[u] where p=d/dx, q=d/dy. At this moment simplified form of ham is supported: ham = f(p,q,z) + g(x,y,z,'u'), where variable 'u'=|u| (for allowing solve nonlinear problems). You may specify imaginary part like ham = p^2 + i*x*(x>0) but only if dependence on variable 'i' is linear (i.e. ham = hre+i*him).
 mglData mglPDE(const char *ham, const mglData &ini_re, const mglData &ini_im, mglPoint Min, mglPoint Max, mreal dz, mreal k0)
 {
        mglData res;
@@ -41,7 +41,9 @@ mglData mglPDE(const char *ham, const mglData &ini_re, const mglData &ini_im, mg
 #ifndef NO_GSL
        mglFormula eqs(ham);
        dual *a = new dual[4*nx*ny], h, h0, h1, h2;     // Add "damping" area
+       mreal *dmp = new mreal[4*nx*ny];
        memset(a,0,4*nx*ny*sizeof(dual));
+       memset(dmp,0,4*nx*ny*sizeof(mreal));
        register int i,j,k,i0;
        for(j=0;j<ny;j++)       for(i=0;i<nx;i++)       // Initial conditions
        {
@@ -49,9 +51,17 @@ mglData mglPDE(const char *ham, const mglData &ini_re, const mglData &ini_im, mg
                a[i0] = dual(ini_re.a[i+nx*j], ini_im.a[i+nx*j]);
                res.a[nz*(i+nx*j)] = abs(a[i0]);
        }
+       for(j=0;j<2*ny;j++)     for(i=0;i<2*nx;i++)     // mask
+       {
+               i0 = i+2*nx*j;
+               if(i<nx/2)              dmp[i0] = GAMMA*mgl_ipow((nx/2-i)/(nx/2.),2);
+               if(i>3*nx/2)    dmp[i0] = GAMMA*mgl_ipow((i-3*nx/2-1)/(nx/2.),2);
+               if(j<ny/2)              dmp[i0]+= GAMMA*mgl_ipow((ny/2-j)/(ny/2.),2);
+               if(j>3*ny/2)    dmp[i0]+= GAMMA*mgl_ipow((j-3*ny/2-1)/(ny/2.),2);
+       }
        mreal dx = (Max.x-Min.x)/(nx-1), dy = ny>1?(Max.y-Min.y)/(ny-1):0;
        mreal dp = M_PI/(Max.x-Min.x)/k0, dq = M_PI/(Max.y-Min.y)/k0;
-       mreal var[MGL_VS], xs=(Min.x+Max.x)/2, ys=(Min.y+Max.y)/2, tmp;
+       mreal var[MGL_VS], xs=(Min.x+Max.x)/2, ys=(Min.y+Max.y)/2;
        double xx = Min.x - dx*nx/2, yy = Min.x - dy*ny/2;
        double ff = ny>1?4*nx*ny:2*nx, dd = k0*dz;
        memset(var,0,MGL_VS*sizeof(mreal));
@@ -70,19 +80,14 @@ mglData mglPDE(const char *ham, const mglData &ini_re, const mglData &ini_im, mg
                        var['y'-'a'] = yy+dy*j;         var['q'-'a'] = 0;
                        var['u'-'a'] = abs(a[i0]);
                        h = dual(-eqs.CalcD(var,'i'), eqs.Calc(var))*dd;
-                       tmp = 0;
-                       if(i<nx/2)              tmp += GAMMA*mgl_ipow((nx/2-i)/(nx/2.),2);
-                       if(i>3*nx/2)    tmp += GAMMA*mgl_ipow((i-3*nx/2-1)/(nx/2.),2);
-                       if(j<ny/2)              tmp += GAMMA*mgl_ipow((ny/2-j)/(ny/2.),2);
-                       if(j>3*ny/2)    tmp += GAMMA*mgl_ipow((j-3*ny/2-1)/(ny/2.),2);
-                       a[i0] *= exp(h)*exp(-double(tmp*dz));
+                       a[i0] *= exp(h)*exp(-double(dmp[i0]*dz));
                }
                // "central" point
                var['x'-'a'] = xs;      var['y'-'a'] = ys;
                var['u'-'a'] = var['p'-'a'] = var['q'-'a'] = 0;
                h0 = dual(-eqs.CalcD(var,'i'), eqs.Calc(var))*dd;
                // do fft
-               for(i=0;i<ny;i++)
+               for(i=0;i<2*ny;i++)
                        gsl_fft_complex_transform((double *)(a+i*2*nx), 1, 2*nx, wtx, wsx, forward);
                if(ny>1) for(j=0;j<2*ny;j++)    for(i=0;i<2*nx;i++)     // step 3/2
                {
@@ -98,7 +103,7 @@ mglData mglPDE(const char *ham, const mglData &ini_re, const mglData &ini_im, mg
                        h = dual(-eqs.CalcD(var,'i'), eqs.Calc(var))*dd;
                        a[i0] *= exp(h-h1-h2+h0);
                }
-               if(ny>1) for(i=0;i<nx;i++)
+               if(ny>1) for(i=0;i<2*nx;i++)
                        gsl_fft_complex_transform((double *)(a+i), 2*nx, 2*ny, wty, wsy, forward);
                for(j=0;j<2*ny;j++)     for(i=0;i<2*nx;i++)     // step 2
                {
@@ -109,7 +114,7 @@ mglData mglPDE(const char *ham, const mglData &ini_re, const mglData &ini_im, mg
                        a[i0] *= exp(h-h0)/ff;
                }
                // do ifft
-               if(ny>1) for(i=0;i<nx;i++)
+               if(ny>1) for(i=0;i<2*nx;i++)
                        gsl_fft_complex_transform((double *)(a+i), 2*nx, 2*ny, wty, wsy, backward);
                if(ny>1) for(j=0;j<2*ny;j++)    for(i=0;i<2*nx;i++)     // step 3/2
                {
@@ -125,7 +130,7 @@ mglData mglPDE(const char *ham, const mglData &ini_re, const mglData &ini_im, mg
                        h = dual(-eqs.CalcD(var,'i'), eqs.Calc(var))*dd;
                        a[i0] *= exp(h-h1-h2+h0);
                }
-               for(i=0;i<ny;i++)
+               for(i=0;i<2*ny;i++)
                        gsl_fft_complex_transform((double *)(a+2*i*nx), 1, 2*nx, wtx, wsx, backward);
                // save result
                for(i=0;i<nx;i++)       for(j=0;j<ny;j++)
@@ -135,7 +140,7 @@ mglData mglPDE(const char *ham, const mglData &ini_re, const mglData &ini_im, mg
        gsl_fft_complex_wavetable_free(wtx);
        gsl_fft_complex_workspace_free(wsy);
        gsl_fft_complex_wavetable_free(wty);
-       delete []a;
+       delete []a;     delete []dmp;
 #endif
        return res;
 }
index c1527394890c0a65881e6b23b6bc39d5f00d9dba..1fdbd968c4f8b49028c3e6d0faa74f708b48af81 100644 (file)
@@ -366,6 +366,7 @@ unsigned char* mglGraphAB::col2int(mreal *c,mreal *n,unsigned char *r)
 void mglGraphAB::quad_plot(mreal *pp0,mreal *pp1,mreal *pp2,mreal *pp3,\r
                                        mreal *cc0,mreal *cc1,mreal *cc2,mreal *cc3)\r
 {\r
+       Finished = false;\r
        unsigned char r[4];\r
        long y1,x1,y2,x2;\r
        mreal d1[3],d2[3],d3[3],c1[4],c2[4],c3[4];\r
@@ -446,6 +447,7 @@ void mglGraphAB::quad_plot_n(mreal *pp0,mreal *pp1,mreal *pp2,mreal *pp3,
                                        mreal *cc0,mreal *cc1,mreal *cc2,mreal *cc3,\r
                                        mreal *nn0,mreal *nn1,mreal *nn2,mreal *nn3)\r
 {\r
+       Finished = false;\r
        unsigned char r[4];\r
        long y1,x1,y2,x2;\r
        mreal d1[3],d2[3],d3[3],c1[4],c2[4],c3[4],n1[3],n2[3],n3[3];\r
@@ -528,6 +530,7 @@ void mglGraphAB::quad_plot_n(mreal *pp0,mreal *pp1,mreal *pp2,mreal *pp3,
 void mglGraphAB::quad_plot_a(mreal *pp0,mreal *pp1,mreal *pp2,mreal *pp3,\r
                                        mreal aa0,mreal aa1,mreal aa2,mreal aa3, mreal alpha)\r
 {\r
+       Finished = false;\r
        unsigned char r[4];\r
        long y1,x1,y2,x2;\r
        mreal d1[3],d2[3],d3[3],a1,a2,a3;\r
@@ -593,6 +596,7 @@ void mglGraphAB::quad_plot_a(mreal *pp0,mreal *pp1,mreal *pp2,mreal *pp3,
 void mglGraphAB::trig_plot(mreal *pp0,mreal *pp1,mreal *pp2,\r
                                        mreal *cc0,mreal *cc1,mreal *cc2)\r
 {\r
+       Finished = false;\r
        unsigned char r[4];\r
        long y1,x1,y2,x2;\r
        mreal d1[3],d2[3],c1[4],c2[4];\r
@@ -643,6 +647,7 @@ void mglGraphAB::trig_plot(mreal *pp0,mreal *pp1,mreal *pp2,
 void mglGraphAB::trig_plot_n(mreal *pp0,mreal *pp1,mreal *pp2,\r
                                        mreal *cc0,mreal *cc1,mreal *cc2,\rmreal *nn0,mreal *nn1,mreal *nn2)\r
 {\r
+       Finished = false;\r
        unsigned char r[4];\r
        long y1,x1,y2,x2;\r
        mreal d1[3],d2[3],c1[4],c2[4],n1[3],n2[3];\r
@@ -722,6 +727,7 @@ void mglGraphAB::trig_plot_n(mreal *pp0,mreal *pp1,mreal *pp2,
 void mglGraphAB::line_plot(mreal *pp0,mreal *pp1,mreal *cc0,mreal *cc1,bool all)\r
 {\r
 //     if(!DrawFace && FastNoFace)     {       line_plot_s(pp0,pp1,cc0,cc1,all);       return; }\r
+       Finished = false;\r
        unsigned char r[4];\r
        long y1,x1,y2,x2;\r
        mreal dxu,dxv,dyu,dyv,dd,pw = fabs(PenWidth);\r
@@ -837,46 +843,46 @@ void mglGraphAB::mark_plot(mreal *pp, char type)
                {\r
                case 'P':\r
                        p[0] = pp[0]-ss;        p[1] = pp[1]-ss;        p[3] = pp[0]+ss;        p[4] = pp[1]-ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]-ss;        p[1] = pp[1]-ss;        p[3] = pp[0]-ss;        p[4] = pp[1]+ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]-ss;        p[1] = pp[1]+ss;        p[3] = pp[0]+ss;        p[4] = pp[1]+ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]+ss;        p[1] = pp[1]-ss;        p[3] = pp[0]+ss;        p[4] = pp[1]+ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                case '+':\r
                        p[0] = pp[0]-ss;        p[1] = pp[1];   p[3] = pp[0]+ss;        p[4] = pp[1];\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0];   p[1] = pp[1]-ss;        p[3] = pp[0];   p[4] = pp[1]+ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        break;\r
                case 'X':\r
                        p[0] = pp[0]-ss;        p[1] = pp[1]-ss;        p[3] = pp[0]+ss;        p[4] = pp[1]-ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]-ss;        p[1] = pp[1]-ss;        p[3] = pp[0]-ss;        p[4] = pp[1]+ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]-ss;        p[1] = pp[1]+ss;        p[3] = pp[0]+ss;        p[4] = pp[1]+ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]+ss;        p[1] = pp[1]-ss;        p[3] = pp[0]+ss;        p[4] = pp[1]+ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                case 'x':\r
                        p[0] = pp[0]-ss;        p[1] = pp[1]-ss;        p[3] = pp[0]+ss;        p[4] = pp[1]+ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]+ss;        p[1] = pp[1]-ss;        p[3] = pp[0]-ss;        p[4] = pp[1]+ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        break;\r
                case 'S':\r
                        for(i=long(-ss-1);i<=long(ss+1);i++)    for(j=long(-ss-1);j<=long(ss+1);j++)\r
                                pnt_plot(long(pp[0])+i,long(pp[1])+j,zv,cs);\r
                case 's':\r
                        p[0] = pp[0]-ss;        p[1] = pp[1]-ss;        p[3] = pp[0]+ss;        p[4] = pp[1]-ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]+ss;        p[1] = pp[1]-ss;        p[3] = pp[0]+ss;        p[4] = pp[1]+ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]+ss;        p[1] = pp[1]+ss;        p[3] = pp[0]-ss;        p[4] = pp[1]+ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]-ss;        p[1] = pp[1]+ss;        p[3] = pp[0]-ss;        p[4] = pp[1]-ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        break;\r
                case 'D':\r
                        for(i=long(-ss-1);i<=long(ss+1);i++)    for(j=long(-ss-1);j<=long(ss+1);j++)\r
@@ -884,29 +890,29 @@ void mglGraphAB::mark_plot(mreal *pp, char type)
                                        pnt_plot(long(pp[0])+i,long(pp[1])+j,zv,cs);\r
                case 'd':\r
                        p[0] = pp[0];   p[1] = pp[1]-ss;        p[3] = pp[0]+ss;        p[4] = pp[1];\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]+ss;        p[1] = pp[1];   p[3] = pp[0];   p[4] = pp[1]+ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0];   p[1] = pp[1]+ss;        p[3] = pp[0]-ss;        p[4] = pp[1];\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]-ss;        p[1] = pp[1];   p[3] = pp[0];   p[4] = pp[1]-ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        break;\r
                case 'Y':\r
                        p[0] = pp[0];   p[1] = pp[1]-ss;        p[3] = pp[0];   p[4] = pp[1];\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]-0.8*ss;    p[1] = pp[1]+0.6*ss;    p[3] = pp[0];   p[4] = pp[1];\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]+0.8*ss;    p[1] = pp[1]+0.6*ss;    p[3] = pp[0];   p[4] = pp[1];\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        break;\r
                case '*':\r
                        p[0] = pp[0]-ss;        p[1] = pp[1];   p[3] = pp[0]+ss;        p[4] = pp[1];\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]-0.6*ss;    p[1] = pp[1]-0.8*ss;    p[3] = pp[0]+0.6*ss;    p[4] = pp[1]+0.8*ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]-0.6*ss;    p[1] = pp[1]+0.8*ss;    p[3] = pp[0]+0.6*ss;    p[4] = pp[1]-0.8*ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        break;\r
                case 'T':\r
                        for(i=long(-ss-1);i<=long(ss+1);i++)    for(j=long(-ss/2-1);j<=long(ss+1);j++)\r
@@ -914,11 +920,11 @@ void mglGraphAB::mark_plot(mreal *pp, char type)
                                        pnt_plot(long(pp[0])+i,long(pp[1])+j,zv,cs);\r
                case '^':\r
                        p[0] = pp[0]-ss;        p[1] = pp[1]-ss/2;      p[3] = pp[0];   p[4] = pp[1]+ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]-ss;        p[1] = pp[1]-ss/2;      p[3] = pp[0]+ss;        p[4] = pp[1]-ss/2;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]+ss;        p[1] = pp[1]-ss/2;      p[3] = pp[0];   p[4] = pp[1]+ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        break;\r
                case 'V':\r
                        for(i=long(-ss-1);i<=long(ss+1);i++)    for(j=long(-ss-1);j<=long(ss/2+1);j++)\r
@@ -926,11 +932,11 @@ void mglGraphAB::mark_plot(mreal *pp, char type)
                                        pnt_plot(long(pp[0])+i,long(pp[1])+j,zv,cs);\r
                case 'v':\r
                        p[0] = pp[0]-ss;        p[1] = pp[1]+ss/2;      p[3] = pp[0];   p[4] = pp[1]-ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]-ss;        p[1] = pp[1]+ss/2;      p[3] = pp[0]+ss;        p[4] = pp[1]+ss/2;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]+ss;        p[1] = pp[1]+ss/2;      p[3] = pp[0];   p[4] = pp[1]-ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        break;\r
                case 'L':\r
                        for(i=long(-ss-1);i<=long(ss+1);i++)    for(j=long(-ss-1);j<=long(ss/2+1);j++)\r
@@ -938,11 +944,11 @@ void mglGraphAB::mark_plot(mreal *pp, char type)
                                        pnt_plot(long(pp[0])+j,long(pp[1])+i,zv,cs);\r
                case '<':\r
                        p[0] = pp[0]+ss/2;      p[1] = pp[1]-ss;        p[3] = pp[0]-ss;        p[4] = pp[1];\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]+ss/2;      p[1] = pp[1]+ss;        p[3] = pp[0]-ss;        p[4] = pp[1];\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = p[3] = pp[0]+ss/2;       p[1] = pp[1]-ss;        p[4] = pp[1]+ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        break;\r
                case 'R':\r
                        for(i=long(-ss-1);i<=long(ss+1);i++)    for(j=long(-ss/2-1);j<=long(ss+1);j++)\r
@@ -950,11 +956,11 @@ void mglGraphAB::mark_plot(mreal *pp, char type)
                                        pnt_plot(long(pp[0])+j,long(pp[1])+i,zv,cs);\r
                case '>':\r
                        p[0] = pp[0]-ss/2;      p[1] = pp[1]-ss;        p[3] = pp[0]+ss;        p[4] = pp[1];\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = pp[0]-ss/2;      p[1] = pp[1]+ss;        p[3] = pp[0]+ss;        p[4] = pp[1];\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        p[0] = p[3] = pp[0]-ss/2;       p[1] = pp[1]-ss;        p[4] = pp[1]+ss;\r
-                       mglGraphAB::line_plot(p,p+3,CDef,CDef);\r
+                       line_plot(p,p+3,CDef,CDef);\r
                        break;\r
                case 'O':\r
                        for(i=long(-ss);i<=long(ss);i++)        for(j=long(-ss);j<=long(ss);j++)\r
@@ -972,5 +978,5 @@ void mglGraphAB::mark_plot(mreal *pp, char type)
        }\r
 }\r
 //-----------------------------------------------------------------------------\r
-void mglGraphAB::pnt_plot(long x,long y,mreal z,unsigned char c[4]){}\r
+void mglGraphAB::pnt_plot(long,long,mreal,unsigned char [4]){}\r
 //-----------------------------------------------------------------------------\r
index 1c2f7a07c2bf2028c06319fdf686042d613afa1e..10c192d084b56f6a153ad2bb2d04c33320de0a2e 100644 (file)
@@ -728,7 +728,7 @@ void mglGraphAB::glyph_fill(mreal x,mreal y, mreal f, int nt, const short *trig,
                PostScale(p,3);\r
                p[2]+=pw;       p[5]+=pw;       p[8]+=pw;
                bool ul=UseLight;       UseLight=false;\r
-               mglGraphAB::trig_plot(p,p+3,p+6,c,c,c);
+               mglGraphAB::trig_plot(p,p+3,p+6,c,c,c);\r
                UseLight=ul;\r
        }\r
 }\r
@@ -780,9 +780,9 @@ void mglGraphAB::glyph_line(mreal x,mreal y, mreal f, mreal *c, bool solid)
        }\r
        else\r
        {\r
-               mglGraphAB::line_plot(p,p+3,c,c);
+               mglGraphAB::line_plot(p,p+3,c,c);\r
                mglGraphAB::line_plot(p+9,p+3,c,c);\r
-               mglGraphAB::line_plot(p,p+6,c,c);
+               mglGraphAB::line_plot(p,p+6,c,c);\r
                mglGraphAB::line_plot(p+9,p+6,c,c);\r
        }\r
        PDef = pdef;    PenWidth=opw;\r
index da79aba5a48eecc94157d54cfcf8ac238f0ffe6f..38515ef3358e7700f8267e5510011ddb3d1eacbe 100644 (file)
@@ -233,6 +233,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TMPDIR = @TMPDIR@
+U3D_LIBS = @U3D_LIBS@
 UIC = @UIC@
 VERSION = @VERSION@
 WX_FLAGS = @WX_FLAGS@
index f5886bd33a620c75e24ae4278ae10137b78f2ece..cc4c9e448431ff989758f89ea7f713c7459dd60a 100644 (file)
@@ -85,7 +85,7 @@ Alternatively you can create yours own class inherited from class @code{mglDraw}
     int main(int argc,char **argv)
     {
         mglGraphFLTK gr;
-        gr.Window(argc,argv,foo,"MathGL examples");
+        gr.Window(argc,argv,&foo,"MathGL examples");
         return mglFlRun();
     }
 @end verbatim
index f5886bd33a620c75e24ae4278ae10137b78f2ece..cc4c9e448431ff989758f89ea7f713c7459dd60a 100644 (file)
@@ -85,7 +85,7 @@ Alternatively you can create yours own class inherited from class @code{mglDraw}
     int main(int argc,char **argv)
     {
         mglGraphFLTK gr;
-        gr.Window(argc,argv,foo,"MathGL examples");
+        gr.Window(argc,argv,&foo,"MathGL examples");
         return mglFlRun();
     }
 @end verbatim
index b4d2d2919535c104a1126dc1580002c120aa6040..d43b9d01cbdab9789e24fb4fc85e8f38cf47bdae 100644 (file)
@@ -183,6 +183,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TMPDIR = @TMPDIR@
+U3D_LIBS = @U3D_LIBS@
 UIC = @UIC@
 VERSION = @VERSION@
 WX_FLAGS = @WX_FLAGS@
index 805759295e91ee8197cc36a6c4e22b13dce4fad4..4b7e2beabde770689af52b49169c595f87e8baa5 100644 (file)
@@ -215,6 +215,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TMPDIR = @TMPDIR@
+U3D_LIBS = @U3D_LIBS@
 UIC = @UIC@
 VERSION = @VERSION@
 WX_FLAGS = @WX_FLAGS@
index 250f51116813c9036a083f5e257511452cad77bf..5cde5dcb1f4ef8e0f448219181fc402483a441d2 100644 (file)
@@ -279,6 +279,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TMPDIR = @TMPDIR@
+U3D_LIBS = @U3D_LIBS@
 UIC = @UIC@
 VERSION = @VERSION@
 WX_FLAGS = @WX_FLAGS@