One more attempt at correcting off-screen rendering. Noting that

Cairo works perfectly for the off-screen rendering and that OpenGL works perfectly for the on-screen rendering, make a compile-time option to use both in their respective areas of perfection.
2017-09-17 12:31:31 -04:00 · 2017-09-17 12:31:31 -04:00 · 18ebf84ad8
parent c3132298ba
commit 18ebf84ad8
8 changed files with 461 additions and 361 deletions
--- a/defs.mak
+++ b/defs.mak
@ -61,14 +61,14 @@ LIB_SPECS	       =  -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
 WISH_EXE	       = /usr/bin/wish
 TCL_LIB_DIR	       = /usr/lib
 MAGIC_VERSION	       = 8.2
-MAGIC_REVISION	       = 24
+MAGIC_REVISION	       = 27

 CC                     = gcc
 CPP                    = gcc -E
 CXX		       = g++

 CPPFLAGS               = -I. -I${MAGICDIR} 
-DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"24\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DNDEBUG -DGCORE=\"/bin/gcore\"
+DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"27\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DCAIRO_OFFSCREEN_RENDER=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DNDEBUG -DGCORE=\"/bin/gcore\"
 DFLAGS		      += -DSHDLIB_EXT=\".so\"
 CFLAGS                 = -g -m64 -fPIC -Wimplicit-int -fPIC 

--- a/graphics/grTCairo1.c
+++ b/graphics/grTCairo1.c
@ -839,6 +839,25 @@ keys_and_buttons:
 	}
 }

+/* Set for off-screen display */
+
+void
+TCairoOffScreen()
+{
+    GrSetCMapPtr = GrTCairoSetCMap;
+    GrFlushPtr = GrTCairoFlush;
+
+    grDrawLinePtr = grtcairoDrawLine;
+    grSetWMandCPtr = grtcairoSetWMandC;
+    grFillRectPtr = grtcairoFillRect;
+    grSetStipplePtr = grtcairoSetStipple;
+    grSetLineStylePtr = grtcairoSetLineStyle;
+    grFillPolygonPtr = grtcairoFillPolygon;
+
+    if (stipplePatterns == NULL)
+	grtcairoSetSPattern(GrStippleTable, grNumStipples);
+}
+


 /*---------------------------------------------------------
--- a/graphics/grTOGL1.c
+++ b/graphics/grTOGL1.c
@ -893,6 +893,25 @@ keys_and_buttons:



+/* Set for on-screen display */
+
+void
+toglOnScreen()
+{
+    // GrLockPtr = GrTOGLLock;
+    // GrUnlockPtr = GrTOGLUnlock;
+    GrSetCMapPtr = GrTOGLSetCMap;
+    GrFlushPtr = GrTOGLFlush;
+
+    grSetSPatternPtr = grtoglSetSPattern;
+    grDrawLinePtr = grtoglDrawLine;
+    grSetWMandCPtr = grtoglSetWMandC;
+    grFillRectPtr = grtoglFillRect;
+    grSetStipplePtr = grtoglSetStipple;
+    grSetLineStylePtr = grtoglSetLineStyle;
+    grFillPolygonPtr = grtoglFillPolygon;
+}
+
 /*---------------------------------------------------------
 * oglSetDisplay:
 *	This routine sets the appropriate parameters so that
@ -1293,6 +1312,11 @@ GrTOGLLower(w)
 * ----------------------------------------------------------------------------
 */

+#ifdef CAIRO_OFFSCREEN_RENDER
+extern void GrTCairoLock();
+extern void TCairoOffScreen();
+#endif
+
 void
 GrTOGLLock(w, flag)
    MagWindow *w;
@ -1300,6 +1324,17 @@ GrTOGLLock(w, flag)
 {
    Window wind;

+#ifdef CAIRO_OFFSCREEN_RENDER
+    /* Use Cairo graphics for off-screen rendering */
+
+    if ((w != GR_LOCK_SCREEN) && (w->w_flags & WIND_OFFSCREEN))
+    {
+	GrTCairoLock(w, flag);
+	TCairoOffScreen();
+	return;
+    }
+#endif
+
    grSimpleLock(w, flag);
    if ( w != GR_LOCK_SCREEN )
    {
@ -1344,6 +1379,17 @@ GrTOGLUnlock(w)
 {
    GrTOGLFlush();

+#ifdef CAIRO_OFFSCREEN_RENDER
+    /* Use Cairo graphics for off-screen rendering */
+
+    if ((w != GR_LOCK_SCREEN) && (w->w_flags & WIND_OFFSCREEN))
+    {
+	GrTCairoUnlock(w);
+	toglOnScreen();
+	return;
+    }
+#endif
+
    if ((w != GR_LOCK_SCREEN) && (w->w_flags & WIND_OFFSCREEN))
    {
 	GC grXcopyGC;
--- a/scripts/config.log
+++ b/scripts/config.log
@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by configure, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

-  $ ./configure 
+  $ ./configure --enable-cairo-offscreen

 ## --------- ##
 ## Platform. ##
@ -39,24 +39,24 @@ PATH: /usr/local/bin
 ## Core tests. ##
 ## ----------- ##

-configure:2484: checking build system type
-configure:2498: result: x86_64-unknown-linux-gnu
-configure:2518: checking host system type
-configure:2531: result: x86_64-unknown-linux-gnu
-configure:2551: checking target system type
-configure:2564: result: x86_64-unknown-linux-gnu
-configure:2656: checking for gcc
-configure:2672: found /bin/gcc
-configure:2683: result: gcc
-configure:2912: checking for C compiler version
-configure:2921: gcc --version >&5
+configure:2486: checking build system type
+configure:2500: result: x86_64-unknown-linux-gnu
+configure:2520: checking host system type
+configure:2533: result: x86_64-unknown-linux-gnu
+configure:2553: checking target system type
+configure:2566: result: x86_64-unknown-linux-gnu
+configure:2658: checking for gcc
+configure:2674: found /bin/gcc
+configure:2685: result: gcc
+configure:2914: checking for C compiler version
+configure:2923: gcc --version >&5
 gcc (GCC) 4.9.2 20150212 (Red Hat 4.9.2-6)
 Copyright (C) 2014 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

-configure:2932: $? = 0
-configure:2921: gcc -v >&5
+configure:2934: $? = 0
+configure:2923: gcc -v >&5
 Using built-in specs.
 COLLECT_GCC=gcc
 COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.9.2/lto-wrapper
@ -64,58 +64,58 @@ Target: x86_64-redhat-linux
 Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --enable-multilib --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-languages=c,c++,objc,obj-c++,fortran,ada,go,lto --enable-plugin --enable-initfini-array --disable-libgcj --with-isl=/builddir/build/BUILD/gcc-4.9.2-20150212/obj-x86_64-redhat-linux/isl-install --with-cloog=/builddir/build/BUILD/gcc-4.9.2-20150212/obj-x86_64-redhat-linux/cloog-install --enable-gnu-indirect-function --with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux
 Thread model: posix
 gcc version 4.9.2 20150212 (Red Hat 4.9.2-6) (GCC) 
-configure:2932: $? = 0
-configure:2921: gcc -V >&5
+configure:2934: $? = 0
+configure:2923: gcc -V >&5
 gcc: error: unrecognized command line option '-V'
 gcc: fatal error: no input files
 compilation terminated.
-configure:2932: $? = 4
-configure:2921: gcc -qversion >&5
+configure:2934: $? = 4
+configure:2923: gcc -qversion >&5
 gcc: error: unrecognized command line option '-qversion'
 gcc: fatal error: no input files
 compilation terminated.
-configure:2932: $? = 4
-configure:2952: checking whether the C compiler works
-configure:2974: gcc -g   conftest.c  >&5
-configure:2978: $? = 0
-configure:3026: result: yes
-configure:3029: checking for C compiler default output file name
-configure:3031: result: a.out
-configure:3037: checking for suffix of executables
-configure:3044: gcc -o conftest -g   conftest.c  >&5
-configure:3048: $? = 0
-configure:3070: result: 
-configure:3092: checking whether we are cross compiling
-configure:3100: gcc -o conftest -g   conftest.c  >&5
-configure:3104: $? = 0
-configure:3111: ./conftest
-configure:3115: $? = 0
-configure:3130: result: no
-configure:3135: checking for suffix of object files
-configure:3157: gcc -c -g  conftest.c >&5
-configure:3161: $? = 0
-configure:3182: result: o
-configure:3186: checking whether we are using the GNU C compiler
-configure:3205: gcc -c -g  conftest.c >&5
-configure:3205: $? = 0
-configure:3214: result: yes
-configure:3223: checking whether gcc accepts -g
-configure:3243: gcc -c -g  conftest.c >&5
-configure:3243: $? = 0
-configure:3284: result: yes
-configure:3301: checking for gcc option to accept ISO C89
-configure:3364: gcc  -c -g  conftest.c >&5
-configure:3364: $? = 0
-configure:3377: result: none needed
-configure:3402: checking how to run the C preprocessor
-configure:3433: gcc -E  conftest.c
-configure:3433: $? = 0
-configure:3447: gcc -E  conftest.c
+configure:2934: $? = 4
+configure:2954: checking whether the C compiler works
+configure:2976: gcc -g   conftest.c  >&5
+configure:2980: $? = 0
+configure:3028: result: yes
+configure:3031: checking for C compiler default output file name
+configure:3033: result: a.out
+configure:3039: checking for suffix of executables
+configure:3046: gcc -o conftest -g   conftest.c  >&5
+configure:3050: $? = 0
+configure:3072: result: 
+configure:3094: checking whether we are cross compiling
+configure:3102: gcc -o conftest -g   conftest.c  >&5
+configure:3106: $? = 0
+configure:3113: ./conftest
+configure:3117: $? = 0
+configure:3132: result: no
+configure:3137: checking for suffix of object files
+configure:3159: gcc -c -g  conftest.c >&5
+configure:3163: $? = 0
+configure:3184: result: o
+configure:3188: checking whether we are using the GNU C compiler
+configure:3207: gcc -c -g  conftest.c >&5
+configure:3207: $? = 0
+configure:3216: result: yes
+configure:3225: checking whether gcc accepts -g
+configure:3245: gcc -c -g  conftest.c >&5
+configure:3245: $? = 0
+configure:3286: result: yes
+configure:3303: checking for gcc option to accept ISO C89
+configure:3366: gcc  -c -g  conftest.c >&5
+configure:3366: $? = 0
+configure:3379: result: none needed
+configure:3404: checking how to run the C preprocessor
+configure:3435: gcc -E  conftest.c
+configure:3435: $? = 0
+configure:3449: gcc -E  conftest.c
 conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory
 #include <ac_nonexistent.h>
                            ^
 compilation terminated.
-configure:3447: $? = 1
+configure:3449: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@ -125,18 +125,18 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | #define MAGIC_VERSION "8.2"
-| #define MAGIC_REVISION "24"
+| #define MAGIC_REVISION "27"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:3472: result: gcc -E
-configure:3492: gcc -E  conftest.c
-configure:3492: $? = 0
-configure:3506: gcc -E  conftest.c
+configure:3474: result: gcc -E
+configure:3494: gcc -E  conftest.c
+configure:3494: $? = 0
+configure:3508: gcc -E  conftest.c
 conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory
 #include <ac_nonexistent.h>
                            ^
 compilation terminated.
-configure:3506: $? = 1
+configure:3508: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@ -146,21 +146,21 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | #define MAGIC_VERSION "8.2"
-| #define MAGIC_REVISION "24"
+| #define MAGIC_REVISION "27"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:3592: checking for g++
-configure:3608: found /bin/g++
-configure:3619: result: g++
-configure:3646: checking for C++ compiler version
-configure:3655: g++ --version >&5
+configure:3594: checking for g++
+configure:3610: found /bin/g++
+configure:3621: result: g++
+configure:3648: checking for C++ compiler version
+configure:3657: g++ --version >&5
 g++ (GCC) 4.9.2 20150212 (Red Hat 4.9.2-6)
 Copyright (C) 2014 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

-configure:3666: $? = 0
-configure:3655: g++ -v >&5
+configure:3668: $? = 0
+configure:3657: g++ -v >&5
 Using built-in specs.
 COLLECT_GCC=g++
 COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.9.2/lto-wrapper
@ -168,123 +168,123 @@ Target: x86_64-redhat-linux
 Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --enable-multilib --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-languages=c,c++,objc,obj-c++,fortran,ada,go,lto --enable-plugin --enable-initfini-array --disable-libgcj --with-isl=/builddir/build/BUILD/gcc-4.9.2-20150212/obj-x86_64-redhat-linux/isl-install --with-cloog=/builddir/build/BUILD/gcc-4.9.2-20150212/obj-x86_64-redhat-linux/cloog-install --enable-gnu-indirect-function --with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux
 Thread model: posix
 gcc version 4.9.2 20150212 (Red Hat 4.9.2-6) (GCC) 
-configure:3666: $? = 0
-configure:3655: g++ -V >&5
+configure:3668: $? = 0
+configure:3657: g++ -V >&5
 g++: error: unrecognized command line option '-V'
 g++: fatal error: no input files
 compilation terminated.
-configure:3666: $? = 4
-configure:3655: g++ -qversion >&5
+configure:3668: $? = 4
+configure:3657: g++ -qversion >&5
 g++: error: unrecognized command line option '-qversion'
 g++: fatal error: no input files
 compilation terminated.
-configure:3666: $? = 4
-configure:3670: checking whether we are using the GNU C++ compiler
-configure:3689: g++ -c   conftest.cpp >&5
-configure:3689: $? = 0
-configure:3698: result: yes
-configure:3707: checking whether g++ accepts -g
-configure:3727: g++ -c -g  conftest.cpp >&5
-configure:3727: $? = 0
-configure:3768: result: yes
-configure:3792: checking for library containing strerror
-configure:3823: gcc -o conftest -g   conftest.c  >&5
-configure:3823: $? = 0
-configure:3840: result: none required
-configure:3862: checking for a BSD-compatible install
-configure:3930: result: /bin/install -c
-configure:3984: checking for ranlib
-configure:4000: found /bin/ranlib
-configure:4011: result: ranlib
-configure:4038: checking for gm4
-configure:4071: result: no
-configure:4038: checking for gnum4
-configure:4071: result: no
-configure:4038: checking for m4
-configure:4056: found /bin/m4
-configure:4068: result: /bin/m4
-configure:4086: checking for python3
-configure:4104: found /bin/python3
-configure:4117: result: /bin/python3
-configure:4162: checking for ld used by GCC
-configure:4225: result: /bin/ld
-configure:4232: checking if the linker (/bin/ld) is GNU ld
+configure:3668: $? = 4
+configure:3672: checking whether we are using the GNU C++ compiler
+configure:3691: g++ -c   conftest.cpp >&5
+configure:3691: $? = 0
+configure:3700: result: yes
+configure:3709: checking whether g++ accepts -g
+configure:3729: g++ -c -g  conftest.cpp >&5
+configure:3729: $? = 0
+configure:3770: result: yes
+configure:3794: checking for library containing strerror
+configure:3825: gcc -o conftest -g   conftest.c  >&5
+configure:3825: $? = 0
+configure:3842: result: none required
+configure:3864: checking for a BSD-compatible install
+configure:3932: result: /bin/install -c
+configure:3986: checking for ranlib
+configure:4002: found /bin/ranlib
+configure:4013: result: ranlib
+configure:4040: checking for gm4
+configure:4073: result: no
+configure:4040: checking for gnum4
+configure:4073: result: no
+configure:4040: checking for m4
+configure:4058: found /bin/m4
+configure:4070: result: /bin/m4
+configure:4088: checking for python3
+configure:4106: found /bin/python3
+configure:4119: result: /bin/python3
+configure:4164: checking for ld used by GCC
+configure:4227: result: /bin/ld
+configure:4234: checking if the linker (/bin/ld) is GNU ld
 GNU ld version 2.24
-configure:4244: result: yes
-configure:4251: checking for grep that handles long lines and -e
-configure:4309: result: /bin/grep
-configure:4314: checking for egrep
-configure:4376: result: /bin/grep -E
-configure:4381: checking for ANSI C header files
-configure:4401: gcc -c -g  conftest.c >&5
-configure:4401: $? = 0
-configure:4474: gcc -o conftest -g   conftest.c  >&5
-configure:4474: $? = 0
-configure:4474: ./conftest
-configure:4474: $? = 0
-configure:4485: result: yes
-configure:4498: checking for sys/types.h
-configure:4498: gcc -c -g  conftest.c >&5
-configure:4498: $? = 0
-configure:4498: result: yes
-configure:4498: checking for sys/stat.h
-configure:4498: gcc -c -g  conftest.c >&5
-configure:4498: $? = 0
-configure:4498: result: yes
-configure:4498: checking for stdlib.h
-configure:4498: gcc -c -g  conftest.c >&5
-configure:4498: $? = 0
-configure:4498: result: yes
-configure:4498: checking for string.h
-configure:4498: gcc -c -g  conftest.c >&5
-configure:4498: $? = 0
-configure:4498: result: yes
-configure:4498: checking for memory.h
-configure:4498: gcc -c -g  conftest.c >&5
-configure:4498: $? = 0
-configure:4498: result: yes
-configure:4498: checking for strings.h
-configure:4498: gcc -c -g  conftest.c >&5
-configure:4498: $? = 0
-configure:4498: result: yes
-configure:4498: checking for inttypes.h
-configure:4498: gcc -c -g  conftest.c >&5
-configure:4498: $? = 0
-configure:4498: result: yes
-configure:4498: checking for stdint.h
-configure:4498: gcc -c -g  conftest.c >&5
-configure:4498: $? = 0
-configure:4498: result: yes
-configure:4498: checking for unistd.h
-configure:4498: gcc -c -g  conftest.c >&5
-configure:4498: $? = 0
-configure:4498: result: yes
-configure:4514: checking size of void *
-configure:4519: gcc -o conftest -g   conftest.c  >&5
-configure:4519: $? = 0
-configure:4519: ./conftest
-configure:4519: $? = 0
-configure:4533: result: 8
-configure:4547: checking size of unsigned int
-configure:4552: gcc -o conftest -g   conftest.c  >&5
-configure:4552: $? = 0
-configure:4552: ./conftest
-configure:4552: $? = 0
-configure:4566: result: 4
-configure:4580: checking size of unsigned long
-configure:4585: gcc -o conftest -g   conftest.c  >&5
-configure:4585: $? = 0
-configure:4585: ./conftest
-configure:4585: $? = 0
-configure:4599: result: 8
-configure:4613: checking size of unsigned long long
-configure:4618: gcc -o conftest -g   conftest.c  >&5
-configure:4618: $? = 0
-configure:4618: ./conftest
-configure:4618: $? = 0
-configure:4632: result: 8
-configure:4643: checking whether byte ordering is bigendian
-configure:4658: gcc -c -g  conftest.c >&5
+configure:4246: result: yes
+configure:4253: checking for grep that handles long lines and -e
+configure:4311: result: /bin/grep
+configure:4316: checking for egrep
+configure:4378: result: /bin/grep -E
+configure:4383: checking for ANSI C header files
+configure:4403: gcc -c -g  conftest.c >&5
+configure:4403: $? = 0
+configure:4476: gcc -o conftest -g   conftest.c  >&5
+configure:4476: $? = 0
+configure:4476: ./conftest
+configure:4476: $? = 0
+configure:4487: result: yes
+configure:4500: checking for sys/types.h
+configure:4500: gcc -c -g  conftest.c >&5
+configure:4500: $? = 0
+configure:4500: result: yes
+configure:4500: checking for sys/stat.h
+configure:4500: gcc -c -g  conftest.c >&5
+configure:4500: $? = 0
+configure:4500: result: yes
+configure:4500: checking for stdlib.h
+configure:4500: gcc -c -g  conftest.c >&5
+configure:4500: $? = 0
+configure:4500: result: yes
+configure:4500: checking for string.h
+configure:4500: gcc -c -g  conftest.c >&5
+configure:4500: $? = 0
+configure:4500: result: yes
+configure:4500: checking for memory.h
+configure:4500: gcc -c -g  conftest.c >&5
+configure:4500: $? = 0
+configure:4500: result: yes
+configure:4500: checking for strings.h
+configure:4500: gcc -c -g  conftest.c >&5
+configure:4500: $? = 0
+configure:4500: result: yes
+configure:4500: checking for inttypes.h
+configure:4500: gcc -c -g  conftest.c >&5
+configure:4500: $? = 0
+configure:4500: result: yes
+configure:4500: checking for stdint.h
+configure:4500: gcc -c -g  conftest.c >&5
+configure:4500: $? = 0
+configure:4500: result: yes
+configure:4500: checking for unistd.h
+configure:4500: gcc -c -g  conftest.c >&5
+configure:4500: $? = 0
+configure:4500: result: yes
+configure:4516: checking size of void *
+configure:4521: gcc -o conftest -g   conftest.c  >&5
+configure:4521: $? = 0
+configure:4521: ./conftest
+configure:4521: $? = 0
+configure:4535: result: 8
+configure:4549: checking size of unsigned int
+configure:4554: gcc -o conftest -g   conftest.c  >&5
+configure:4554: $? = 0
+configure:4554: ./conftest
+configure:4554: $? = 0
+configure:4568: result: 4
+configure:4582: checking size of unsigned long
+configure:4587: gcc -o conftest -g   conftest.c  >&5
+configure:4587: $? = 0
+configure:4587: ./conftest
+configure:4587: $? = 0
+configure:4601: result: 8
+configure:4615: checking size of unsigned long long
+configure:4620: gcc -o conftest -g   conftest.c  >&5
+configure:4620: $? = 0
+configure:4620: ./conftest
+configure:4620: $? = 0
+configure:4634: result: 8
+configure:4645: checking whether byte ordering is bigendian
+configure:4660: gcc -c -g  conftest.c >&5
 conftest.c:26:9: error: unknown type name 'not'
         not a universal capable compiler
         ^
@ -292,7 +292,7 @@ conftest.c:26:15: error: expected '=', ',', ';', 'asm' or '__attribute__' before
         not a universal capable compiler
               ^
 conftest.c:26:15: error: unknown type name 'universal'
-configure:4658: $? = 1
+configure:4660: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@ -302,7 +302,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | #define MAGIC_VERSION "8.2"
-| #define MAGIC_REVISION "24"
+| #define MAGIC_REVISION "27"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@ -323,9 +323,9 @@ configure: failed program was:
 | 	     #endif
 | 	     typedef int dummy;
 | 
-configure:4703: gcc -c -g  conftest.c >&5
-configure:4703: $? = 0
-configure:4721: gcc -c -g  conftest.c >&5
+configure:4705: gcc -c -g  conftest.c >&5
+configure:4705: $? = 0
+configure:4723: gcc -c -g  conftest.c >&5
 conftest.c: In function 'main':
 conftest.c:32:4: error: unknown type name 'not'
    not big endian
@ -333,7 +333,7 @@ conftest.c:32:4: error: unknown type name 'not'
 conftest.c:32:12: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'endian'
    not big endian
            ^
-configure:4721: $? = 1
+configure:4723: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@ -343,7 +343,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | #define MAGIC_VERSION "8.2"
-| #define MAGIC_REVISION "24"
+| #define MAGIC_REVISION "27"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@ -372,58 +372,58 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:4849: result: no
-configure:4868: checking for ANSI C header files
-configure:4972: result: yes
-configure:4984: checking for setenv
-configure:4984: gcc -o conftest -g   conftest.c  >&5
-configure:4984: $? = 0
-configure:4984: result: yes
-configure:4984: checking for putenv
-configure:4984: gcc -o conftest -g   conftest.c  >&5
-configure:4984: $? = 0
-configure:4984: result: yes
-configure:4994: checking for vfork
-configure:4994: gcc -o conftest -g   conftest.c  >&5
-configure:4994: $? = 0
-configure:4994: result: yes
-configure:5002: checking sys/mman.h usability
-configure:5002: gcc -c -g  conftest.c >&5
-configure:5002: $? = 0
-configure:5002: result: yes
-configure:5002: checking sys/mman.h presence
-configure:5002: gcc -E  conftest.c
-configure:5002: $? = 0
-configure:5002: result: yes
-configure:5002: checking for sys/mman.h
-configure:5002: result: yes
-configure:5015: checking dirent.h usability
-configure:5015: gcc -c -g  conftest.c >&5
-configure:5015: $? = 0
-configure:5015: result: yes
-configure:5015: checking dirent.h presence
-configure:5015: gcc -E  conftest.c
-configure:5015: $? = 0
-configure:5015: result: yes
-configure:5015: checking for dirent.h
-configure:5015: result: yes
-configure:5028: checking limits.h usability
-configure:5028: gcc -c -g  conftest.c >&5
-configure:5028: $? = 0
-configure:5028: result: yes
-configure:5028: checking limits.h presence
-configure:5028: gcc -E  conftest.c
-configure:5028: $? = 0
-configure:5028: result: yes
-configure:5028: checking for limits.h
-configure:5028: result: yes
-configure:5041: checking param.h usability
-configure:5041: gcc -c -g  conftest.c >&5
+configure:4851: result: no
+configure:4870: checking for ANSI C header files
+configure:4974: result: yes
+configure:4986: checking for setenv
+configure:4986: gcc -o conftest -g   conftest.c  >&5
+configure:4986: $? = 0
+configure:4986: result: yes
+configure:4986: checking for putenv
+configure:4986: gcc -o conftest -g   conftest.c  >&5
+configure:4986: $? = 0
+configure:4986: result: yes
+configure:4996: checking for vfork
+configure:4996: gcc -o conftest -g   conftest.c  >&5
+configure:4996: $? = 0
+configure:4996: result: yes
+configure:5004: checking sys/mman.h usability
+configure:5004: gcc -c -g  conftest.c >&5
+configure:5004: $? = 0
+configure:5004: result: yes
+configure:5004: checking sys/mman.h presence
+configure:5004: gcc -E  conftest.c
+configure:5004: $? = 0
+configure:5004: result: yes
+configure:5004: checking for sys/mman.h
+configure:5004: result: yes
+configure:5017: checking dirent.h usability
+configure:5017: gcc -c -g  conftest.c >&5
+configure:5017: $? = 0
+configure:5017: result: yes
+configure:5017: checking dirent.h presence
+configure:5017: gcc -E  conftest.c
+configure:5017: $? = 0
+configure:5017: result: yes
+configure:5017: checking for dirent.h
+configure:5017: result: yes
+configure:5030: checking limits.h usability
+configure:5030: gcc -c -g  conftest.c >&5
+configure:5030: $? = 0
+configure:5030: result: yes
+configure:5030: checking limits.h presence
+configure:5030: gcc -E  conftest.c
+configure:5030: $? = 0
+configure:5030: result: yes
+configure:5030: checking for limits.h
+configure:5030: result: yes
+configure:5043: checking param.h usability
+configure:5043: gcc -c -g  conftest.c >&5
 conftest.c:64:19: fatal error: param.h: No such file or directory
 #include <param.h>
                   ^
 compilation terminated.
-configure:5041: $? = 1
+configure:5043: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@ -433,7 +433,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | #define MAGIC_VERSION "8.2"
-| #define MAGIC_REVISION "24"
+| #define MAGIC_REVISION "27"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@ -489,14 +489,14 @@ configure: failed program was:
 | # include <unistd.h>
 | #endif
 | #include <param.h>
-configure:5041: result: no
-configure:5041: checking param.h presence
-configure:5041: gcc -E  conftest.c
+configure:5043: result: no
+configure:5043: checking param.h presence
+configure:5043: gcc -E  conftest.c
 conftest.c:31:19: fatal error: param.h: No such file or directory
 #include <param.h>
                   ^
 compilation terminated.
-configure:5041: $? = 1
+configure:5043: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@ -506,7 +506,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
 | #define MAGIC_VERSION "8.2"
-| #define MAGIC_REVISION "24"
+| #define MAGIC_REVISION "27"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@ -529,112 +529,112 @@ configure: failed program was:
 | #define HAVE_LIMITS_H 1
 | /* end confdefs.h.  */
 | #include <param.h>
-configure:5041: result: no
-configure:5041: checking for param.h
-configure:5041: result: no
-configure:5054: checking paths.h usability
-configure:5054: gcc -c -g  conftest.c >&5
-configure:5054: $? = 0
-configure:5054: result: yes
-configure:5054: checking paths.h presence
-configure:5054: gcc -E  conftest.c
-configure:5054: $? = 0
-configure:5054: result: yes
-configure:5054: checking for paths.h
-configure:5054: result: yes
-configure:5065: checking for va_copy
-configure:5083: gcc -o conftest -g   conftest.c  >&5
-configure:5083: $? = 0
-configure:5092: result: yes
-configure:5100: checking for __va_copy
-configure:5118: gcc -o conftest -g   conftest.c  >&5
-configure:5118: $? = 0
-configure:5127: result: yes
-configure:5342: checking for gcore
-configure:5360: found /bin/gcore
-configure:5373: result: /bin/gcore
-configure:5385: checking for csh
-configure:5403: found /bin/csh
-configure:5416: result: /bin/csh
-configure:5430: checking for X
-configure:5569: gcc -o conftest -g   conftest.c -lX11  >&5
-configure:5569: $? = 0
-configure:5619: result: libraries , headers 
-configure:5718: gcc -o conftest -g   conftest.c   -lX11 >&5
-configure:5718: $? = 0
-configure:5816: checking for gethostbyname
-configure:5816: gcc -o conftest -g   conftest.c  >&5
-configure:5816: $? = 0
-configure:5816: result: yes
-configure:5913: checking for connect
-configure:5913: gcc -o conftest -g   conftest.c  >&5
-configure:5913: $? = 0
-configure:5913: result: yes
-configure:5962: checking for remove
-configure:5962: gcc -o conftest -g   conftest.c  >&5
-configure:5962: $? = 0
-configure:5962: result: yes
-configure:6011: checking for shmat
-configure:6011: gcc -o conftest -g   conftest.c  >&5
-configure:6011: $? = 0
-configure:6011: result: yes
-configure:6069: checking for IceConnectionNumber in -lICE
-configure:6094: gcc -o conftest -g   conftest.c -lICE   >&5
-configure:6094: $? = 0
-configure:6103: result: yes
-configure:6139: checking for XOpenDevice in -lXi
-configure:6164: gcc -o conftest -g   conftest.c -lXi   >&5
-configure:6164: $? = 0
-configure:6173: result: yes
-configure:6179: checking for XmuInternAtom in -lXmu
-configure:6204: gcc -o conftest -g   conftest.c -lXmu   >&5
-configure:6204: $? = 0
-configure:6213: result: yes
-configure:6219: checking for XextFindDisplay in -lXext
-configure:6244: gcc -o conftest -g   conftest.c -lXext   >&5
-configure:6244: $? = 0
-configure:6253: result: yes
-configure:6333: checking for tclConfig.sh
-configure:6407: result: /usr/lib64/tclConfig.sh
-configure:6423: checking for tkConfig.sh
-configure:6496: result: /usr/lib64/tkConfig.sh
-configure:6630: checking for wish executable
-configure:6658: result: /usr/bin/wish
-configure:6664: checking for tclsh executable
-configure:6690: result: /usr/bin/tclsh
-configure:7395: checking GL/gl.h usability
-configure:7395: gcc -c -g   conftest.c >&5
-configure:7395: $? = 0
-configure:7395: result: yes
-configure:7395: checking GL/gl.h presence
-configure:7395: gcc -E   conftest.c
-configure:7395: $? = 0
-configure:7395: result: yes
-configure:7395: checking for GL/gl.h
-configure:7395: result: yes
-configure:7413: checking for glXCreateContext in -lGL
-configure:7438: gcc -o conftest -g     -lm conftest.c -lGL   >&5
-configure:7438: $? = 0
-configure:7447: result: yes
-configure:7463: checking for gluNewTess in -lGLU
-configure:7488: gcc -o conftest -g     -lm conftest.c -lGLU  -lGL  >&5
-configure:7488: $? = 0
-configure:7497: result: yes
-configure:7548: checking cairo/cairo.h usability
-configure:7548: gcc -c -g   conftest.c >&5
-configure:7548: $? = 0
-configure:7548: result: yes
-configure:7548: checking cairo/cairo.h presence
-configure:7548: gcc -E   conftest.c
-configure:7548: $? = 0
-configure:7548: result: yes
-configure:7548: checking for cairo/cairo.h
-configure:7548: result: yes
-configure:7566: checking for cairo_user_to_device in -lcairo
-configure:7591: gcc -o conftest -g     -lm conftest.c -lcairo  -lGLU -lGL  >&5
-configure:7591: $? = 0
-configure:7600: result: yes
-configure:8381: creating ./config.status
+configure:5043: result: no
+configure:5043: checking for param.h
+configure:5043: result: no
+configure:5056: checking paths.h usability
+configure:5056: gcc -c -g  conftest.c >&5
+configure:5056: $? = 0
+configure:5056: result: yes
+configure:5056: checking paths.h presence
+configure:5056: gcc -E  conftest.c
+configure:5056: $? = 0
+configure:5056: result: yes
+configure:5056: checking for paths.h
+configure:5056: result: yes
+configure:5067: checking for va_copy
+configure:5085: gcc -o conftest -g   conftest.c  >&5
+configure:5085: $? = 0
+configure:5094: result: yes
+configure:5102: checking for __va_copy
+configure:5120: gcc -o conftest -g   conftest.c  >&5
+configure:5120: $? = 0
+configure:5129: result: yes
+configure:5344: checking for gcore
+configure:5362: found /bin/gcore
+configure:5375: result: /bin/gcore
+configure:5387: checking for csh
+configure:5405: found /bin/csh
+configure:5418: result: /bin/csh
+configure:5432: checking for X
+configure:5571: gcc -o conftest -g   conftest.c -lX11  >&5
+configure:5571: $? = 0
+configure:5621: result: libraries , headers 
+configure:5720: gcc -o conftest -g   conftest.c   -lX11 >&5
+configure:5720: $? = 0
+configure:5818: checking for gethostbyname
+configure:5818: gcc -o conftest -g   conftest.c  >&5
+configure:5818: $? = 0
+configure:5818: result: yes
+configure:5915: checking for connect
+configure:5915: gcc -o conftest -g   conftest.c  >&5
+configure:5915: $? = 0
+configure:5915: result: yes
+configure:5964: checking for remove
+configure:5964: gcc -o conftest -g   conftest.c  >&5
+configure:5964: $? = 0
+configure:5964: result: yes
+configure:6013: checking for shmat
+configure:6013: gcc -o conftest -g   conftest.c  >&5
+configure:6013: $? = 0
+configure:6013: result: yes
+configure:6071: checking for IceConnectionNumber in -lICE
+configure:6096: gcc -o conftest -g   conftest.c -lICE   >&5
+configure:6096: $? = 0
+configure:6105: result: yes
+configure:6141: checking for XOpenDevice in -lXi
+configure:6166: gcc -o conftest -g   conftest.c -lXi   >&5
+configure:6166: $? = 0
+configure:6175: result: yes
+configure:6181: checking for XmuInternAtom in -lXmu
+configure:6206: gcc -o conftest -g   conftest.c -lXmu   >&5
+configure:6206: $? = 0
+configure:6215: result: yes
+configure:6221: checking for XextFindDisplay in -lXext
+configure:6246: gcc -o conftest -g   conftest.c -lXext   >&5
+configure:6246: $? = 0
+configure:6255: result: yes
+configure:6335: checking for tclConfig.sh
+configure:6409: result: /usr/lib64/tclConfig.sh
+configure:6425: checking for tkConfig.sh
+configure:6498: result: /usr/lib64/tkConfig.sh
+configure:6632: checking for wish executable
+configure:6660: result: /usr/bin/wish
+configure:6666: checking for tclsh executable
+configure:6692: result: /usr/bin/tclsh
+configure:7397: checking GL/gl.h usability
+configure:7397: gcc -c -g   conftest.c >&5
+configure:7397: $? = 0
+configure:7397: result: yes
+configure:7397: checking GL/gl.h presence
+configure:7397: gcc -E   conftest.c
+configure:7397: $? = 0
+configure:7397: result: yes
+configure:7397: checking for GL/gl.h
+configure:7397: result: yes
+configure:7415: checking for glXCreateContext in -lGL
+configure:7440: gcc -o conftest -g     -lm conftest.c -lGL   >&5
+configure:7440: $? = 0
+configure:7449: result: yes
+configure:7465: checking for gluNewTess in -lGLU
+configure:7490: gcc -o conftest -g     -lm conftest.c -lGLU  -lGL  >&5
+configure:7490: $? = 0
+configure:7499: result: yes
+configure:7550: checking cairo/cairo.h usability
+configure:7550: gcc -c -g   conftest.c >&5
+configure:7550: $? = 0
+configure:7550: result: yes
+configure:7550: checking cairo/cairo.h presence
+configure:7550: gcc -E   conftest.c
+configure:7550: $? = 0
+configure:7550: result: yes
+configure:7550: checking for cairo/cairo.h
+configure:7550: result: yes
+configure:7568: checking for cairo_user_to_device in -lcairo
+configure:7593: gcc -o conftest -g     -lm conftest.c -lcairo  -lGLU -lGL  >&5
+configure:7593: $? = 0
+configure:7602: result: yes
+configure:8399: creating ./config.status

 ## ---------------------- ##
 ## Running config.status. ##
@ -651,8 +651,8 @@ generated by GNU Autoconf 2.69.  Invocation command line was

 on stravinsky

-config.status:799: creating defs.mak
-config.status:902: WARNING:  'defs.mak.in' seems to ignore the --datarootdir setting
+config.status:800: creating defs.mak
+config.status:903: WARNING:  'defs.mak.in' seems to ignore the --datarootdir setting

 ## ---------------- ##
 ## Cache variables. ##
@ -759,7 +759,7 @@ CPPFLAGS=''
 CSH='/bin/csh'
 CXX='g++'
 CXXFLAGS='-g -O2'
-DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"24\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1'
+DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"27\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DCAIRO_OFFSCREEN_RENDER=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1'
 DEPEND_FLAG='-MM'
 ECHO_C=''
 ECHO_N='printf'
@ -783,7 +783,7 @@ LIBS='-lcairo -lGLU -lGL '
 LIB_SPECS=' -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6'
 LTLIBOBJS=''
 M4='/bin/m4'
-MAGIC_REVISION='24'
+MAGIC_REVISION='27'
 MAGIC_VERSION='8.2'
 MCPP='${MAGICDIR}/scripts/preproc.py'
 OA=''
@ -884,7 +884,7 @@ unused=' readline lisp'
 #define PACKAGE_BUGREPORT ""
 #define PACKAGE_URL ""
 #define MAGIC_VERSION "8.2"
-#define MAGIC_REVISION "24"
+#define MAGIC_REVISION "27"
 #define STDC_HEADERS 1
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_STAT_H 1
@ -920,6 +920,7 @@ unused=' readline lisp'
 #define HAVE_LIBGLU 1
 #define VECTOR_FONTS 1
 #define HAVE_LIBCAIRO 1
+#define CAIRO_OFFSCREEN_RENDER 1
 #define MAGIC_WRAPPER 1
 #define THREE_D 1
 #define linux 1
--- a/scripts/config.status
+++ b/scripts/config.status
@ -417,7 +417,7 @@ $config_files

 Report bugs to the package provider."

-ac_cs_config="'CFLAGS=-g'"
+ac_cs_config="'--enable-cairo-offscreen' 'CFLAGS=-g'"
 ac_cs_version="\
 config.status
 configured by ./configure, generated by GNU Autoconf 2.69,
@ -496,7 +496,7 @@ if $ac_cs_silent; then
 fi

 if $ac_cs_recheck; then
-  set X /bin/sh './configure'  'CFLAGS=-g' $ac_configure_extra_args --no-create --no-recursion
+  set X /bin/sh './configure'  '--enable-cairo-offscreen' 'CFLAGS=-g' $ac_configure_extra_args --no-create --no-recursion
  shift
  $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
  CONFIG_SHELL='/bin/sh'
@ -588,7 +588,7 @@ S["INSTALL_TARGET"]="install-tcl"
 S["ALL_TARGET"]="tcl"
 S["OA_LIBS"]=""
 S["OA"]=""
-S["MAGIC_REVISION"]="24"
+S["MAGIC_REVISION"]="27"
 S["MAGIC_VERSION"]="8.2"
 S["SCPP"]="gcc -E -x c"
 S["MCPP"]="${MAGICDIR}/scripts/preproc.py"
@ -674,11 +674,12 @@ S["ECHO_T"]=""
 S["ECHO_N"]="-n"
 S["ECHO_C"]=""
 S["DEFS"]="-DPACKAGE_NAME=\\\"\\\" -DPACKAGE_TARNAME=\\\"\\\" -DPACKAGE_VERSION=\\\"\\\" -DPACKAGE_STRING=\\\"\\\" -DPACKAGE_BUGREPORT=\\\"\\\" -DPACKAGE_URL=\\\"\\\" -DMAGIC_VERSION="\
-"\\\"8.2\\\" -DMAGIC_REVISION=\\\"24\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHA"\
+"\\\"8.2\\\" -DMAGIC_REVISION=\\\"27\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHA"\
 "VE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_U"\
 "NSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE"\
 "_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -"\
-"DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1"
+"DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DCAIRO_OFFSCREEN_RENDER=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux"\
+"=1 -DSYSV=1 -DISC=1"
 S["mandir"]="${datarootdir}/man"
 S["localedir"]="${datarootdir}/locale"
 S["libdir"]="${exec_prefix}/lib"
--- a/scripts/configure
+++ b/scripts/configure
@ -770,6 +770,7 @@ enable_rsim
 enable_new_macros
 with_opengl
 with_cairo
+enable_cairo_offscreen
 '
      ac_precious_vars='build_alias
 host_alias
@ -1415,6 +1416,7 @@ Optional Features:
  --disable-route        disable routing package
  --disable-rsim        disable IRSIM tool
  --disable-new-macros        disable new macro set
+  --enable-cairo-offscreen        Use Cairo for off-screen rendering

 Optional Packages:
  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@ -7624,6 +7626,22 @@ if test $usingCairo ; then
 fi


+# Check whether --enable-cairo-offscreen was given.
+if test "${enable_cairo_offscreen+set}" = set; then :
+  enableval=$enable_cairo_offscreen; enable_cairo_offscreen=yes
+fi
+
+
+if test "x$enable_cairo_offscreen" = "xyes" ; then
+  if test $usingCairo ; then
+     $as_echo "#define CAIRO_OFFSCREEN_RENDER 1" >>confdefs.h
+
+  else
+     echo "Cairo not being compiled in, can't use for offscreen rendering."
+  fi
+fi
+
+

 if test $usingTcl ; then
  cadinstall="$cadinstall graphics tcltk"
--- a/scripts/configure.in
+++ b/scripts/configure.in
@ -1214,6 +1214,21 @@ if test $usingCairo ; then
    fi
 fi

+dnl 
+
+AC_ARG_ENABLE(cairo-offscreen,
+[  --enable-cairo-offscreen        Use Cairo for off-screen rendering],
+[enable_cairo_offscreen=yes], 
+[])
+
+if test "x$enable_cairo_offscreen" = "xyes" ; then
+  if test $usingCairo ; then
+     AC_DEFINE(CAIRO_OFFSCREEN_RENDER)
+  else
+     echo "Cairo not being compiled in, can't use for offscreen rendering."
+  fi
+fi
+

 dnl ----------------------------------------------------------------
 dnl Once we're sure what, if any, interpreter is being compiled,
--- a/scripts/defs.mak
+++ b/scripts/defs.mak
@ -61,14 +61,14 @@ LIB_SPECS	       =  -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
 WISH_EXE	       = /usr/bin/wish
 TCL_LIB_DIR	       = /usr/lib
 MAGIC_VERSION	       = 8.2
-MAGIC_REVISION	       = 24
+MAGIC_REVISION	       = 27

 CC                     = gcc
 CPP                    = gcc -E
 CXX		       = g++

 CPPFLAGS               = -I. -I${MAGICDIR} 
-DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"24\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DNDEBUG -DGCORE=\"/bin/gcore\"
+DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"27\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_SYS_MMAN_H=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_PATHS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DFILE_LOCKS=1 -DCALMA_MODULE=1 -DCIF_MODULE=1 -DX11_BACKING_STORE=1 -DPLOT_MODULE=1 -DLEF_MODULE=1 -DROUTE_MODULE=1 -DUSE_NEW_MACROS=1 -DHAVE_LIBGL=1 -DHAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DCAIRO_OFFSCREEN_RENDER=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DNDEBUG -DGCORE=\"/bin/gcore\"
 DFLAGS		      += -DSHDLIB_EXT=\".so\"
 CFLAGS                 = -g -m64 -fPIC -Wimplicit-int -fPIC