luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'work' into tomerge

This commit is contained in:
Tim Edwards 2017-08-24 16:47:28 -04:00
parent 2261799137 0704882ac2
commit 9de99f8e1c
5 changed files with 47 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -2,6 +2,9 @@ defs.mak
Depend Depend
config.cache config.cache
config.log config.log
scripts/config.log
scripts/config.status
scripts/defs.mak
*.o *.o
*.so *.so
*~ *~

10
defs.mak
View File

@ -59,14 +59,14 @@ LIB_SPECS = -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
WISH_EXE = /usr/bin/wish WISH_EXE = /usr/bin/wish
TCL_LIB_DIR = /usr/lib TCL_LIB_DIR = /usr/lib
MAGIC_VERSION = 8.2 MAGIC_VERSION = 8.2
MAGIC_REVISION = 0 MAGIC_REVISION = 13
CC = gcc CC = gcc
CPP = /scripts/preproc.py CPP = /scripts/preproc.py
CXX = g++ CXX = g++
CPPFLAGS = -I. -I${MAGICDIR} 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=\"0\" -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 -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=\"13\" -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 -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 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DNDEBUG -DGCORE=\"/bin/gcore\"
DFLAGS += -DSHDLIB_EXT=\".so\" DFLAGS += -DSHDLIB_EXT=\".so\"
CFLAGS = -g -m64 -fPIC -Wimplicit-int -fPIC CFLAGS = -g -m64 -fPIC -Wimplicit-int -fPIC
@ -78,9 +78,9 @@ DEPEND_FLAG = -MM
EXEEXT = EXEEXT =
GR_CFLAGS = GR_CFLAGS =
GR_DFLAGS = -DX11 -DXLIB -DOGL -DCAIRO -DNDEBUG GR_DFLAGS = -DX11 -DXLIB -DCAIRO -DNDEBUG
GR_LIBS = -lX11 -lGL -lGLU -lXi -lXmu -lXext -lm -lcairo -lfontconfig -lfreetype -lstdc++ ${X11_LDFLAGS} GR_LIBS = -lX11 -lcairo -lfontconfig -lfreetype ${X11_LDFLAGS}
GR_SRCS = ${TK_SRCS} ${TOGL_SRCS} ${TOGL_SRCS} ${TKCOMMON_SRCS} GR_SRCS = ${TK_SRCS} ${TOGL_SRCS} ${TKCOMMON_SRCS}
GR_HELPER_SRCS = GR_HELPER_SRCS =
GR_HELPER_PROG = GR_HELPER_PROG =

114
scripts/config.log
View File

@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
It was created by configure, which was It was created by configure, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ ./configure $ ./configure --without-opengl
## --------- ## ## --------- ##
## Platform. ## ## Platform. ##
@ -12,9 +12,9 @@ generated by GNU Autoconf 2.69. Invocation command line was
hostname = stravinsky hostname = stravinsky
uname -m = x86_64 uname -m = x86_64
uname -r = 3.18.3-201.fc21.x86_64 uname -r = 4.1.13-100.fc21.x86_64
uname -s = Linux uname -s = Linux
uname -v = #1 SMP Mon Jan 19 15:59:31 UTC 2015 uname -v = #1 SMP Tue Nov 10 13:13:20 UTC 2015
/usr/bin/uname -p = x86_64 /usr/bin/uname -p = x86_64
/bin/uname -X = unknown /bin/uname -X = unknown
@ -125,7 +125,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| /* end confdefs.h. */ | /* end confdefs.h. */
| #include <ac_nonexistent.h> | #include <ac_nonexistent.h>
configure:3469: result: gcc -E configure:3469: result: gcc -E
@ -146,7 +146,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| /* end confdefs.h. */ | /* end confdefs.h. */
| #include <ac_nonexistent.h> | #include <ac_nonexistent.h>
configure:3589: checking for g++ configure:3589: checking for g++
@ -292,7 +292,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -332,7 +332,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -392,7 +392,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -432,7 +432,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -473,7 +473,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -514,7 +514,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -582,7 +582,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -623,7 +623,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -709,68 +709,6 @@ configure:6571: checking for wish executable
configure:6599: result: /usr/bin/wish configure:6599: result: /usr/bin/wish
configure:6605: checking for tclsh executable configure:6605: checking for tclsh executable
configure:6631: result: /usr/bin/tclsh configure:6631: result: /usr/bin/tclsh
configure:7336: checking GL/gl.h usability
configure:7336: gcc -c -g conftest.c >&5
configure:7336: $? = 0
configure:7336: result: yes
configure:7336: checking GL/gl.h presence
configure:7336: /scripts/preproc.py conftest.c
./configure: line 1576: /scripts/preproc.py: No such file or directory
configure:7336: $? = 127
configure: failed program was:
| /* confdefs.h */
| #define PACKAGE_NAME ""
| #define PACKAGE_TARNAME ""
| #define PACKAGE_VERSION ""
| #define PACKAGE_STRING ""
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0"
| #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1
| #define HAVE_STRING_H 1
| #define HAVE_MEMORY_H 1
| #define HAVE_STRINGS_H 1
| #define HAVE_INTTYPES_H 1
| #define HAVE_STDINT_H 1
| #define HAVE_UNISTD_H 1
| #define SIZEOF_VOID_P 8
| #define SIZEOF_UNSIGNED_INT 4
| #define SIZEOF_UNSIGNED_LONG 8
| #define SIZEOF_UNSIGNED_LONG_LONG 8
| #define HAVE_SETENV 1
| #define HAVE_PUTENV 1
| #define HAVE_SYS_MMAN_H 1
| #define HAVE_DIRENT_H 1
| #define HAVE_LIMITS_H 1
| #define HAVE_PATHS_H 1
| #define HAVE_VA_COPY 1
| #define HAVE___VA_COPY 1
| #define FILE_LOCKS 1
| #define CALMA_MODULE 1
| #define CIF_MODULE 1
| #define X11_BACKING_STORE 1
| #define PLOT_MODULE 1
| #define LEF_MODULE 1
| #define ROUTE_MODULE 1
| #define USE_NEW_MACROS 1
| /* end confdefs.h. */
| #include <GL/gl.h>
configure:7336: result: no
configure:7336: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!
configure:7336: WARNING: GL/gl.h: proceeding with the compiler's result
configure:7336: checking for GL/gl.h
configure:7336: result: yes
configure:7354: checking for glXCreateContext in -lGL
configure:7379: gcc -o conftest -g -lm conftest.c -lGL >&5
configure:7379: $? = 0
configure:7388: result: yes
configure:7404: checking for gluNewTess in -lGLU
configure:7429: gcc -o conftest -g -lm conftest.c -lGLU -lGL >&5
configure:7429: $? = 0
configure:7438: result: yes
configure:7489: checking cairo/cairo.h usability configure:7489: checking cairo/cairo.h usability
configure:7489: gcc -c -g conftest.c >&5 configure:7489: gcc -c -g conftest.c >&5
configure:7489: $? = 0 configure:7489: $? = 0
@ -788,7 +726,7 @@ configure: failed program was:
| #define PACKAGE_BUGREPORT "" | #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL "" | #define PACKAGE_URL ""
| #define MAGIC_VERSION "8.2" | #define MAGIC_VERSION "8.2"
| #define MAGIC_REVISION "0" | #define MAGIC_REVISION "13"
| #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_TYPES_H 1
| #define HAVE_SYS_STAT_H 1 | #define HAVE_SYS_STAT_H 1
| #define HAVE_STDLIB_H 1 | #define HAVE_STDLIB_H 1
@ -818,8 +756,6 @@ configure: failed program was:
| #define LEF_MODULE 1 | #define LEF_MODULE 1
| #define ROUTE_MODULE 1 | #define ROUTE_MODULE 1
| #define USE_NEW_MACROS 1 | #define USE_NEW_MACROS 1
| #define HAVE_LIBGL 1
| #define HAVE_LIBGLU 1
| #define VECTOR_FONTS 1 | #define VECTOR_FONTS 1
| /* end confdefs.h. */ | /* end confdefs.h. */
| #include <cairo/cairo.h> | #include <cairo/cairo.h>
@ -829,7 +765,7 @@ configure:7489: WARNING: cairo/cairo.h: proceeding with the compiler's result
configure:7489: checking for cairo/cairo.h configure:7489: checking for cairo/cairo.h
configure:7489: result: yes configure:7489: result: yes
configure:7507: checking for cairo_user_to_device in -lcairo configure:7507: checking for cairo_user_to_device in -lcairo
configure:7532: gcc -o conftest -g -lm conftest.c -lcairo -lGLU -lGL >&5 configure:7532: gcc -o conftest -g -lm conftest.c -lcairo >&5
configure:7532: $? = 0 configure:7532: $? = 0
configure:7541: result: yes configure:7541: result: yes
configure:8320: creating ./config.status configure:8320: creating ./config.status
@ -896,7 +832,6 @@ ac_cv_func_setenv=yes
ac_cv_func_shmat=yes ac_cv_func_shmat=yes
ac_cv_func_vfork=yes ac_cv_func_vfork=yes
ac_cv_have_x='have_x=yes ac_x_includes='\'''\'' ac_x_libraries='\'''\''' ac_cv_have_x='have_x=yes ac_x_includes='\'''\'' ac_x_libraries='\'''\'''
ac_cv_header_GL_gl_h=yes
ac_cv_header_cairo_cairo_h=yes ac_cv_header_cairo_cairo_h=yes
ac_cv_header_dirent_h=yes ac_cv_header_dirent_h=yes
ac_cv_header_inttypes_h=yes ac_cv_header_inttypes_h=yes
@ -914,8 +849,6 @@ ac_cv_header_sys_stat_h=yes
ac_cv_header_sys_types_h=yes ac_cv_header_sys_types_h=yes
ac_cv_header_unistd_h=yes ac_cv_header_unistd_h=yes
ac_cv_host=x86_64-unknown-linux-gnu ac_cv_host=x86_64-unknown-linux-gnu
ac_cv_lib_GLU_gluNewTess=yes
ac_cv_lib_GL_glXCreateContext=yes
ac_cv_lib_ICE_IceConnectionNumber=yes ac_cv_lib_ICE_IceConnectionNumber=yes
ac_cv_lib_Xext_XextFindDisplay=yes ac_cv_lib_Xext_XextFindDisplay=yes
ac_cv_lib_Xi_XOpenDevice=yes ac_cv_lib_Xi_XOpenDevice=yes
@ -956,7 +889,7 @@ CPPFLAGS=''
CSH='/bin/csh' CSH='/bin/csh'
CXX='g++' CXX='g++'
CXXFLAGS='-g -O2' CXXFLAGS='-g -O2'
DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DMAGIC_VERSION=\"8.2\" -DMAGIC_REVISION=\"0\" -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 -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=\"13\" -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 -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 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -Dlinux=1 -DSYSV=1 -DISC=1'
DEPEND_FLAG='-MM' DEPEND_FLAG='-MM'
ECHO_C='' ECHO_C=''
ECHO_N='printf' ECHO_N='printf'
@ -976,10 +909,10 @@ LDDL_FLAGS='-shared -Wl,-soname,$@ -Wl,--version-script=${MAGICDIR}/magic/symbol
LDFLAGS='' LDFLAGS=''
LD_RUN_PATH='' LD_RUN_PATH=''
LIBOBJS='' LIBOBJS=''
LIBS='-lcairo -lGLU -lGL ' LIBS='-lcairo '
LIB_SPECS=' -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6' LIB_SPECS=' -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6'
LTLIBOBJS='' LTLIBOBJS=''
MAGIC_REVISION='0' MAGIC_REVISION='13'
MAGIC_VERSION='8.2' MAGIC_VERSION='8.2'
OA='' OA=''
OA_LIBS='' OA_LIBS=''
@ -1025,11 +958,11 @@ exec_prefix='${prefix}'
extra_defs=' -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\"' extra_defs=' -DCAD_DIR=\"${LIBDIR}\" -DBIN_DIR=\"${BINDIR}\" -DTCL_DIR=\"${TCLDIR}\"'
extra_libs=' ${MAGICDIR}/ext2sim/libext2sim.o ${MAGICDIR}/ext2spice/libext2spice.o ${MAGICDIR}/calma/libcalma.o ${MAGICDIR}/cif/libcif.o ${MAGICDIR}/plot/libplot.o ${MAGICDIR}/lef/liblef.o ${MAGICDIR}/extflat/libextflat.o ${MAGICDIR}/garouter/libgarouter.o ${MAGICDIR}/mzrouter/libmzrouter.o ${MAGICDIR}/router/librouter.o ${MAGICDIR}/irouter/libirouter.o ${MAGICDIR}/grouter/libgrouter.o ${MAGICDIR}/gcr/libgcr.o ${MAGICDIR}/tcltk/libtcltk.o' extra_libs=' ${MAGICDIR}/ext2sim/libext2sim.o ${MAGICDIR}/ext2spice/libext2spice.o ${MAGICDIR}/calma/libcalma.o ${MAGICDIR}/cif/libcif.o ${MAGICDIR}/plot/libplot.o ${MAGICDIR}/lef/liblef.o ${MAGICDIR}/extflat/libextflat.o ${MAGICDIR}/garouter/libgarouter.o ${MAGICDIR}/mzrouter/libmzrouter.o ${MAGICDIR}/router/librouter.o ${MAGICDIR}/irouter/libirouter.o ${MAGICDIR}/grouter/libgrouter.o ${MAGICDIR}/gcr/libgcr.o ${MAGICDIR}/tcltk/libtcltk.o'
gr_cflags='' gr_cflags=''
gr_dflags=' -DX11 -DXLIB -DOGL -DCAIRO' gr_dflags=' -DX11 -DXLIB -DCAIRO'
gr_hprog='' gr_hprog=''
gr_hsrcs='' gr_hsrcs=''
gr_libs=' -lX11 -lGL -lGLU -lXi -lXmu -lXext -lm -lcairo -lfontconfig -lfreetype -lstdc++' gr_libs=' -lX11 -lcairo -lfontconfig -lfreetype'
gr_srcs=' ${TK_SRCS} ${TOGL_SRCS} ${TOGL_SRCS} ${TKCOMMON_SRCS}' gr_srcs=' ${TK_SRCS} ${TOGL_SRCS} ${TKCOMMON_SRCS}'
host='x86_64-unknown-linux-gnu' host='x86_64-unknown-linux-gnu'
host_alias='' host_alias=''
host_cpu='x86_64' host_cpu='x86_64'
@ -1078,7 +1011,7 @@ unused=' readline lisp'
#define PACKAGE_BUGREPORT "" #define PACKAGE_BUGREPORT ""
#define PACKAGE_URL "" #define PACKAGE_URL ""
#define MAGIC_VERSION "8.2" #define MAGIC_VERSION "8.2"
#define MAGIC_REVISION "0" #define MAGIC_REVISION "13"
#define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_TYPES_H 1
#define HAVE_SYS_STAT_H 1 #define HAVE_SYS_STAT_H 1
#define HAVE_STDLIB_H 1 #define HAVE_STDLIB_H 1
@ -1108,12 +1041,9 @@ unused=' readline lisp'
#define LEF_MODULE 1 #define LEF_MODULE 1
#define ROUTE_MODULE 1 #define ROUTE_MODULE 1
#define USE_NEW_MACROS 1 #define USE_NEW_MACROS 1
#define HAVE_LIBGL 1
#define HAVE_LIBGLU 1
#define VECTOR_FONTS 1 #define VECTOR_FONTS 1
#define HAVE_LIBCAIRO 1 #define HAVE_LIBCAIRO 1
#define MAGIC_WRAPPER 1 #define MAGIC_WRAPPER 1
#define THREE_D 1
#define linux 1 #define linux 1
#define SYSV 1 #define SYSV 1
#define ISC 1 #define ISC 1

24
scripts/config.status
View File

@ -417,7 +417,7 @@ $config_files
Report bugs to the package provider." Report bugs to the package provider."
ac_cs_config="'CFLAGS=-g'" ac_cs_config="'--without-opengl' 'CFLAGS=-g'"
ac_cs_version="\ ac_cs_version="\
config.status config.status
configured by ./configure, generated by GNU Autoconf 2.69, configured by ./configure, generated by GNU Autoconf 2.69,
@ -496,7 +496,7 @@ if $ac_cs_silent; then
fi fi
if $ac_cs_recheck; then 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' '--without-opengl' 'CFLAGS=-g' $ac_configure_extra_args --no-create --no-recursion
shift shift
$as_echo "running CONFIG_SHELL=/bin/sh $*" >&6 $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
CONFIG_SHELL='/bin/sh' CONFIG_SHELL='/bin/sh'
@ -588,15 +588,15 @@ S["INSTALL_TARGET"]="install-tcl"
S["ALL_TARGET"]="tcl" S["ALL_TARGET"]="tcl"
S["OA_LIBS"]="" S["OA_LIBS"]=""
S["OA"]="" S["OA"]=""
S["MAGIC_REVISION"]="0" S["MAGIC_REVISION"]="13"
S["MAGIC_VERSION"]="8.2" S["MAGIC_VERSION"]="8.2"
S["LD_RUN_PATH"]="" S["LD_RUN_PATH"]=""
S["SHLIB_CFLAGS"]="-Wimplicit-int -fPIC" S["SHLIB_CFLAGS"]="-Wimplicit-int -fPIC"
S["DEPEND_FLAG"]="-MM" S["DEPEND_FLAG"]="-MM"
S["gr_hprog"]="" S["gr_hprog"]=""
S["gr_hsrcs"]="" S["gr_hsrcs"]=""
S["gr_srcs"]=" ${TK_SRCS} ${TOGL_SRCS} ${TOGL_SRCS} ${TKCOMMON_SRCS}" S["gr_srcs"]=" ${TK_SRCS} ${TOGL_SRCS} ${TKCOMMON_SRCS}"
S["gr_dflags"]=" -DX11 -DXLIB -DOGL -DCAIRO" S["gr_dflags"]=" -DX11 -DXLIB -DCAIRO"
S["gr_cflags"]="" S["gr_cflags"]=""
S["rl_libs"]="" S["rl_libs"]=""
S["rl_defs"]="" S["rl_defs"]=""
@ -614,7 +614,7 @@ S["extra_libs"]=" ${MAGICDIR}/ext2sim/libext2sim.o ${MAGICDIR}/ext2spice/libext2
"ter/librouter.o ${MAGICDIR}/irouter/libirouter.o ${MAGICDIR}/grouter/libgrouter.o ${MAGICDIR}/gcr/libgcr.o ${MAGICDIR}/tcltk/libtcltk.o" "ter/librouter.o ${MAGICDIR}/irouter/libirouter.o ${MAGICDIR}/grouter/libgrouter.o ${MAGICDIR}/gcr/libgcr.o ${MAGICDIR}/tcltk/libtcltk.o"
S["SCRIPTS"]="" S["SCRIPTS"]=""
S["PACKAGE"]="magic" S["PACKAGE"]="magic"
S["gr_libs"]=" -lX11 -lGL -lGLU -lXi -lXmu -lXext -lm -lcairo -lfontconfig -lfreetype -lstdc++" S["gr_libs"]=" -lX11 -lcairo -lfontconfig -lfreetype"
S["TCL_LIB_DIR"]="/usr/lib" S["TCL_LIB_DIR"]="/usr/lib"
S["TCLSH_EXE"]="/usr/bin/tclsh" S["TCLSH_EXE"]="/usr/bin/tclsh"
S["WISH_EXE"]="/usr/bin/wish" S["WISH_EXE"]="/usr/bin/wish"
@ -666,16 +666,16 @@ S["build"]="x86_64-unknown-linux-gnu"
S["target_alias"]="" S["target_alias"]=""
S["host_alias"]="" S["host_alias"]=""
S["build_alias"]="" S["build_alias"]=""
S["LIBS"]="-lcairo -lGLU -lGL " S["LIBS"]="-lcairo "
S["ECHO_T"]="" S["ECHO_T"]=""
S["ECHO_N"]="-n" S["ECHO_N"]="-n"
S["ECHO_C"]="" S["ECHO_C"]=""
S["DEFS"]="-DPACKAGE_NAME=\\\"\\\" -DPACKAGE_TARNAME=\\\"\\\" -DPACKAGE_VERSION=\\\"\\\" -DPACKAGE_STRING=\\\"\\\" -DPACKAGE_BUGREPORT=\\\"\\\" -DPACKAGE_URL=\\\"\\\" -DMAGIC_VERSION="\ S["DEFS"]="-DPACKAGE_NAME=\\\"\\\" -DPACKAGE_TARNAME=\\\"\\\" -DPACKAGE_VERSION=\\\"\\\" -DPACKAGE_STRING=\\\"\\\" -DPACKAGE_BUGREPORT=\\\"\\\" -DPACKAGE_URL=\\\"\\\" -DMAGIC_VERSION="\
"\\\"8.2\\\" -DMAGIC_REVISION=\\\"0\\\" -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 -DH"\ "\\\"8.2\\\" -DMAGIC_REVISION=\\\"13\\\" -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 -D"\
"AVE_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="\ "HAVE_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 -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 -DFIL"\ "=8 -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 -DFI"\
"E_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 -D"\ "LE_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 -DVECTOR_FONTS=1"\
"HAVE_LIBGLU=1 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -DTHREE_D=1 -Dlinux=1 -DSYSV=1 -DISC=1" " -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -Dlinux=1 -DSYSV=1 -DISC=1"
S["mandir"]="${datarootdir}/man" S["mandir"]="${datarootdir}/man"
S["localedir"]="${datarootdir}/locale" S["localedir"]="${datarootdir}/locale"
S["libdir"]="${exec_prefix}/lib" S["libdir"]="${exec_prefix}/lib"

10
scripts/defs.mak
View File

@ -59,14 +59,14 @@ LIB_SPECS = -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
WISH_EXE = /usr/bin/wish WISH_EXE = /usr/bin/wish
TCL_LIB_DIR = /usr/lib TCL_LIB_DIR = /usr/lib
MAGIC_VERSION = 8.2 MAGIC_VERSION = 8.2
MAGIC_REVISION = 0 MAGIC_REVISION = 13
CC = gcc CC = gcc
CPP = /scripts/preproc.py CPP = /scripts/preproc.py
CXX = g++ CXX = g++
CPPFLAGS = -I. -I${MAGICDIR} 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=\"0\" -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 -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=\"13\" -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 -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 -DVECTOR_FONTS=1 -DHAVE_LIBCAIRO=1 -DMAGIC_WRAPPER=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DNDEBUG -DGCORE=\"/bin/gcore\"
DFLAGS += -DSHDLIB_EXT=\".so\" DFLAGS += -DSHDLIB_EXT=\".so\"
CFLAGS = -g -m64 -fPIC -Wimplicit-int -fPIC CFLAGS = -g -m64 -fPIC -Wimplicit-int -fPIC
@ -78,9 +78,9 @@ DEPEND_FLAG = -MM
EXEEXT = EXEEXT =
GR_CFLAGS = GR_CFLAGS =
GR_DFLAGS = -DX11 -DXLIB -DOGL -DCAIRO -DNDEBUG GR_DFLAGS = -DX11 -DXLIB -DCAIRO -DNDEBUG
GR_LIBS = -lX11 -lGL -lGLU -lXi -lXmu -lXext -lm -lcairo -lfontconfig -lfreetype -lstdc++ ${X11_LDFLAGS} GR_LIBS = -lX11 -lcairo -lfontconfig -lfreetype ${X11_LDFLAGS}
GR_SRCS = ${TK_SRCS} ${TOGL_SRCS} ${TOGL_SRCS} ${TKCOMMON_SRCS} GR_SRCS = ${TK_SRCS} ${TOGL_SRCS} ${TKCOMMON_SRCS}
GR_HELPER_SRCS = GR_HELPER_SRCS =
GR_HELPER_PROG = GR_HELPER_PROG =