Reverted the previous patch, the AC_INIT macro don't want

to eat variables. Too bad, we have now to change the version
number twice in configure.in

2 files changed, 17 insertions, 59 deletions

diff --git a/configure b/configure
index 4be33ac..478b9d9 100755
--- a/configure
+++ b/configure
@@ -308,7 +308,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CYGPATH EXEEXT PKG_LIB_FILE PKG_STUB_LIB_FILE PKG_STUB_SOURCES PKG_STUB_OBJECTS PKG_TCL_SOURCES PKG_HEADERS PKG_INCLUDES PKG_LIBS PKG_CFLAGS CONFIGDIR MAJOR_VERSION MINOR_VERSION PATCHLEVEL VERSION PACKAGE Tkzinc_LIB_FILE Tkzincstub_LIB_FILE TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_LIBS TCL_DEFS TCL_EXTRA_CFLAGS TCL_LD_FLAGS TCL_SHLIB_LD_LIBS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_LIBS TK_XINCLUDES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB EGREP MATH_LIBS PKG_SOURCES PKG_OBJECTS TCL_TOP_DIR_NATIVE TCL_GENERIC_DIR_NATIVE TCL_UNIX_DIR_NATIVE TCL_WIN_DIR_NATIVE TCL_BMAP_DIR_NATIVE TCL_TOOL_DIR_NATIVE TCL_PLATFORM_DIR_NATIVE TCL_INCLUDES TK_TOP_DIR_NATIVE TK_UNIX_DIR_NATIVE TK_WIN_DIR_NATIVE TK_GENERIC_DIR_NATIVE TK_XLIB_DIR_NATIVE TK_PLATFORM_DIR_NATIVE TK_INCLUDES CLEANFILES TCL_THREADS SHARED_BUILD AR CELIB_DIR LIBOBJS DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING STLIB_LD SHLIB_LD SHLIB_LD_LIBS SHLIB_CFLAGS LD_LIBRARY_PATH_VAR TCL_DBGX CFLAGS_DEFAULT LDFLAGS_DEFAULT MAKE_LIB MAKE_SHARED_LIB MAKE_STATIC_LIB MAKE_STUB_LIB RANLIB_STUB TCLSH_PROG WISH_PROG GL_LIBS GL_INCLUDES Atc_SOURCES aux_BINARIES bin_BINARIES TCL_INCLUDE_SPEC TK_INCLUDE_SPEC LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CYGPATH EXEEXT PKG_LIB_FILE PKG_STUB_LIB_FILE PKG_STUB_SOURCES PKG_STUB_OBJECTS PKG_TCL_SOURCES PKG_HEADERS PKG_INCLUDES PKG_LIBS PKG_CFLAGS CONFIGDIR MAJOR_VERSION MINOR_VERSION PATCHLEVEL TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_LIBS TCL_DEFS TCL_EXTRA_CFLAGS TCL_LD_FLAGS TCL_SHLIB_LD_LIBS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_LIBS TK_XINCLUDES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB EGREP MATH_LIBS PKG_SOURCES PKG_OBJECTS TCL_TOP_DIR_NATIVE TCL_GENERIC_DIR_NATIVE TCL_UNIX_DIR_NATIVE TCL_WIN_DIR_NATIVE TCL_BMAP_DIR_NATIVE TCL_TOOL_DIR_NATIVE TCL_PLATFORM_DIR_NATIVE TCL_INCLUDES TK_TOP_DIR_NATIVE TK_UNIX_DIR_NATIVE TK_WIN_DIR_NATIVE TK_GENERIC_DIR_NATIVE TK_XLIB_DIR_NATIVE TK_PLATFORM_DIR_NATIVE TK_INCLUDES CLEANFILES TCL_THREADS SHARED_BUILD AR CELIB_DIR LIBOBJS DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING STLIB_LD SHLIB_LD SHLIB_LD_LIBS SHLIB_CFLAGS LD_LIBRARY_PATH_VAR TCL_DBGX CFLAGS_DEFAULT LDFLAGS_DEFAULT MAKE_LIB MAKE_SHARED_LIB MAKE_STATIC_LIB MAKE_STUB_LIB RANLIB_STUB TCLSH_PROG WISH_PROG GL_LIBS GL_INCLUDES Atc_SOURCES TCL_INCLUDE_SPEC TK_INCLUDE_SPEC LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1465,41 +1465,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 CONFIGDIR=${srcdir}/tclconfig
 
 
-#-----------------------------------------------------------------------
-# Define the PACKAGE variable
-#--------------------------------------------------------------------
-PACKAGE=Tkzinc
-
-#-----------------------------------------------------------------------
-# Define the VERSION variable
-#
-# VERSION is constructed from MAJOR_VERSION, MINOR_VERSION and
-# PATCHLEVEL. The windows variant does not containt a dot.
-#-----------------------------------------------------------------------
-MAJOR_VERSION=3
-MINOR_VERSION=3
-PATCHLEVEL=4
-
-VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCHLEVEL}
-
-
-
-
-
 
 
 
 
 #--------------------------------------------------------------------
-# This define a preprocessor macro -DVERSION=xxxxx to include
-# the package version in the sources.
-#--------------------------------------------------------------------
-eval cat >>confdefs.h <<_ACEOF
-#define VERSION "${VERSION}"
-_ACEOF
-
-
-#--------------------------------------------------------------------
 # Load the tclConfig.sh file
 #--------------------------------------------------------------------
 
@@ -10937,6 +10907,18 @@ _ACEOF
 
 
 #--------------------------------------------------------------------
+# Add platform libs to LIBS or SHLIB_LD_LIBS as necessary.
+#--------------------------------------------------------------------
+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"
+fi
+#SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -lxxxx"
+
+#--------------------------------------------------------------------
 # This macro generates a line to use when building a library.  It
 # depends on values set by the TEA_ENABLE_SHARED, TEA_ENABLE_SYMBOLS,
 # and TEA_LOAD_TCLCONFIG macros above.
@@ -11012,18 +10994,6 @@ _ACEOF
 
 
 #--------------------------------------------------------------------
-# Add platform libs to LIBS or SHLIB_LD_LIBS as necessary.
-#--------------------------------------------------------------------
-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"
-fi
-#SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -lxxxx"
-
-#--------------------------------------------------------------------
 # Find tclsh so that we can run pkg_mkIndex to generate the pkgIndex.tcl
 # file during the install process.  Don't run the TCLSH_PROG through
 # ${CYGPATH} because it's being used directly by make.
@@ -11388,17 +11358,10 @@ echo "${ECHO_T}yes" >&6
 
 
 
-#--------------------------------------------------------------------
-# Finally, substitute all of the various values into the Makefile.
-# Add other files needing substitution after Makefile.
-#--------------------------------------------------------------------
-
-
-
 
 
 
-                              ac_config_files="$ac_config_files Makefile starkit.tcl Python/library/Zinc.py"
+                    ac_config_files="$ac_config_files Makefile starkit.tcl"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -11952,7 +11915,6 @@ do
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "starkit.tcl" ) CONFIG_FILES="$CONFIG_FILES starkit.tcl" ;;
-  "Python/library/Zinc.py" ) CONFIG_FILES="$CONFIG_FILES Python/library/Zinc.py" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
@@ -12051,10 +12013,6 @@ s,@CONFIGDIR@,$CONFIGDIR,;t t
 s,@MAJOR_VERSION@,$MAJOR_VERSION,;t t
 s,@MINOR_VERSION@,$MINOR_VERSION,;t t
 s,@PATCHLEVEL@,$PATCHLEVEL,;t t
-s,@VERSION@,$VERSION,;t t
-s,@PACKAGE@,$PACKAGE,;t t
-s,@Tkzinc_LIB_FILE@,$Tkzinc_LIB_FILE,;t t
-s,@Tkzincstub_LIB_FILE@,$Tkzincstub_LIB_FILE,;t t
 s,@TCL_VERSION@,$TCL_VERSION,;t t
 s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t
 s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t
@@ -12140,8 +12098,6 @@ s,@WISH_PROG@,$WISH_PROG,;t t
 s,@GL_LIBS@,$GL_LIBS,;t t
 s,@GL_INCLUDES@,$GL_INCLUDES,;t t
 s,@Atc_SOURCES@,$Atc_SOURCES,;t t
-s,@aux_BINARIES@,$aux_BINARIES,;t t
-s,@bin_BINARIES@,$bin_BINARIES,;t t
 s,@TCL_INCLUDE_SPEC@,$TCL_INCLUDE_SPEC,;t t
 s,@TK_INCLUDE_SPEC@,$TK_INCLUDE_SPEC,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
diff --git a/configure.in b/configure.in
index 459a775..89ea401 100644
--- a/configure.in
+++ b/configure.in
@@ -15,6 +15,8 @@ dnl $Id$
 #-----------------------------------------------------------------------
 # Define MAJOR_VERSION, MINOR_VERSION and PATCHLEVEL, they are
 # useful to built version strings without dots (windows).
+#
+# !!!MUST ALSO BE SUBSTITUTED in AC_INIT !!!
 #-----------------------------------------------------------------------
 MAJOR_VERSION=3
 MINOR_VERSION=3
@@ -23,7 +25,7 @@ PATCHLEVEL=4
 #-----------------------------------------------------------------------
 # Check the source path of the package
 #-----------------------------------------------------------------------
-AC_INIT([Tkzinc], [MAJOR_VERSION.MINOR_VERSION.PATCHLEVEL])
+AC_INIT([Tkzinc], [3.3.4])
 
 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.