From c6ee5b77c67bfdb084c875d83a80a9c58c12f8ef Mon Sep 17 00:00:00 2001 From: Joachim Schoeberl Date: Tue, 13 Jan 2009 12:51:35 +0000 Subject: [PATCH] load Tix as Tcl-package, rather than linking it --- Makefile.in | 6 +++--- configure | 2 +- configure.in | 2 +- ng/Makefile.am | 13 ++++++------- ng/Makefile.in | 31 +++++++++++++++---------------- ng/onetcl.cpp | 3 +++ 6 files changed, 29 insertions(+), 28 deletions(-) diff --git a/Makefile.in b/Makefile.in index c0a70b36..5bb2f273 100644 --- a/Makefile.in +++ b/Makefile.in @@ -34,9 +34,9 @@ host_triplet = @host@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING COPYING.LIB ChangeLog \ - INSTALL NEWS TODO config.guess config.sub depcomp install-sh \ - ltmain.sh missing mkinstalldirs + $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ + TODO config.guess config.sub depcomp install-sh ltmain.sh \ + missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/configure b/configure index 221887f6..d4435cb0 100755 --- a/configure +++ b/configure @@ -2367,7 +2367,7 @@ fi # Define the identity of the package. PACKAGE=netgen - VERSION=5.0 + VERSION=4.9.2 cat >>confdefs.h <<_ACEOF diff --git a/configure.in b/configure.in index f597e94c..29b8e8f2 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ AC_INIT(configure.in) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(netgen, 5.0) +AM_INIT_AUTOMAKE(netgen, 4.9.2) AC_LANG_CPLUSPLUS AC_PROG_CXX diff --git a/ng/Makefile.am b/ng/Makefile.am index 5751fef7..30f9ebbf 100644 --- a/ng/Makefile.am +++ b/ng/Makefile.am @@ -2,13 +2,12 @@ INCLUDES = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface METASOURCES = AUTO bin_PROGRAMS = netgen netgen_SOURCES = demoview.cpp ngappinit.cpp ngpkg.cpp onetcl.cpp -netgen_LDADD = $(top_builddir)/libsrc/occ/libocc.a \ - $(top_builddir)/libsrc/csg/libcsg.a $(top_builddir)/libsrc/geom2d/libgeom2d.a \ +netgen_LDADD = $(top_builddir)/libsrc/csg/libcsg.a \ + $(top_builddir)/libsrc/general/libgeneral.a $(top_builddir)/libsrc/geom2d/libgeom2d.a \ + $(top_builddir)/libsrc/gprim/libgprim.a $(top_builddir)/libsrc/interface/libinterface.a \ + $(top_builddir)/libsrc/linalg/libla.a $(top_builddir)/libsrc/meshing/libmesh.a \ + $(top_builddir)/libsrc/occ/libocc.a $(top_builddir)/libsrc/opti/libopti.a \ $(top_builddir)/libsrc/stlgeom/libstl.a $(top_builddir)/libsrc/visualization/libvisual.a \ - $(top_builddir)/libsrc/interface/libinterface.a $(top_builddir)/libsrc/meshing/libmesh.a \ - $(top_builddir)/libsrc/opti/libopti.a $(top_builddir)/libsrc/linalg/libla.a \ - $(top_builddir)/libsrc/gprim/libgprim.a $(top_builddir)/libsrc/general/libgeneral.a -lTKSTL -lTKSTEP -lTKBRep \ - -lTKIGES -L/usr/lib/tcl/Tix8.4.3 -L/usr/local/lib/Togl1.7 -lGLU -lTix8.4.3 \ - -lTogl1.7 -ltcl8.5 -ltk8.5 + -L/usr/local/lib/Togl1.7 -lGLU -lTKBRep -lTKIGES -lTKSTEP -lTKSTL -lTogl1.7 -ltcl8.5 -ltk8.5 AM_CXXFLAGS = -DOPENGL diff --git a/ng/Makefile.in b/ng/Makefile.in index 697370a8..669e061a 100644 --- a/ng/Makefile.in +++ b/ng/Makefile.in @@ -48,17 +48,17 @@ PROGRAMS = $(bin_PROGRAMS) am_netgen_OBJECTS = demoview.$(OBJEXT) ngappinit.$(OBJEXT) \ ngpkg.$(OBJEXT) onetcl.$(OBJEXT) netgen_OBJECTS = $(am_netgen_OBJECTS) -netgen_DEPENDENCIES = $(top_builddir)/libsrc/occ/libocc.a \ - $(top_builddir)/libsrc/csg/libcsg.a \ +netgen_DEPENDENCIES = $(top_builddir)/libsrc/csg/libcsg.a \ + $(top_builddir)/libsrc/general/libgeneral.a \ $(top_builddir)/libsrc/geom2d/libgeom2d.a \ - $(top_builddir)/libsrc/stlgeom/libstl.a \ - $(top_builddir)/libsrc/visualization/libvisual.a \ - $(top_builddir)/libsrc/interface/libinterface.a \ - $(top_builddir)/libsrc/meshing/libmesh.a \ - $(top_builddir)/libsrc/opti/libopti.a \ - $(top_builddir)/libsrc/linalg/libla.a \ $(top_builddir)/libsrc/gprim/libgprim.a \ - $(top_builddir)/libsrc/general/libgeneral.a + $(top_builddir)/libsrc/interface/libinterface.a \ + $(top_builddir)/libsrc/linalg/libla.a \ + $(top_builddir)/libsrc/meshing/libmesh.a \ + $(top_builddir)/libsrc/occ/libocc.a \ + $(top_builddir)/libsrc/opti/libopti.a \ + $(top_builddir)/libsrc/stlgeom/libstl.a \ + $(top_builddir)/libsrc/visualization/libvisual.a DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -194,14 +194,13 @@ top_srcdir = @top_srcdir@ INCLUDES = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface METASOURCES = AUTO netgen_SOURCES = demoview.cpp ngappinit.cpp ngpkg.cpp onetcl.cpp -netgen_LDADD = $(top_builddir)/libsrc/occ/libocc.a \ - $(top_builddir)/libsrc/csg/libcsg.a $(top_builddir)/libsrc/geom2d/libgeom2d.a \ +netgen_LDADD = $(top_builddir)/libsrc/csg/libcsg.a \ + $(top_builddir)/libsrc/general/libgeneral.a $(top_builddir)/libsrc/geom2d/libgeom2d.a \ + $(top_builddir)/libsrc/gprim/libgprim.a $(top_builddir)/libsrc/interface/libinterface.a \ + $(top_builddir)/libsrc/linalg/libla.a $(top_builddir)/libsrc/meshing/libmesh.a \ + $(top_builddir)/libsrc/occ/libocc.a $(top_builddir)/libsrc/opti/libopti.a \ $(top_builddir)/libsrc/stlgeom/libstl.a $(top_builddir)/libsrc/visualization/libvisual.a \ - $(top_builddir)/libsrc/interface/libinterface.a $(top_builddir)/libsrc/meshing/libmesh.a \ - $(top_builddir)/libsrc/opti/libopti.a $(top_builddir)/libsrc/linalg/libla.a \ - $(top_builddir)/libsrc/gprim/libgprim.a $(top_builddir)/libsrc/general/libgeneral.a -lTKSTL -lTKSTEP -lTKBRep \ - -lTKIGES -L/usr/lib/tcl/Tix8.4.3 -L/usr/local/lib/Togl1.7 -lGLU -lTix8.4.3 \ - -lTogl1.7 -ltcl8.5 -ltk8.5 + -L/usr/local/lib/Togl1.7 -lGLU -lTKBRep -lTKIGES -lTKSTEP -lTKSTL -lTogl1.7 -ltcl8.5 -ltk8.5 AM_CXXFLAGS = -DOPENGL all: all-am diff --git a/ng/onetcl.cpp b/ng/onetcl.cpp index 149f9657..26e8ab19 100644 --- a/ng/onetcl.cpp +++ b/ng/onetcl.cpp @@ -1,6 +1,9 @@ const char * ngscript[] = { "\n",\ "\n",\ +"if {[catch {package require Tix }]} {\n",\ +" puts \"cannot find package Tix\"\n",\ +"}\n",\ "set userlevel 3\n",\ "if { [Ng_GetCommandLineParameter expert]==\"defined\" } {\n",\ " set userlevel 3\n",\