diff options
author | lecoanet | 2005-01-24 12:19:27 +0000 |
---|---|---|
committer | lecoanet | 2005-01-24 12:19:27 +0000 |
commit | 8f19fda4baa210eab4dd9c508b5aca253c13a0c4 (patch) | |
tree | 60b8c2ea44bc2813362a46b6f711ab731c78368a /aclocal.m4 | |
parent | a56b4764d2773a957658e496b0e2863e27b0bca9 (diff) | |
download | tkzinc-8f19fda4baa210eab4dd9c508b5aca253c13a0c4.zip tkzinc-8f19fda4baa210eab4dd9c508b5aca253c13a0c4.tar.gz tkzinc-8f19fda4baa210eab4dd9c508b5aca253c13a0c4.tar.bz2 tkzinc-8f19fda4baa210eab4dd9c508b5aca253c13a0c4.tar.xz |
Suppressed the conditional compilation of the anti-overlapping
code.
Added the conditional compilation of all the atc code.
Diffstat (limited to 'aclocal.m4')
-rw-r--r-- | aclocal.m4 | 41 |
1 files changed, 14 insertions, 27 deletions
@@ -91,9 +91,9 @@ AC_DEFUN(ZINC_ENABLE_GL, [ ]) #------------------------------------------------------------------------ -# ZINC_ENABLE_OM -- +# ZINC_ENABLE_ATC -- # -# Specify if the anti overlapping code should be included. +# Specify if the Atc code should be included. # # Arguments: # none @@ -101,44 +101,31 @@ AC_DEFUN(ZINC_ENABLE_GL, [ # Results: # # Adds the following arguments to configure: -# --enable-om=[yes,no] +# --enable-atc=[yes,no] # # Defines the following vars: -# Om_LIB_FILE Contains the platform depent library -# name for the pluggable overlap manager -# OM Defined if overlap manager support -# is enabled -# -# Adjust LIBS to include the overlap manager default library. -# May Modify LD_SEARCH_FLAGS to include the zinc install directory +# ATC Defined if ATC support is enabled # #------------------------------------------------------------------------ - AC_DEFUN(ZINC_ENABLE_OM, [ + AC_DEFUN(ZINC_ENABLE_ATC, [ if test x"${TEA_INITED}" = x ; then - AC_MSG_ERROR([Must call TEA INIT before ENABLE_OM]) + AC_MSG_ERROR([Must call TEA INIT before ENABLE_ATC]) fi - AC_MSG_CHECKING([for build with the overlap manager]) - AC_ARG_ENABLE(om, - [ --enable-om build with overlap manager support [[yes]]], - [tcl_ok=$enableval], [tcl_ok=yes]) + AC_MSG_CHECKING([for build with the ATC extensions]) + AC_ARG_ENABLE(atc, + [ --enable-atc build with ATC extensions [[no]]], + [tcl_ok=$enableval], [tcl_ok=no]) if test "$tcl_ok" = "no"; then - Om_LIB_FILE= + Atc_SOURCES= AC_MSG_RESULT([no]) else - if test "${TEA_PLATFORM}" = "windows" ; then - Om_LIB_FILE=om.dll - bin_BINARIES="\$(Om_LIB_FILE) ${bin_BINARIES}" - else - Om_LIB_FILE=libom${TCL_SHLIB_SUFFIX} - aux_BINARIES="\$(Om_LIB_FILE) ${bin_BINARIES}" - fi - AC_DEFINE(OM) + AC_DEFINE(ATC) + Atc_SOURCES="OverlapMan.c Track.c Reticle.c Map.c MapInfo.c" AC_MSG_RESULT([yes]) -# LIBS="${LIBS} -L. -lom" fi - AC_SUBST(Om_LIB_FILE) + AC_SUBST(Atc_SOURCES) ]) #------------------------------------------------------------------------ |