Switch to the new TEA 3 build framework.

Adapted for a native build on MacOs X (without X11).

1 files changed, 27 insertions, 41 deletions

diff --git a/tkzinc.m4 b/tkzinc.m4
index d165291..8eeaf39 100644
--- a/tkzinc.m4
+++ b/tkzinc.m4
@@ -38,10 +38,6 @@ builtin(include,tclconfig/tcl.m4)
 #------------------------------------------------------------------------
 
 AC_DEFUN(ZINC_ENABLE_GL, [
-     if test x"${TEA_INITED}" = x ; then
-  	AC_MSG_ERROR([Must call TEA INIT before ENABLE_GL])
-     fi
-
      AC_MSG_CHECKING([for build with GL])
      AC_ARG_ENABLE(gl,
  		  [  --enable-gl             build with openGL support (yes,no,damage) [[no]]],
@@ -53,10 +49,13 @@ AC_DEFUN(ZINC_ENABLE_GL, [
  	AC_MSG_RESULT([no])
      else
 	if test "${TEA_PLATFORM}" = "windows" ; then
-	    GL_LIBS=-lglu32 -lopengl32
-	else
- 	  GL_LIBS="-lGLU -lGL"
- 	  GL_INCLUDES='-I/usr/include'
+	    GL_LIBS='-lglu32 -lopengl32'
+	elif test "${TEA_WINDOWINGSYSTEM}" = "aqua" ; then
+ 	    GL_LIBS='-framework AGL'
+ 	    GL_INCLUDES=''
+        else
+ 	    GL_LIBS='-lGLU -lGL'
+ 	    GL_INCLUDES='-I/usr/include'
         fi
 
  	AC_DEFINE(GL)
@@ -78,9 +77,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
@@ -88,44 +87,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, [
-     if test x"${TEA_INITED}" = x ; then
-  	AC_MSG_ERROR([Must call TEA INIT before ENABLE_OM])
-     fi
-
-     AC_MSG_CHECKING([for build with the overlap manager])
-     AC_ARG_ENABLE(om,
- 		  [  --enable-om             build with overlap manager support [[yes]]],
+ AC_DEFUN(ZINC_ENABLE_ATC, [
+     AC_MSG_CHECKING([for build with the ATC extensions])
+     AC_ARG_ENABLE(atc,
+ 		  [  --enable-atc             build with ATC extensions [[yes]]],
  		  [tcl_ok=$enableval], [tcl_ok=yes])
      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)
+        TEA_ADD_SOURCES([OverlapMan.c])
+        TEA_ADD_SOURCES([Track.c])
+        TEA_ADD_SOURCES([Reticle.c])
+        TEA_ADD_SOURCES([Map.c])
+        TEA_ADD_SOURCES([MapInfo.c])
  	AC_MSG_RESULT([yes])
-#	LIBS="${LIBS} -L. -lom"
      fi
-     AC_SUBST(Om_LIB_FILE)
+  AC_SUBST(Atc_SOURCES)
 ])
 
 #------------------------------------------------------------------------
@@ -149,9 +135,6 @@ AC_DEFUN(ZINC_ENABLE_GL, [
 #------------------------------------------------------------------------
 
 AC_DEFUN(ZINC_ENABLE_SHAPE, [
-     if test x"${TEA_INITED}" = x ; then
- 	AC_MSG_ERROR([Must call TEA INIT before ENABLE_SHAPE])
-     fi
      AC_MSG_CHECKING([for build with X shape support])
      AC_ARG_ENABLE(shape,
  		  [  --enable-shape          build with X shape support (if applicable) [[yes]]],
@@ -161,10 +144,13 @@ AC_DEFUN(ZINC_ENABLE_SHAPE, [
      else
          if test "${TEA_PLATFORM}" = "windows" ; then
  	    AC_MSG_RESULT([no (not available on windows)])
- 	else
+	elif test "${TEA_WINDOWINGSYSTEM}" = "aqua" ; then
+ 	    AC_MSG_RESULT([no (not available on windows)])
+        else
  	    AC_DEFINE(SHAPE)
  	    AC_MSG_RESULT([yes])
 	    LIBS="${LIBS} -lXext"
  	fi
      fi
 ])
+