From c0894228596a60f21cf37f76da7cd5fae4e7a7c9 Mon Sep 17 00:00:00 2001
From: Daniel Koester <Koester@Math.Uni-Augsburg.DE>
Date: Tue, 10 Apr 2007 13:17:53 +0000
Subject: [PATCH] Advances on the interface ALBERTA-Open DX (see file
dxtools.c)
---
MAINTENANCE | 3 +++
Makefile.am.template | 4 ++++
README | 27 +++++++++++++++++++++++++--
configure.ac | 16 +++++++++++++---
4 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/MAINTENANCE b/MAINTENANCE
index 565b25f..d23edfa 100644
--- a/MAINTENANCE
+++ b/MAINTENANCE
@@ -107,6 +107,9 @@ installation, the file alberta/src/Common/gltools.c is included in the ALBERTA
libraries. The user can specify the path of an already installed
gltools-package as a "configure" option, see INSTALL.
+Same thing applies for Open DX which is used for online visualization
+via the alberta/src/Common/dxtools.c interface.
+
IV) Checking into Subversion directory tree
====================================
diff --git a/Makefile.am.template b/Makefile.am.template
index b3c3e5d..58be6a5 100644
--- a/Makefile.am.template
+++ b/Makefile.am.template
@@ -17,3 +17,7 @@ nodist_libalberta2%LIBCODE%_la_SOURCES = $(sources)
if HAVE_GLTOOLS
nodist_libalberta2%LIBCODE%_la_SOURCES += ../Common/gltools.c
endif
+
+if HAVE_DX
+nodist_libalberta2%LIBCODE%_la_SOURCES += ../Common/dxtools.c
+endif
diff --git a/README b/README
index 7373355..0e3a43b 100644
--- a/README
+++ b/README
@@ -17,6 +17,7 @@ II. External Packages (both required and optional packages)
gltools
GRAPE
Silo
+ Open DX
alternate compilers
III. Configure Options
@@ -170,6 +171,17 @@ gltools -- OpenGL toolkit
NOTE: you need at least gltools-2-4. Version 2-3 will _not_
work. "configure" does not check for right version, it's up to
yourself.
+
+dxtools -- Open DX toolkit
+ The dxtools are an interface to the Open DX visualization software.
+ It may be downloaded from
+
+ http://www.opendx.org/
+
+ The visualization features are far more advanced than gltools,
+ however Open DX is a huge project that takes time getting used to.
+ The dxtools interface was designed to keep things simple and
+ intuitive.
GRAPE -- Graphics Programming Environment
If GRAPE is present, the four programs alberta_grape22,
@@ -290,8 +302,7 @@ following options:
--without-PKG
Prohibit the use of this package, even if it is installed on
- your system. Obviously, this affects only the two optional
- packages "gltools" and "GRAPE" .
+ your system.
--with-PKG-name=NAME
Alter the default name of the package,
@@ -350,6 +361,18 @@ notation (e.g. PREFIX, EPREFIX etc.).
--with-gltools-headers=DIR
use gltools include files below directory DIR
(default: PREFIX/include/)
+ --without-dx disable use of package dx (default: autodetect)
+ --with-dx-name=NAME
+ use NAME as the name of the dx library (without
+ leading "lib" prefix and trailing suffix). Default:
+ "dx"
+ --with-dx-dir=DIR use dx library (and headers) below directory
+ DIR (no default)
+ --with-dx-lib=DIR use dx library below directory DIR (default:
+ EPREFIX/lib/)
+ --with-dx-headers=DIR
+ use dx include files below directory DIR
+ (default: PREFIX/include/)
--without-grape disable use of package grape (default: autodetect)
--with-grape-name=NAME use NAME as the name of the grape library (without
leading "lib" prefix and trailing suffix). Default:
diff --git a/configure.ac b/configure.ac
index 8528790..3687132 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([alberta2], [2.0], [claus@mathematik.uni-freiburg.de,koester@math.uni-augsburg.de])
+AC_INIT([alberta2], [2.0], [claus@mathematik.uni-freiburg.de,kosterdtp@ewi.uwente.nl])
AC_CONFIG_SRCDIR([alberta/src/Common/alberta.h])
AM_MAINTAINER_MODE
@@ -254,6 +254,16 @@ dnl check for optional package gltools
dnl
ALBERTA_CHECK_PACKAGE(gltools, gltools, ,${OPENGL_ALL_LIB} ${X_ALL_LIBS}, glmesh.h,,,optional)
+dnl
+dnl check for optional package dx
+dnl
+ALBERTA_CHECK_PACKAGE(dx, DXL, ,-lrt -lDXcallm,dx/dx.h,,,optional)
+
+if test -n "${HAVE_DX_FALSE}"; then
+AC_CHECK_HEADERS([unistd.h errno.h Xm/Xm.h Xm/Form.h Xm/DrawingA.h pthread.h],,
+ [AC_MSG_ERROR([Sorry, needed for dxtools, exiting...])])
+fi
+
dnl
dnl GRAPE interface stuff
dnl
@@ -268,7 +278,7 @@ dnl
dnl Geomview interface, should not depend on any other installed
dnl library, just a conversion tool.
dnl
-AM_CONDITIONAL(GEOMVIEW, true)
+AM_CONDITIONAL(GEOMVIEW, false)
dnl
dnl Debugging
@@ -299,4 +309,4 @@ ALBERTA_DIMENSION_DISABLE(3)
#
# flush everything to disk
#
-AC_OUTPUT
\ No newline at end of file
+AC_OUTPUT
--
GitLab