Changeset 4916 for branches/r9/pkgs
- Timestamp:
- Jan 2, 2015, 7:44:52 PM (10 years ago)
- Location:
- branches/r9/pkgs
- Files:
-
- 25 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/r9/pkgs/DicomToVtk/Makefile.in
r4912 r4916 30 30 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 31 31 TK_LIB_SPEC = @TK_LIB_SPEC@ 32 VTK_VERSION = @VTK_VERSION@ 33 HAVE_LIBVTKDICOM = @HAVE_LIBVTKDICOM@ 34 35 DEFINES = 36 VTK_LIBS = \ 37 -lvtkIOCore-$(VTK_VERSION) \ 38 -lvtkIOLegacy-$(VTK_VERSION) \ 39 -lvtkIOImage-$(VTK_VERSION) \ 40 -lvtkCommonCore-$(VTK_VERSION) 41 42 ifeq ($(HAVE_LIBVTKDICOM),yes) 43 VTK_LIBS += -lvtkDICOM 44 DEFINES += -DUSE_VTK_DICOM_PACKAGE 45 endif 32 46 33 47 CC_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) … … 36 50 INCLUDES = \ 37 51 -I$(srcdir) \ 38 -I$(includedir)/vtk- 6.0\52 -I$(includedir)/vtk-$(VTK_VERSION) \ 39 53 -I$(includedir) 40 54 … … 42 56 $(TCL_LIB_SPEC) \ 43 57 $(TK_LIB_SPEC) \ 58 $(VTK_LIBS) \ 59 -lstdc++ 44 60 45 61 version = @RAPPTURE_VERSION@ -
branches/r9/pkgs/DicomToVtk/RpDicomToVtk.cc
r4841 r4916 258 258 /* 259 259 * ------------------------------------------------------------------------ 260 * R pDicomToVtk_Init --260 * Rappture_dicom_to_vtk_Init -- 261 261 * 262 262 * Invoked when the Rappture GUI library is being initialized … … 268 268 */ 269 269 int 270 R pDicomToVtk_Init(Tcl_Interp *interp)270 Rappture_dicom_to_vtk_Init(Tcl_Interp *interp) 271 271 { 272 272 /* install the widget command */ -
branches/r9/pkgs/DicomToVtk/pkgIndex.tcl.in
r4912 r4916 3 3 set version @PACKAGE_VERSION@ 4 4 set ext [info sharedlibextension] 5 load [file join $dir "RapptureDicomToVtk${version}${ext}"] RpDicomToVtk 5 load [file join $dir "RapptureDicomToVtk${version}${ext}"] \ 6 Rappture_dicom_to_vtk 6 7 package provide RapptureDicomToVtk $version 7 8 } $dir] -
branches/r9/pkgs/DxToVtk/RpDxToVtk.c
r4841 r4916 796 796 /* 797 797 * ------------------------------------------------------------------------ 798 * R pDxToVtk_Init --798 * Rappture_dx_to_vtk_Init -- 799 799 * 800 800 * Invoked when the Rappture GUI library is being initialized … … 806 806 */ 807 807 int 808 R pDxToVtk_Init(Tcl_Interp *interp)808 Rappture_dx_to_vtk_Init(Tcl_Interp *interp) 809 809 { 810 810 /* install the widget command */ -
branches/r9/pkgs/DxToVtk/pkgIndex.tcl.in
r4912 r4916 3 3 set version @PACKAGE_VERSION@ 4 4 set ext [info sharedlibextension] 5 load [file join $dir "RapptureDxToVtk${version}${ext}"] R pDxToVtk5 load [file join $dir "RapptureDxToVtk${version}${ext}"] Rappture_dx_to_vtk 6 6 package provide RapptureDxToVtk $version 7 7 } $dir] -
branches/r9/pkgs/PdbToVtk/pdbToVtk.c
r4841 r4916 724 724 /* 725 725 * ------------------------------------------------------------------------ 726 * R pPdbToVtk_Init --726 * Rappture_pdb_to_vtk_Init -- 727 727 * 728 728 * Invoked when the Rappture GUI library is being initialized … … 734 734 */ 735 735 int 736 R pPdbToVtk_Init(Tcl_Interp *interp)736 Rappture_pdb_to_vtk_Init(Tcl_Interp *interp) 737 737 { 738 738 /* install the widget command */ -
branches/r9/pkgs/PdbToVtk/pkgIndex.tcl.in
r4912 r4916 3 3 set version @PACKAGE_VERSION@ 4 4 set ext [info sharedlibextension] 5 load [file join $dir "RappturePdbToVtk${version}${ext}"] R pPdbToVtk5 load [file join $dir "RappturePdbToVtk${version}${ext}"] Rappture_pdb_to_vtk 6 6 package provide RappturePdbToVtk $version 7 7 } $dir] -
branches/r9/pkgs/configure
r4912 r4916 666 666 LIB_SEARCH_DIRS 667 667 INSTALL_PREFIX 668 HAVE_LIBNCURSES 669 HAVE_LIBVTKDICOM 668 670 HAVE_INTTYPES_H 669 671 LDFLAGS_DEFAULT … … 5385 5387 5386 5388 5389 HAVE_LIBNCURSES=no 5387 5390 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clrtoeol in -lncurses" >&5 5388 5391 $as_echo_n "checking for clrtoeol in -lncurses... " >&6; } … … 5422 5425 $as_echo "$ac_cv_lib_ncurses_clrtoeol" >&6; } 5423 5426 if test "x$ac_cv_lib_ncurses_clrtoeol" = xyes; then : 5424 cat >>confdefs.h <<_ACEOF 5425 #define HAVE_LIBNCURSES 1 5426 _ACEOF 5427 5428 LIBS="-lncurses $LIBS" 5429 5427 HAVE_LIBNCURSES=yes 5430 5428 else 5431 5429 as_fn_error $? "ncurses library missing?" "$LINENO" 5 … … 5915 5913 else 5916 5914 HAVE_INTTYPES_H=0 5915 fi 5916 5917 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lvtkDICOM" >&5 5918 $as_echo_n "checking for main in -lvtkDICOM... " >&6; } 5919 if ${ac_cv_lib_vtkDICOM_main+:} false; then : 5920 $as_echo_n "(cached) " >&6 5921 else 5922 ac_check_lib_save_LIBS=$LIBS 5923 LIBS="-lvtkDICOM $LIBS" 5924 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 5925 /* end confdefs.h. */ 5926 5927 5928 int 5929 main () 5930 { 5931 return main (); 5932 ; 5933 return 0; 5934 } 5935 _ACEOF 5936 if ac_fn_cxx_try_link "$LINENO"; then : 5937 ac_cv_lib_vtkDICOM_main=yes 5938 else 5939 ac_cv_lib_vtkDICOM_main=no 5940 fi 5941 rm -f core conftest.err conftest.$ac_objext \ 5942 conftest$ac_exeext conftest.$ac_ext 5943 LIBS=$ac_check_lib_save_LIBS 5944 fi 5945 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vtkDICOM_main" >&5 5946 $as_echo "$ac_cv_lib_vtkDICOM_main" >&6; } 5947 if test "x$ac_cv_lib_vtkDICOM_main" = xyes; then : 5948 HAVE_LIBVTKDICOM=yes 5949 else 5950 HAVE_LIBVTKDICOM=no 5917 5951 fi 5918 5952 … … 7811 7845 7812 7846 7847 7848 7813 7849 MAKE=${make_command} 7814 7850 -
branches/r9/pkgs/configure.in
r4912 r4916 49 49 AC_CHECK_HEADERS(sys/sysinfo.h) 50 50 51 AC_CHECK_LIB(ncurses, clrtoeol,,AC_MSG_ERROR([ncurses library missing?])) 51 HAVE_LIBNCURSES=no 52 AC_CHECK_LIB(ncurses, clrtoeol,HAVE_LIBNCURSES=yes,AC_MSG_ERROR([ncurses library missing?])) 52 53 AC_CHECK_HEADERS(ncurses.h,,AC_MSG_WARN(ncurses headers missing ?)) 53 54 … … 90 91 fi 91 92 93 AC_CHECK_LIB(vtkDICOM, main, HAVE_LIBVTKDICOM=yes, HAVE_LIBVTKDICOM=no) 92 94 93 95 if test "$with_install" != "yes"; then … … 120 122 AC_SUBST(CFLAGS_OPTIMIZE) 121 123 AC_SUBST(HAVE_INTTYPES_H) 124 AC_SUBST(HAVE_LIBVTKDICOM) 125 AC_SUBST(HAVE_LIBNCURSES) 122 126 AC_SUBST(INSTALL_PREFIX) 123 127 AC_SUBST(LIB_SEARCH_DIRS) -
branches/r9/pkgs/diffview/diffview.c
r4852 r4916 2771 2771 /* 2772 2772 * ------------------------------------------------------------------------ 2773 * Rappture Diffview_Init --2773 * Rappture_diffview_Init -- 2774 2774 * 2775 2775 * Invoked when the Rappture GUI library is being initialized … … 2781 2781 */ 2782 2782 int 2783 Rappture Diffview_Init(interp)2783 Rappture_diffview_Init(interp) 2784 2784 Tcl_Interp *interp; /* interpreter being initialized */ 2785 2785 { -
branches/r9/pkgs/diffview/pkgIndex.tcl.in
r4912 r4916 3 3 set version @PACKAGE_VERSION@ 4 4 set ext [info sharedlibextension] 5 load [file join $dir "RapptureDiffView${version}${ext}"] \ 6 RapptureDiffView_Init 5 load [file join $dir "RapptureDiffView${version}${ext}"] Rappture_diffview 7 6 package provide RapptureDiffView $version 8 7 } $dir] -
branches/r9/pkgs/hotspot/hotspot.c
r4852 r4916 1827 1827 /* 1828 1828 * ------------------------------------------------------------------------ 1829 * Rappture CanvasHotspot_Init --1829 * Rappture_canvas_hotspot_Init -- 1830 1830 * 1831 1831 * Invoked when the Rappture GUI library is being initialized … … 1837 1837 */ 1838 1838 int 1839 Rappture CanvasHotspot_Init(interp)1839 Rappture_canvas_hotspot_Init(interp) 1840 1840 Tcl_Interp *interp; /* interpreter being initialized */ 1841 1841 { -
branches/r9/pkgs/hotspot/pkgIndex.tcl.in
r4842 r4916 4 4 set ext [info sharedlibextension] 5 5 load [file join $dir "RapptureCanvasHotspot${version}${ext}"] \ 6 R pCanvHotspot_Init6 Rappture_canvas_hotspot 7 7 package provide RapptureCanvasHotspot $version 8 8 } $dir] -
branches/r9/pkgs/listbox/RpListbox.c
r4852 r4916 582 582 /* 583 583 * ------------------------------------------------------------------------ 584 * R pListbox_Init --585 * 586 * Invoked when the Rappture GUIlibrary is being initialized584 * Rappture_listbox_Init -- 585 * 586 * Invoked when the Rappture listbox library is being initialized 587 587 * to install the Rappture "listbox" widget. 588 588 * … … 592 592 */ 593 593 int 594 R pListbox_Init(interp)594 Rappture_listbox_Init(interp) 595 595 Tcl_Interp *interp; /* interpreter being initialized */ 596 596 { -
branches/r9/pkgs/listbox/pkgIndex.tcl.in
r4912 r4916 3 3 set version @PACKAGE_VERSION@ 4 4 set ext [info sharedlibextension] 5 load [file join $dir "RapptureListbox${version}${ext}"] R pListbox_Init5 load [file join $dir "RapptureListbox${version}${ext}"] Rappture_listbox 6 6 package provide RapptureListbox $version 7 7 } $dir] -
branches/r9/pkgs/placard/pkgIndex.tcl.in
r4843 r4916 4 4 set ext [info sharedlibextension] 5 5 load [file join $dir "RapptureCanvasPlacard${version}${ext}"] \ 6 Rappture CanvasPlacard_Init6 Rappture_canvas_placard 7 7 package provide RapptureCanvasPlacard $version 8 8 } $dir] -
branches/r9/pkgs/placard/placard.c
r4859 r4916 1440 1440 /* 1441 1441 * ------------------------------------------------------------------------ 1442 * Rappture CanvasPlacard_Init --1442 * Rappture_canvas_placard_Init -- 1443 1443 * 1444 1444 * Invoked when the Rappture GUI library is being initialized … … 1450 1450 */ 1451 1451 int 1452 Rappture CanvasPlacard_Init(interp)1452 Rappture_canvas_placard_Init(interp) 1453 1453 Tcl_Interp *interp; /* interpreter being initialized */ 1454 1454 { -
branches/r9/pkgs/readpoints/pkgIndex.tcl.in
r4912 r4916 4 4 set ext [info sharedlibextension] 5 5 load [file join $dir "RapptureReadPoints${version}${ext}"] \ 6 Rappture ReadPoints_Init6 Rappture_readpoints 7 7 package provide RapptureReadPoints $version 8 8 } $dir] -
branches/r9/pkgs/readpoints/readPoints.c
r4852 r4916 167 167 /* 168 168 * ------------------------------------------------------------------------ 169 * Rappture ReadPoints_Init --169 * Rappture_readpoints_Init -- 170 170 * 171 171 * Invoked when the Rappture GUI library is being initialized … … 177 177 */ 178 178 int 179 Rappture ReadPoints_Init(Tcl_Interp *interp)179 Rappture_readpoints_Init(Tcl_Interp *interp) 180 180 { 181 181 /* install the widget command */ -
branches/r9/pkgs/squeezer/RpSqueezer.c
r4852 r4916 207 207 */ 208 208 int 209 Rappture Squeezer_Init(interp)209 Rappture_squeezer_Init(interp) 210 210 Tcl_Interp *interp; /* interpreter being initialized */ 211 211 { -
branches/r9/pkgs/squeezer/pkgIndex.tcl.in
r4912 r4916 3 3 set version @PACKAGE_VERSION@ 4 4 set ext [info sharedlibextension] 5 load [file join $dir "RapptureSqueezer${version}${ext}"] Rappture Squeezer5 load [file join $dir "RapptureSqueezer${version}${ext}"] Rappture_squeezer 6 6 package provide RapptureSqueezer $version 7 7 } $dir] -
branches/r9/pkgs/system/Makefile.in
r4912 r4916 17 17 CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ 18 18 CXX = @CXX@ 19 HAVE_ NCURSES= @HAVE_LIBNCURSES@19 HAVE_LIBNCURSES = @HAVE_LIBNCURSES@ 20 20 INSTALL = @INSTALL@ 21 21 LIB_RUNTIME_DIR = $(libdir) 22 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@23 22 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 24 23 MKDIR_P = @MKDIR_P@ … … 48 47 DEFINES = -DRAPPTURE_VERSION=\"$(version)\" 49 48 50 51 49 CDEBUGFLAGS = -g -Wall 52 50 53 51 54 52 OBJS = \ 53 daemon.o \ 55 54 init.o \ 56 daemon.o \57 55 op.o \ 58 56 rlimit.o \ … … 66 64 endif 67 65 68 ifeq ($(HAVE_LIB CURSES),yes)66 ifeq ($(HAVE_LIBNCURSES),yes) 69 67 OBJS += curses.o 70 68 LIBS += -lncurses -
branches/r9/pkgs/system/curses.c
r4852 r4916 22 22 * ====================================================================== 23 23 */ 24 #include "config.h" 24 25 #include "tcl.h" 25 26 #include <string.h> -
branches/r9/pkgs/system/init.c
r4852 r4916 35 35 #endif 36 36 int 37 Rappture System_Init( Tcl_Interp * interp)37 Rappture_system_Init( Tcl_Interp * interp) 38 38 { 39 39 #ifdef _WIN32 … … 58 58 return TCL_ERROR; 59 59 } 60 #ifdef HAVE_LIBNCURSES 60 61 if (RpCurses_Init(interp) != TCL_OK) { 61 62 return TCL_ERROR; 62 63 } 64 #endif 63 65 return TCL_OK; 64 66 } -
branches/r9/pkgs/system/pkgIndex.tcl.in
r4912 r4916 3 3 set version @PACKAGE_VERSION@ 4 4 set ext [info sharedlibextension] 5 load [file join $dir "RapptureSystem${version}${ext}"] \ 6 RapptureSystem_Init 5 load [file join $dir "RapptureSystem${version}${ext}"] Rappture_system 7 6 package provide RapptureSystem $version 8 7 } $dir] 8 9
Note: See TracChangeset
for help on using the changeset viewer.