Switch to the new TEA 3 build framework.

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

1 files changed, 50 insertions, 19 deletions

diff --git a/configure.in b/configure.in
index c0b653b..bb6ff17 100644
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,15 @@ dnl $Id$
 #-----------------------------------------------------------------------
 # Check the source path of the package
 #-----------------------------------------------------------------------
-AC_INIT
+AC_INIT([Tkzinc], [3.3.4])
+
+#--------------------------------------------------------------------
+# Call TEA_INIT as the first TEA_ macro to set up initial vars.
+# This will define a ${TEA_PLATFORM} variable == "unix" or "windows".
+#
+# Keep it here we will need ${TEA_PLATFORM} soon.
+#--------------------------------------------------------------------
+TEA_INIT([3.5])
 
 #-----------------------------------------------------------------------
 # Setup the CONFIGDIR to the path of the directory containing the
@@ -30,14 +38,6 @@ AC_SUBST(CONFIGDIR)
 #--------------------------------------------------------------------
 PACKAGE=Tkzinc
 
-#--------------------------------------------------------------------
-# Call TEA_INIT as the first TEA_ macro to set up initial vars.
-# This will define a ${TEA_PLATFORM} variable == "unix" or "windows".
-#
-# Keep it here we will need ${TEA_PLATFORM} soon.
-#--------------------------------------------------------------------
-TEA_INIT
-
 #-----------------------------------------------------------------------
 # Define the VERSION variable
 #
@@ -46,7 +46,7 @@ TEA_INIT
 #-----------------------------------------------------------------------
 MAJOR_VERSION=3
 MINOR_VERSION=3
-PATCHLEVEL=3
+PATCHLEVEL=4
 
 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCHLEVEL}
 
@@ -59,7 +59,7 @@ AC_SUBST(Tkzinc_LIB_FILE)
 AC_SUBST(Tkzincstub_LIB_FILE)
 
 #--------------------------------------------------------------------
-# This define a preprocessor macro -DVERSION=3.2.6i to include
+# This define a preprocessor macro -DVERSION=xxxxx to include
 # the package version in the sources.
 #--------------------------------------------------------------------
 eval AC_DEFINE_UNQUOTED(VERSION, "${VERSION}")
@@ -89,8 +89,33 @@ TEA_PREFIX
 # the basic setup necessary to compile executables.
 #-----------------------------------------------------------------------
 TEA_SETUP_COMPILER
-AC_CYGWIN
-AC_MINGW32
+#AC_MINGW32
+
+
+#--------------------------------------------------------------------
+# C source files
+#--------------------------------------------------------------------
+TEA_ADD_SOURCES([Tabular.c])
+TEA_ADD_SOURCES([Rectangle.c])
+TEA_ADD_SOURCES([Arc.c])
+TEA_ADD_SOURCES([Curve.c])
+TEA_ADD_SOURCES([Item.c])
+TEA_ADD_SOURCES([PostScript.c])
+TEA_ADD_SOURCES([Attrs.c])
+TEA_ADD_SOURCES([Draw.c])
+TEA_ADD_SOURCES([Geo.c])
+TEA_ADD_SOURCES([List.c])
+TEA_ADD_SOURCES([perfos.c])
+TEA_ADD_SOURCES([Transfo.c])
+TEA_ADD_SOURCES([Group.c])
+TEA_ADD_SOURCES([Icon.c])
+TEA_ADD_SOURCES([Text.c])
+TEA_ADD_SOURCES([Image.c])
+TEA_ADD_SOURCES([Color.c])
+TEA_ADD_SOURCES([Field.c])
+TEA_ADD_SOURCES([Triangles.c])
+TEA_ADD_SOURCES([Window.c])
+TEA_ADD_SOURCES([tkZinc.c])
 
 #--------------------------------------------------------------------
 # Choose which headers you need.  Extension authors should try very
@@ -120,10 +145,12 @@ TEA_PRIVATE_TK_HEADERS
 if test "${TEA_PLATFORM}" = "windows" ; then
     AC_DEFINE(BUILD_Tkzinc)
     CLEANFILES="pkgIndex.tcl *.lib *.dll *.exp *.ilk *.pdb vc*.pch"
-    EXTRA_SOURCES='$(WIN_SOURCES)'
+    TEA_ADD_SOURCES([WinPort.c])
+elif test "${TEA_WINDOWINGSYSTEM}" = "aqua" ; then
+    CLEANFILES="pkgIndex.tcl"
+    TEA_ADD_SOURCES([macosx/OSXPort.c])
 else
     CLEANFILES="pkgIndex.tcl"
-    EXTRA_SOURCES='$(UNIX_SOURCES)'
 fi
 CLEANFILES="${CLEANFILES} doc/*.dvi doc/*.aux doc/*.idx doc/*.ilg doc/*.ind"
 CLEANFILES="${CLEANFILES} doc/*.lof doc/*.log doc/*.out doc/*.toc doc/*.tpt"
@@ -131,13 +158,12 @@ CLEANFILES="${CLEANFILES} doc/refman doc/refman.pdf"
 CLEANFILES="${CLEANFILES} Python/library/Zinc.py"
 
 AC_SUBST(CLEANFILES)
-AC_SUBST(EXTRA_SOURCES)
 
 #--------------------------------------------------------------------
 # Check whether --enable-threads or --disable-threads was given.
-# This call disable threading support as a default.
+# This auto-enables if Tcl was compiled threaded.
 #--------------------------------------------------------------------
-TEA_ENABLE_THREADS(no)
+TEA_ENABLE_THREADS
 
 #--------------------------------------------------------------------
 # The statement below defines a collection of symbols related to
@@ -181,8 +207,10 @@ TEA_MAKE_LIB
 #--------------------------------------------------------------------
 if test "${TEA_PLATFORM}" = "windows" ; then
     LIBS="${LIBS} -lglu32 -lgdi32 -luser32 -lwsock32"
+elif test "${TEA_WINDOWINGSYSTEM}" = "aqua" ; then
+    LIBS="${LIBS} -framework OpenGL -framework Carbon"
 else
-    LIBS="${LIBS} -lGLU -lGL"
+    LIBS="${LIBS} -lGLU"
 fi
 #SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -lxxxx"
 
@@ -222,4 +250,7 @@ ZINC_ENABLE_ATC
 AC_SUBST(aux_BINARIES)
 AC_SUBST(bin_BINARIES)
 
+AC_SUBST(TCL_INCLUDE_SPEC)
+AC_SUBST(TK_INCLUDE_SPEC)
+
 AC_OUTPUT([Makefile starkit.tcl Python/library/Zinc.py])