luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-08-29 01:24:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Restored compiling of the non-Tcl/Tk version of magic. This has

Browse Source 
traditionally been kept for backwards compatibility.  However, the
operation of "ext2spice" and "ext2sim" as separate programs has
become extremely difficult to maintain, and so it has been dropped
in favor of folding both into the program as commands, as was done
a long time ago in the Tcl/Tk version.
This commit is contained in:
Tim Edwards
2022-02-08 16:12:07 -05:00
parent 113f0dfb3f
commit 6ecd077ab4
13 changed files with 225 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/configure
Vendored
+7 -16
View File
@@ -6816,24 +6816,15 @@ else
fi
if test $usingTcl ; then
if test "x$enable_modular" = "xyes" ; then
programs="$programs ext2sim ext2spice"
$as_echo "#define EXT2SPICE_AUTO 1" >>confdefs.h
$as_echo "#define EXT2SIM_AUTO 1" >>confdefs.h
else
modules="$modules ext2sim ext2spice"
extra_libs="$extra_libs \${MAGICDIR}/ext2sim/libext2sim.o"
extra_libs="$extra_libs \${MAGICDIR}/ext2spice/libext2spice.o"
fi
else
programs="$programs ext2sim ext2spice"
if test "x$enable_modular" = "xyes" ; then
$as_echo "#define EXT2SPICE_AUTO 1" >>confdefs.h
$as_echo "#define EXT2SIM_AUTO 1" >>confdefs.h
else
modules="$modules ext2sim ext2spice"
extra_libs="$extra_libs \${MAGICDIR}/ext2sim/libext2sim.o"
extra_libs="$extra_libs \${MAGICDIR}/ext2spice/libext2spice.o"
fi
# Check whether --enable-locking was given.
@@ -7637,12 +7628,12 @@ elif test $usingScheme ; then
unused="$unused tcltk"
cadinstall="$cadinstall lisp"
extra_libs="$extra_libs \${MAGICDIR}/lisp/liblisp.o"
programs="$programs extcheck graphics"
programs="$programs graphics"
$as_echo "#define SCHEME_INTERPRETER 1" >>confdefs.h
else
unused="$unused lisp tcltk"
programs="$programs extcheck graphics"
programs="$programs graphics"
fi
scripts/configure.in
+7 -14
View File
@@ -914,20 +914,13 @@ AC_ARG_ENABLE(modular,
[],
[enable_modular=no])
if test $usingTcl ; then
if test "x$enable_modular" = "xyes" ; then
programs="$programs ext2sim ext2spice"
AC_DEFINE(EXT2SPICE_AUTO)
AC_DEFINE(EXT2SIM_AUTO)
else
modules="$modules ext2sim ext2spice"
extra_libs="$extra_libs \${MAGICDIR}/ext2sim/libext2sim.o"
extra_libs="$extra_libs \${MAGICDIR}/ext2spice/libext2spice.o"
fi
else
programs="$programs ext2sim ext2spice"
if test "x$enable_modular" = "xyes" ; then
AC_DEFINE(EXT2SPICE_AUTO)
AC_DEFINE(EXT2SIM_AUTO)
else
modules="$modules ext2sim ext2spice"
extra_libs="$extra_libs \${MAGICDIR}/ext2sim/libext2sim.o"
extra_libs="$extra_libs \${MAGICDIR}/ext2spice/libext2spice.o"
fi
AC_ARG_ENABLE(locking,
@@ -1268,11 +1261,11 @@ elif test $usingScheme ; then
unused="$unused tcltk"
cadinstall="$cadinstall lisp"
extra_libs="$extra_libs \${MAGICDIR}/lisp/liblisp.o"
programs="$programs extcheck graphics"
programs="$programs graphics"
AC_DEFINE(SCHEME_INTERPRETER)
else
unused="$unused lisp tcltk"
programs="$programs extcheck graphics"
programs="$programs graphics"
fi
dnl ----------------------------------------------------------------