Changeset 4872

Timestamp:

Dec 15, 2014 9:06:59 AM (8 years ago)

Author:

gah

Message:

 

Location:

branches/r9

Files:

• Makefile.in (modified) (2 diffs)
• configure (modified) (6 diffs)
• configure.in (modified) (5 diffs)
• lib/Makefile.in (modified) (1 diff)
• lib/configure.in (modified) (2 diffs)
• pkgs/aclocal.m4 (added)
• pkgs/cf (added)
• pkgs/cf/config.guess (added)
• pkgs/cf/config.sub (added)
• pkgs/cf/install-sh (added)
• pkgs/cf/mkindex.tcl (added)
• pkgs/cf/mkinstalldirs (added)
• pkgs/cf/mkobjects.tcl (added)
• pkgs/cf/tcl.m4 (added)
• pkgs/configure.in (added)
• pkgs/system/Makefile.in (modified) (1 diff)

branches/r9/Makefile.in

@@ -68 +68 @@
 
 targets = \
-        blt cmake examples expat expect gui htmlwidget itcl \
+        apps blt cmake examples expat expect gui htmlwidget itcl \
         itk lang lib optimizer shape sqlitetcl tcl tcllib \
-        tdom tester tk tkimg tls video vtk zlib  packages \
-        apps p2p
+        tdom tk tkimg tls video vtk zlib  packages \
 
 .PHONY: $(targets)
@@ -127 +126 @@
         $(tls) $(vtk) $(zlib) $(apps)
 
-ifeq ("$(HAVE_VTK)", 1)
+ifneq ("$(HAVE_VTK)", )
   vtk_timestamp   = $(vtk)/timestamp
   cmake_timestamp = $(cmake)/timestamp

branches/r9/configure

@@ -624 +624 @@
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+HAVE_VTK
 RAPPTURE_RELEASE_SERIAL
 RAPPTURE_MINOR_VERSION
@@ -1383 +1384 @@
   --with-install=DIR      location of installation [default=yes]
   --with-statsdir=DIR     Write statistics in DIR
+  --with-vtk              Build VTK for rappture
   --with-ffmpeg=DIR       location of ffmpeg [default=yes]
   --with-vtk=version      VTK library version [default=6.1]
@@ -4973 +4975 @@
 
 
+HAVE_VTK=""
+
+# Check whether --with-statsdir was given.
+if test "${with_statsdir+set}" = set; then :
+  withval=$with_statsdir; HAVE_VTK=$withval
+else
+  HAVE_VTK=""
+fi
+
 
 for ac_func in sysinfo
@@ -5573 +5584 @@
 fi
 
-
-SC_CONFIG_CFLAGS
 
 SVN_VERSION=`svnversion $srcdir`
@@ -5706 +5715 @@
 RP_BASE=`pwd`
 
-SC_ENABLE_SHARED
-
 #--------------------------------------------------------------------
 # This macro figures out what flags to use with the compiler/linker
@@ -6108 +6115 @@
 
 MAKE=${make_command}
+
 
 

branches/r9/configure.in

@@ -57 +57 @@
 fi
 
+HAVE_VTK=""
 AC_ARG_WITH(
-    [statsdir],
-    [AS_HELP_STRING([--with-statsdir=DIR],
-        [Write statistics in DIR])],
-    [STATSDIR=$withval],
-    [STATSDIR="/var/tmp/visservers"])
-
+    [vtk],
+    [AS_HELP_STRING([--with-vtk],
+        [Build VTK for rappture])],
+    [HAVE_VTK=$withval],
+    [HAVE_VTK=""])
 
 AC_CHECK_FUNCS(sysinfo)
@@ -113 +113 @@
 fi
 
-
-SC_CONFIG_CFLAGS
 
 SVN_VERSION=`svnversion $srcdir`
@@ -231 +229 @@
 
 RP_BASE=`pwd`
-
-SC_ENABLE_SHARED
 
 #--------------------------------------------------------------------
@@ -323 +319 @@
 AC_SUBST(RAPPTURE_MINOR_VERSION)
 AC_SUBST(RAPPTURE_RELEASE_SERIAL)
+AC_SUBST(HAVE_VTK)
 
 dnl read Makefile.in and write Makefile
@@ -339 +336 @@
     apps/simsim
     apps/xmldiff
-    pkgs/DicomToVtk/Makefile
-    pkgs/DicomToVtk/pkgIndex.tcl
-    pkgs/DxToVtk/Makefile
-    pkgs/DxToVtk/pkgIndex.tcl
-    pkgs/Makefile
-    pkgs/PdbToVtk/Makefile
-    pkgs/PdbToVtk/pkgIndex.tcl
-    pkgs/builder/Makefile
-    pkgs/builder/pkgIndex.tcl
-    pkgs/builder/scripts/Makefile
-    pkgs/diffview/Makefile
-    pkgs/diffview/pkgIndex.tcl
-    pkgs/hotspot/Makefile
-    pkgs/hotspot/pkgIndex.tcl
-    pkgs/listbox/Makefile
-    pkgs/listbox/pkgIndex.tcl
-    pkgs/objects/Makefile
-    pkgs/p2p/Makefile
-    pkgs/placard/Makefile
-    pkgs/placard/pkgIndex.tcl
-    pkgs/readpoints/Makefile
-    pkgs/readpoints/pkgIndex.tcl
-    pkgs/runner/Makefile
-    pkgs/runner/pkgIndex.tcl
-    pkgs/runner/scripts/Makefile
-    pkgs/squeezer/Makefile
-    pkgs/squeezer/pkgIndex.tcl
-    pkgs/system/Makefile
-    pkgs/system/pkgIndex.tcl
-    pkgs/tester/Makefile
-    pkgs/tester/pkgIndex.tcl
-    pkgs/tester/scripts/Makefile
 ])
 AC_OUTPUT

branches/r9/lib/Makefile.in

@@ -45 +45 @@
           $(MAKE) -C $$i install || exit 1 ;\
         done
+        $(INSTALL) -m 0444 rapptureConfig.sh $(libdir)
 
 docs:

branches/r9/lib/configure.in

@@ -3 +3 @@
 AC_CONFIG_AUX_DIR(../cf)
 AC_CONFIG_HEADER(rappture/config.h)
+
+RAPPTURE_MAJOR_VERSION=1
+RAPPTURE_MINOR_VERSION=4
+RAPPTURE_RELEASE_SERIAL=0
 
 #------------------------------------------------------------------------
@@ -159 +163 @@
 AC_SUBST(SIZEOF_VOID_P)
 AC_SUBST(STLIB_LD)
+AC_SUBST(RAPPTURE_MAJOR_VERSION)
+AC_SUBST(RAPPTURE_MINOR_VERSION)
+AC_SUBST(RAPPTURE_RELEASE_SERIAL)
 
 dnl read Makefile.in and write Makefile
 AC_CONFIG_FILES([
     Makefile
+    rapptureConfig.sh
     rappture/Makefile
     rappture2/Makefile

branches/r9/pkgs/system/Makefile.in

@@ -62 +62 @@
                 signal.o \
                 slice.o \
-                switch.o \
                 sysinfo.o