plplot-cvs Mailing List for PLplot (Page 9)

Cross-platform, scientific graphics plotting library

Brought to you by: airwin, andrewross, furnish, hbabcock

plplot-cvs — For PLplot svn commit messages

You can subscribe to this list here.

2000	Jan	Feb	Mar	Apr	May (33)	Jun	Jul (30)	Aug (2)	Sep	Oct (30)	Nov (136)	Dec (59)
2001	Jan (255)	Feb (169)	Mar (322)	Apr (185)	May (33)	Jun (89)	Jul (47)	Aug (59)	Sep (40)	Oct (31)	Nov (74)	Dec (84)
2002	Jan (163)	Feb (78)	Mar (23)	Apr (5)	May (22)	Jun (75)	Jul (143)	Aug (48)	Sep (111)	Oct (58)	Nov (124)	Dec (278)
2003	Jan (106)	Feb (276)	Mar (354)	Apr (97)	May (14)	Jun (3)	Jul (7)	Aug (21)	Sep (83)	Oct (110)	Nov (3)	Dec (119)
2004	Jan (318)	Feb (409)	Mar (68)	Apr (23)	May (105)	Jun (147)	Jul (69)	Aug (53)	Sep (23)	Oct (14)	Nov (15)	Dec (63)
2005	Jan (146)	Feb (69)	Mar (157)	Apr (127)	May (166)	Jun (8)	Jul (5)	Aug (3)	Sep (8)	Oct (17)	Nov (29)	Dec (34)
2006	Jan (3)	Feb (4)	Mar (1)	Apr (70)	May (241)	Jun (82)	Jul (344)	Aug (196)	Sep (87)	Oct (57)	Nov (121)	Dec (86)
2007	Jan (60)	Feb (67)	Mar (102)	Apr (28)	May (13)	Jun (29)	Jul (38)	Aug (56)	Sep (91)	Oct (89)	Nov (50)	Dec (68)
2008	Jan (87)	Feb (47)	Mar (100)	Apr (34)	May (65)	Jun (54)	Jul (98)	Aug (128)	Sep (109)	Oct (141)	Nov (40)	Dec (206)
2009	Jan (176)	Feb (226)	Mar (134)	Apr (84)	May (152)	Jun (85)	Jul (91)	Aug (153)	Sep (141)	Oct (59)	Nov (87)	Dec (75)
2010	Jan (58)	Feb (41)	Mar (51)	Apr (74)	May (81)	Jun (39)	Jul (30)	Aug (43)	Sep (76)	Oct (59)	Nov (62)	Dec (52)
2011	Jan (125)	Feb (41)	Mar (96)	Apr (53)	May (21)	Jun (23)	Jul (48)	Aug (71)	Sep (37)	Oct (81)	Nov (60)	Dec (32)
2012	Jan (51)	Feb (23)	Mar	Apr (8)	May (2)	Jun	Jul (8)	Aug (25)	Sep (4)	Oct (32)	Nov (17)	Dec (2)
2013	Jan (8)	Feb (2)	Mar (9)	Apr (9)	May (37)	Jun (48)	Jul (63)	Aug (42)	Sep (59)	Oct (83)	Nov (141)	Dec (133)
2014	Jan (57)	Feb (58)	Mar (58)	Apr (25)	May (14)	Jun (3)	Jul (6)	Aug (1)	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 7 8 9 10 11 .. 521 > >> (Page 9 of 521)

[Plplot-cvs] SF.net SVN: plplot:[12938] trunk

From: <ai...@us...> - 2014-01-13 03:27:13

Revision: 12938
          http://sourceforge.net/p/plplot/code/12938
Author:   airwin
Date:     2014-01-13 03:27:10 +0000 (Mon, 13 Jan 2014)
Log Message:
-----------
For C source code replace use of the ENABLE_tk macro (defined only if
the CMake variable ENABLE_tk is true) by the more specifice ENABLE_tkX
macro (only defined if the CMake variables ENABLE_tk and X11_FOUND are
true).  The reason for the change is both tcpip.c and
plplot_widgetmodule.c are only viable if X is available.

Modified Paths:
--------------
    trunk/bindings/python/plplot_widgetmodule.c
    trunk/bindings/tk/tcpip.c
    trunk/plplot_config.h.in

Modified: trunk/bindings/python/plplot_widgetmodule.c
===================================================================
--- trunk/bindings/python/plplot_widgetmodule.c	2014-01-13 03:22:38 UTC (rev 12937)
+++ trunk/bindings/python/plplot_widgetmodule.c	2014-01-13 03:27:10 UTC (rev 12938)
@@ -6,7 +6,7 @@
 #include "plplot.h"
 #include "plplotP.h"
 
-#ifdef ENABLE_tk
+#ifdef ENABLE_tkX
 #include <tcl.h>
 #include "pltk.h"
 #endif
@@ -15,7 +15,7 @@
 
 #define TRY( E )    if ( !( E ) ) return NULL
 
-#ifdef ENABLE_tk
+#ifdef ENABLE_tkX
 static char doc_Pltk_init[] = "Initialize the Pltk Tcl extension.";
 
 //--------------------------------------------------------------------------
@@ -44,7 +44,7 @@
 
     if ( Pltk_Init( interp ) == TCL_ERROR )
     {
-        printf( "Initizlization of Pltk Tcl extension failed!\n" );
+        printf( "Initialization of Pltk Tcl extension failed!\n" );
         return NULL;
     }
 
@@ -59,7 +59,7 @@
 //--------------------------------------------------------------------------
 
 static PyMethodDef plplot_widget_methods[] = {
-#ifdef ENABLE_tk
+#ifdef ENABLE_tkX
     { "Pltk_init", pl_Pltk_init, METH_VARARGS, doc_Pltk_init },
 #endif
 

Modified: trunk/bindings/tk/tcpip.c
===================================================================
--- trunk/bindings/tk/tcpip.c	2014-01-13 03:22:38 UTC (rev 12937)
+++ trunk/bindings/tk/tcpip.c	2014-01-13 03:27:10 UTC (rev 12938)
@@ -63,7 +63,7 @@
 #include "plDevs.h"
 #include "plConfig.h"
 
-#if defined ( PLD_tk ) || defined ( ENABLE_tk )
+#if defined ( PLD_tk ) || defined ( ENABLE_tkX )
 
 // This file is meant to be compiled with non-ANSI compilers ("cc").
 // The reason for doing it this way is to ensure that the full C
@@ -748,4 +748,4 @@
     return 0;
 }
 
-#endif  // defined(PLD_tk) || defined (ENABLE_tk)
+#endif  // defined(PLD_tk) || defined (ENABLE_tkX)

Modified: trunk/plplot_config.h.in
===================================================================
--- trunk/plplot_config.h.in	2014-01-13 03:22:38 UTC (rev 12937)
+++ trunk/plplot_config.h.in	2014-01-13 03:27:10 UTC (rev 12938)
@@ -78,8 +78,8 @@
 // Define to 1 if you have the <itclDecls.h> header file.
 #cmakedefine HAVE_ITCLDECLS_H 1
 
-// Define if Tk is available
-#cmakedefine ENABLE_tk
+// Define if Tk is enabled and X11 has been found.
+#cmakedefine ENABLE_tkX
 
 // Define if [incr], [Tk] is available
 #cmakedefine HAVE_ITK

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12937] trunk/bindings/tcl/pkgIndex.tcl.in

From: <ai...@us...> - 2014-01-13 03:22:41

Revision: 12937
          http://sourceforge.net/p/plplot/code/12937
Author:   airwin
Date:     2014-01-13 03:22:38 +0000 (Mon, 13 Jan 2014)
Log Message:
-----------
Update the TEA-based approach for accessing Pltcl under tclsh on
Windows platforms.  I have dropped the old Windows method which was
completely broken and replaced it with a method which slightly adapts
the Unix way of accessing PLtcl by using the known different locations
for the dll's in the Windows case.

Tested by Alan W. Irwin <ai...@us...> on
MinGW/MSYS/Wine by running the tclsh demo given by
examples/tcl/README.tcldemos by hand for a few examples and also by
running the test_tclsh_standard_examples target.

Modified Paths:
--------------
    trunk/bindings/tcl/pkgIndex.tcl.in

Modified: trunk/bindings/tcl/pkgIndex.tcl.in
===================================================================
--- trunk/bindings/tcl/pkgIndex.tcl.in	2014-01-13 03:13:30 UTC (rev 12936)
+++ trunk/bindings/tcl/pkgIndex.tcl.in	2014-01-13 03:22:38 UTC (rev 12937)
@@ -32,48 +32,48 @@
     #puts "loading Pltcl, dir: $dir"
     set pllibrary $dir
 
+    set thisDir [pwd]
+    # Find absolute path of $dir 
+    cd $dir
+    set pkgIndexDir [pwd]
+    cd $thisDir
+    set buildDir "@BUILD_DIR@"
+    set bLen [string length $buildDir]
+    # If pkgIndexDir is in the build tree...
     if {$tcl_platform(platform) == "unix"} {
-	set thisDir [pwd]
-	# Find absolute path of $dir 
-	cd $dir
-	set pkgIndexDir [pwd]
-	cd $thisDir
-	set buildDir "@BUILD_DIR@"
-	set bLen [string length $buildDir]
-	# If pkgIndexDir is in the build tree...
 	if {![string compare -length $bLen $buildDir $pkgIndexDir]} then {
-		set searchdirs "."} else {
-		set searchdirs [list "@LIB_HARDDIR@"]}
-	#puts $searchdirs
-	# prefer double precision version
-	set dlnames [list "@DLNAME_LIBPLPLOTTCLTKD@" "@DLNAME_LIBPLPLOTTCLTK@"]
-	set file ""
-	foreach reldir $searchdirs {
-	    foreach dlname $dlnames {
-		set driver [file join $dir $reldir $dlname]
-		#puts "looking for driver file: $driver"
-		if [file exists $driver] {
-		    set file $driver
-		    break
-		}
-	    }
-	    if { $file != "" } { break }
+	    set searchdirs "."
+	} else {
+	    set searchdirs [list "@LIB_HARDDIR@"]
 	}
-	if { $file == "" } {
-	    error "load_pkg_Pltcl: could not find loadable driver"
-	}
-
     } else {
-    # This is probably broken, someone should fix it.
-	if {[info exists tcl_platform(debug)]} {
-	    set file [file join $dir plplot510d[info sharedlibextension]]
+	if {![string compare -length $bLen $buildDir $pkgIndexDir]} then {
+	    set searchdirs "../../dll"
 	} else {
-	    set file [file join $dir plplot510[info sharedlibextension]]
+	    set searchdirs [list "@LIB_HARDDIR@../bin"]
 	}
     }
+    #puts $searchdirs
+    # prefer double precision version
+    set dlnames [list "@DLNAME_LIBPLPLOTTCLTKD@" "@DLNAME_LIBPLPLOTTCLTK@"]
+    set file ""
+    foreach reldir $searchdirs {
+	foreach dlname $dlnames {
+	    set driver [file join $dir $reldir $dlname]
+	    #puts "looking for driver file: $driver"
+	    if [file exists $driver] {
+		set file $driver
+		break
+	    }
+	}
+	if { $file != "" } { break }
+    }
+    if { $file == "" } {
+	error "load_pkg_Pltcl: could not find loadable driver"
+    }
 
     load $file Pltcl
-# put core tcl scripts in path
+    # put core tcl scripts in path
     lappend auto_path $dir/tcl
     rename load_pkg_Pltcl {}
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12936] trunk/examples/CMakeLists.txt

From: <ai...@us...> - 2014-01-13 03:13:33

Revision: 12936
          http://sourceforge.net/p/plplot/code/12936
Author:   airwin
Date:     2014-01-13 03:13:30 +0000 (Mon, 13 Jan 2014)
Log Message:
-----------
Choose ntk (if available) over wingcc as the device used for generic
interactive tests on Windows.

Modified Paths:
--------------
    trunk/examples/CMakeLists.txt

Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt	2014-01-13 03:11:05 UTC (rev 12935)
+++ trunk/examples/CMakeLists.txt	2014-01-13 03:13:30 UTC (rev 12936)
@@ -423,13 +423,12 @@
 if(PLD_xwin)
   # Typically for Unix with X
   set(generic_interactive_device xwin)
+elseif(PLD_ntk)
+  # Typically for all platforms if ntk is available but not xwin
+  set(generic_interactive_device ntk)
 elseif(PLD_wingcc)
-  # Typically for Windows without X
+  # Typically for Windows if -dev ntk is not available
   set(generic_interactive_device wingcc)
-elseif(PLD_ntk)
-  # A special test case used on Unix for when we have deliberately not
-  # looked for X simply to test the non-X logic.
-  set(generic_interactive_device ntk)
 else(PLD_xwin)
   set(generic_interactive_device)
 endif(PLD_xwin)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12935] trunk/cmake/epa_build/setup/ setup_mingw_msys_wine_toolchain

From: <ai...@us...> - 2014-01-13 03:11:11

Revision: 12935
          http://sourceforge.net/p/plplot/code/12935
Author:   airwin
Date:     2014-01-13 03:11:05 +0000 (Mon, 13 Jan 2014)
Log Message:
-----------
Give access to version 3 of the Itcl and Itk libraries on MinGW/MSYS.

Modified Paths:
--------------
    trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain

Modified: trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain
===================================================================
--- trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain	2014-01-12 03:12:25 UTC (rev 12934)
+++ trunk/cmake/epa_build/setup/setup_mingw_msys_wine_toolchain	2014-01-13 03:11:05 UTC (rev 12935)
@@ -51,8 +51,11 @@
 PATH=$CMAKE_PATH:$PATH
 PATH=$MINGW_PREFIX/bin/:$PATH
 
-# pkg-config setup.
+# Allow using -DBUILD_THE_BUILDTOOLS=ON results from epa_build
+# pkg-config, tclsh, and wish setup.
 PATH=$BUILDTOOLS_PREFIX/bin:$PATH
 
+# Allow using itcl3 and itk3 libraries:
+PATH=$BUILDTOOLS_PREFIX/lib/itcl3.4:$BUILDTOOLS_PREFIX/lib/itk3.3:$PATH
+
 export PKG_CONFIG_PATH=/z/home/wine/newstart/MinGW-4.7.2/msys/1.0/lib/pkgconfig:$BUILDTOOLS_PREFIX/share/pkgconfig:$BUILDTOOLS_PREFIX/lib/pkgconfig
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12934] trunk

From: <ai...@us...> - 2014-01-12 03:12:28

Revision: 12934
          http://sourceforge.net/p/plplot/code/12934
Author:   airwin
Date:     2014-01-12 03:12:25 +0000 (Sun, 12 Jan 2014)
Log Message:
-----------
Define and use ENABLE_tkX and ENABLE_itkX to help distingush cases
where X is present or not along with Tk and Itk.

Define and use generic_interactive_device, the device that
is to be used with generic interactive tests.  Normally, this
device is xwin on Unix (with X) and wingcc on Windows (without X), but
for the test case where X has not been found on Unix, it is ntk.

Tested by Alan W. Irwin <ai...@us...> on Linux where
the find for X11 was temporarily commented out so nothing X related
was defined, and the build-system logic normally used for the Windows
case could be tested (but with ntk as the generic interactive device).

ldd -r and nm --undefined-only showed no issues for -dev ntk, the
plplottcltk library, and the pltcl executable.  The
test_pltcl_standard_examples and test_tclsh_standard_examples targets
completed without issues (after the ntk cmd array overflow bug found
by example 27 was fixed).  Note all these tests were in the build tree
for the shared library/dynamic devices case so additional more
comprehensive testing of these widespread changes with
scripts/comprehensive_test.sh is recommended in the long term.

Modified Paths:
--------------
    trunk/bindings/python/CMakeLists.txt
    trunk/bindings/tcl/CMakeLists.txt
    trunk/bindings/tk/CMakeLists.txt
    trunk/cmake/modules/tcl-related.cmake
    trunk/cmake/modules/tk.cmake
    trunk/examples/CMakeLists.txt
    trunk/examples/plplot_configure.cmake_installed_examples.in
    trunk/examples/python/CMakeLists.txt
    trunk/examples/tcl/tclsh_standard_examples.in
    trunk/examples/tk/CMakeLists.txt
    trunk/examples/tk/CMakeLists.txt_installed_examples_tk
    trunk/plplot_test/plplot-test-interactive.sh.in

Modified: trunk/bindings/python/CMakeLists.txt
===================================================================
--- trunk/bindings/python/CMakeLists.txt	2014-01-12 02:53:54 UTC (rev 12933)
+++ trunk/bindings/python/CMakeLists.txt	2014-01-12 03:12:25 UTC (rev 12934)
@@ -22,7 +22,7 @@
 
   # This is currently the include list for swig, the C wrapper and the
   # the Python headers. Not particular pretty...
-  if(ENABLE_tk)
+  if(ENABLE_tkX)
     set(python_interface_INCLUDE_PATHS
       ${CMAKE_SOURCE_DIR}/include
       ${CMAKE_SOURCE_DIR}/lib/qsastime
@@ -36,7 +36,7 @@
       ${NUMPY_INCLUDE_PATH}
       ${CMAKE_SOURCE_DIR}/bindings/swig-support
       )
-  else(ENABLE_tk)
+  else(ENABLE_tkX)
     set(python_interface_INCLUDE_PATHS
       ${CMAKE_SOURCE_DIR}/include
       ${CMAKE_SOURCE_DIR}/lib/qsastime
@@ -47,7 +47,7 @@
       ${NUMPY_INCLUDE_PATH}
       ${CMAKE_SOURCE_DIR}/bindings/swig-support
       )
-  endif(ENABLE_tk)
+  endif(ENABLE_tkX)
   include_directories(${python_interface_INCLUDE_PATHS})
 
   if(PL_DOUBLE)
@@ -110,18 +110,18 @@
     "-DUSINGDLL"
     )
 
-  if(ENABLE_tk)
+  if(ENABLE_tkX)
     target_link_libraries( plplot_widgetmodule
       plplot${LIB_TAG}
       plplottcltk${LIB_TAG}
       ${PYTHON_LIBRARIES}
       )
-  else(ENABLE_tk)
+  else(ENABLE_tkX)
     target_link_libraries( plplot_widgetmodule
       plplot${LIB_TAG}
       ${PYTHON_LIBRARIES}
       )
-  endif(ENABLE_tk)
+  endif(ENABLE_tkX)
 
   if(USE_RPATH)
     set_target_properties(
@@ -158,12 +158,12 @@
     FILES plplot.py ${CMAKE_CURRENT_BINARY_DIR}/plplotc.py
     DESTINATION ${PYTHON_INSTDIR}
     )
-  if(ENABLE_tk)
+  if(ENABLE_tkX)
     install(
       FILES
       Plframe.py TclSup.py
       DESTINATION ${PYTHON_INSTDIR}
       )
-  endif(ENABLE_tk)
+  endif(ENABLE_tkX)
 
 endif(ENABLE_python)

Modified: trunk/bindings/tcl/CMakeLists.txt
===================================================================
--- trunk/bindings/tcl/CMakeLists.txt	2014-01-12 02:53:54 UTC (rev 12933)
+++ trunk/bindings/tcl/CMakeLists.txt	2014-01-12 03:12:25 UTC (rev 12934)
@@ -209,7 +209,7 @@
       )
   endif(ENABLE_itcl)
 
-  if(ENABLE_tk)
+  if(ENABLE_tkX)
     set(plplottcltk${LIB_TAG}_LIB_SRCS
       ${plplottcltk${LIB_TAG}_LIB_SRCS}
       ${CMAKE_SOURCE_DIR}/bindings/tk/Pltk_Init.c
@@ -280,7 +280,7 @@
       ${TK_LIBRARY}
       )
 
-    if(ENABLE_itk)
+    if(ENABLE_itkX)
       include_directories(${ITK_INCLUDE_PATH})
       # tkMain.c is the only code that currently has a dependence on
       # itk library routines.  Since that code is now part of the source code
@@ -300,8 +300,8 @@
 	${libplplottcltk_Main${LIB_TAG}_LINK_FLAGS}
 	${ITK_LIBRARY}
 	)
-    endif(ENABLE_itk)
-  endif(ENABLE_tk)
+    endif(ENABLE_itkX)
+  endif(ENABLE_tkX)
 
   # Transform "${libplplottcltk${LIB_TAG}_LINK_FLAGS}" string to the
   # standard pkg-config form.
@@ -319,17 +319,17 @@
   add_library(plplottcltk_Main${LIB_TAG} ${plplottcltk_Main${LIB_TAG}_LIB_SRCS})
 
   if(USE_TCL_TK_STUBS)
-    if(ENABLE_tk)
+    if(ENABLE_tkX)
       set_target_properties(
 	plplottcltk${LIB_TAG}
 	PROPERTIES COMPILE_DEFINITIONS "USE_TCL_STUBS;USE_TK_STUBS"
 	)
-    else(ENABLE_tk)
+    else(ENABLE_tkX)
       set_target_properties(
 	plplottcltk${LIB_TAG}
 	PROPERTIES COMPILE_DEFINITIONS USE_TCL_STUBS
 	)
-    endif(ENABLE_tk)
+    endif(ENABLE_tkX)
   endif(USE_TCL_TK_STUBS)
 
   if(NON_TRANSITIVE)

Modified: trunk/bindings/tk/CMakeLists.txt
===================================================================
--- trunk/bindings/tk/CMakeLists.txt	2014-01-12 02:53:54 UTC (rev 12933)
+++ trunk/bindings/tk/CMakeLists.txt	2014-01-12 03:12:25 UTC (rev 12934)
@@ -18,6 +18,42 @@
 # along with PLplot; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
+if(ENABLE_tkX)
+  include_directories(
+    ${TCL_INCLUDE_PATH}
+    ${TK_INCLUDE_PATH}
+    ${CMAKE_SOURCE_DIR}/include
+    ${CMAKE_SOURCE_DIR}/bindings/tcl
+    ${CMAKE_SOURCE_DIR}/lib/qsastime
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_BINARY_DIR}/include
+    )
+
+  if(BUILD_SHARED_LIBS)
+    set_source_files_properties(plserver.c
+      PROPERTIES COMPILE_FLAGS "-DUSINGPLDLL" )
+  endif(BUILD_SHARED_LIBS)
+
+  add_executable(plserver plserver.c)
+  target_link_libraries(plserver plplot${LIB_TAG} plplottcltk_Main${LIB_TAG} plplottcltk${LIB_TAG} ${TK_LIBRARY} ${TCL_LIBRARY})
+
+  if(USE_RPATH)
+    get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
+    list(APPEND LIB_INSTALL_RPATH ${TCL_TK_ITCL_ITK_RPATH})
+    filter_rpath(LIB_INSTALL_RPATH)
+    set_target_properties(plserver
+      PROPERTIES
+      INSTALL_RPATH "${LIB_INSTALL_RPATH}"
+      )
+  endif(USE_RPATH)
+
+  install(TARGETS plserver
+    EXPORT export_plplot
+    DESTINATION ${BIN_DIR}
+    )
+endif(ENABLE_tkX)
+
 if(ENABLE_tk)
 
   set(include_INSTALLED_HEADERS
@@ -85,41 +121,6 @@
     DESTINATION ${TCL_DIR}
     )
 
-  include_directories(
-    ${TCL_INCLUDE_PATH}
-    ${TK_INCLUDE_PATH}
-    ${CMAKE_SOURCE_DIR}/include
-    ${CMAKE_SOURCE_DIR}/bindings/tcl
-    ${CMAKE_SOURCE_DIR}/lib/qsastime
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/include
-    )
-
-
-  if(BUILD_SHARED_LIBS)
-    set_source_files_properties(plserver.c
-      PROPERTIES COMPILE_FLAGS "-DUSINGPLDLL" )
-  endif(BUILD_SHARED_LIBS)
-
-  add_executable(plserver plserver.c)
-  target_link_libraries(plserver plplot${LIB_TAG} plplottcltk_Main${LIB_TAG} plplottcltk${LIB_TAG} ${TK_LIBRARY} ${TCL_LIBRARY})
-
-  if(USE_RPATH)
-    get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
-    list(APPEND LIB_INSTALL_RPATH ${TCL_TK_ITCL_ITK_RPATH})
-    filter_rpath(LIB_INSTALL_RPATH)
-    set_target_properties(plserver
-      PROPERTIES
-      INSTALL_RPATH "${LIB_INSTALL_RPATH}"
-      )
-  endif(USE_RPATH)
-
-  install(TARGETS plserver
-    EXPORT export_plplot
-    DESTINATION ${BIN_DIR}
-    )
-
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tclIndex
     COMMAND ${TCL_TCLSH} ${MKTCLINDEX} ${MKTCLINDEX_ARGS}

Modified: trunk/cmake/modules/tcl-related.cmake
===================================================================
--- trunk/cmake/modules/tcl-related.cmake	2014-01-12 02:53:54 UTC (rev 12933)
+++ trunk/cmake/modules/tcl-related.cmake	2014-01-12 03:12:25 UTC (rev 12934)
@@ -371,17 +371,6 @@
     set(ENABLE_tk OFF CACHE BOOL "Enable Tk bindings" FORCE)
   endif(ENABLE_tk AND TK_FOUND)
 
-  if(ENABLE_tk AND NOT X11_FOUND)
-    if(WIN32 AND NOT CYGWIN)
-      message(STATUS "WARNING: X11 not found, turning off Tk devices that depend on it")
-      set(PLD_tk OFF CACHE BOOL "Enable Tk device" FORCE)
-      set(PLD_tkwin OFF CACHE BOOL "Enable Tk device" FORCE)
-    else(WIN32 AND NOT CYGWIN)
-      message(STATUS "WARNING: X11 not found so disabling Tk interface code")
-      set(ENABLE_tk OFF CACHE BOOL "Enable Tk interface code" FORCE)
-    endif(WIN32 AND NOT CYGWIN)
-  endif(ENABLE_tk AND NOT X11_FOUND)
-
   if(ENABLE_tk)
     get_filename_component(TK_LIBRARY_PATH ${TK_LIBRARY} PATH)
     list(APPEND TCL_TK_RPATH ${TK_LIBRARY_PATH})
@@ -601,6 +590,18 @@
   set(ENABLE_itk OFF CACHE BOOL "Enable Itk interface code" FORCE)
 endif(ENABLE_tcl)
 
+if(ENABLE_tk AND X11_FOUND)
+  set(ENABLE_tkX ON)
+else(ENABLE_tk AND X11_FOUND)
+  set(ENABLE_tkX OFF)
+endif(ENABLE_tk AND X11_FOUND)
+
+if(ENABLE_itk AND X11_FOUND)
+  set(ENABLE_itkX ON)
+else(ENABLE_itk AND X11_FOUND)
+  set(ENABLE_itkX OFF)
+endif(ENABLE_itk AND X11_FOUND)
+
 if(NOT ENABLE_itcl)
   set(PLPLOT_ITCL_VERSION 0.0.0)
 endif(NOT ENABLE_itcl)

Modified: trunk/cmake/modules/tk.cmake
===================================================================
--- trunk/cmake/modules/tk.cmake	2014-01-12 02:53:54 UTC (rev 12933)
+++ trunk/cmake/modules/tk.cmake	2014-01-12 03:12:25 UTC (rev 12934)
@@ -46,17 +46,21 @@
 # DRIVERS_LINK_FLAGS	  - list of LINK_FLAGS for all static devices.
 # tkwin_SOURCE		  - list of source files other than tkwin.c
 
-if(NOT ENABLE_tk)
-  if(PLD_tk OR PLD_ntk OR PLD_tkwin)
-    message(STATUS 
-    "WARNING: ENABLE_tk OFF.  Setting PLD_tk, PLD_ntk, and PLD_tkwin OFF."
+if(NOT ENABLE_tk AND (PLD_tk OR PLD_ntk OR PLD_tkwin))
+  message(STATUS 
+    "WARNING: ENABLE_tk OFF.  Therefore turning off tk, tkwin, and ntk devices"
     )
-    set(PLD_tk OFF CACHE BOOL "Enable tk device" FORCE)
-    set(PLD_ntk OFF CACHE BOOL "Enable ntk device" FORCE)
-    set(PLD_tkwin OFF CACHE BOOL "Enable tkwin device" FORCE)
-  endif(PLD_tk OR PLD_ntk OR PLD_tkwin)
-endif(NOT ENABLE_tk)
+  set(PLD_tk OFF CACHE BOOL "Enable tk device" FORCE)
+  set(PLD_ntk OFF CACHE BOOL "Enable ntk device" FORCE)
+  set(PLD_tkwin OFF CACHE BOOL "Enable tkwin device" FORCE)
+endif(NOT ENABLE_tk AND (PLD_tk OR PLD_ntk OR PLD_tkwin))
 
+if(NOT X11_FOUND AND (PLD_tk OR PLD_tkwin))
+  message(STATUS "WARNING: X11 not found.  Therefore turning off tk and tkwin devices that depend on it")
+  set(PLD_tk OFF CACHE BOOL "Enable Tk device" FORCE)
+  set(PLD_tkwin OFF CACHE BOOL "Enable Tk device" FORCE)
+endif(NOT X11_FOUND AND (PLD_tk OR PLD_tkwin))
+
 # Transform TK_INCLUDE_PATH (which is a list) to blank-delimited flag form.
 string(REGEX REPLACE ";" " -I" TKLIB_COMPILE_FLAGS "-I${TK_INCLUDE_PATH}")
 	

Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt	2014-01-12 02:53:54 UTC (rev 12933)
+++ trunk/examples/CMakeLists.txt	2014-01-12 03:12:25 UTC (rev 12934)
@@ -87,9 +87,9 @@
     set(CXX_COMMENT "#")
   endif(NOT(ENABLE_cxx AND (PLD_ps OR ENABLE_qt)))
 
-  if(NOT ENABLE_tk)
+  if(NOT ENABLE_tkX)
     set(TK_COMMENT "#")
-  endif(NOT ENABLE_tk)
+  endif(NOT ENABLE_tkX)
 
   if(NOT PLD_pdfcairo)
     set(PDFCAIRO_COMMENT "#")
@@ -418,6 +418,22 @@
   remove_definitions("-DHAVE_CONFIG_H")
 endif(CORE_BUILD AND BUILD_TEST)
 
+# Decide on device to be used for generic interactive tests.
+
+if(PLD_xwin)
+  # Typically for Unix with X
+  set(generic_interactive_device xwin)
+elseif(PLD_wingcc)
+  # Typically for Windows without X
+  set(generic_interactive_device wingcc)
+elseif(PLD_ntk)
+  # A special test case used on Unix for when we have deliberately not
+  # looked for X simply to test the non-X logic.
+  set(generic_interactive_device ntk)
+else(PLD_xwin)
+  set(generic_interactive_device)
+endif(PLD_xwin)
+
 # language_info_LIST excludes the tk subdirectly since noninteractive
 # tests and file results do not involve tk.  However, the tk
 # subdirectory does have to be processed just like the rest
@@ -466,6 +482,7 @@
     set(java_custom_env ${custom_env})
     set(compare_script ${CMAKE_CURRENT_SOURCE_DIR}/test_diff.sh)
   endif(CORE_BUILD)
+
   set(custom_test_command ${SH_EXECUTABLE} ${custom_test_script})
   set(compare_command ${SH_EXECUTABLE} ${compare_script})
 
@@ -657,6 +674,13 @@
 	)
       set(xwin_target ${FILE_DEPENDS_xwin} xwin)
 
+      if(generic_interactive_device)
+	get_property(FILE_DEPENDS_${generic_interactive_device}
+	  GLOBAL PROPERTY FILE_DEPENDS_${generic_interactive_device}_dyndriver
+	  )
+	set(${generic_interactive_device}_target ${FILE_DEPENDS_${generic_interactive_device}} ${generic_interactive_device})
+      endif(generic_interactive_device)
+
     endif(ENABLE_DYNDRIVERS)
     if(PLD_extcairo)
       add_custom_command(
@@ -897,21 +921,21 @@
     list(APPEND interactive_targets_LIST test_pygcw)
   endif(ENABLE_pygcw)
 
-  if(ENABLE_tcl AND PLD_xwin)
+  if(ENABLE_tcl AND PLD_${generic_interactive_device})
     add_custom_target(test_pltcl_standard_examples
-      COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/pltcl_standard_examples -dev xwin -np
-      DEPENDS ${xwin_target}
+      COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/pltcl_standard_examples -dev ${generic_interactive_device} -np
+      DEPENDS ${${generic_interactive_device}_target}
       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tcl
       )
     add_dependencies(test_pltcl_standard_examples
       pltcl
       tcl_examples
       tclIndex_tcl
-      xwin
+      ${generic_interactive_device}
       )
-    if(FILE_DEPENDS_xwin)
-      add_dependencies(test_pltcl_standard_examples test_xwin_dyndriver)
-    endif(FILE_DEPENDS_xwin)
+    if(FILE_DEPENDS_${generic_interactive_device})
+      add_dependencies(test_pltcl_standard_examples test_${generic_interactive_device}_dyndriver)
+    endif(FILE_DEPENDS_${generic_interactive_device})
     list(APPEND interactive_targets_LIST test_pltcl_standard_examples)
 
     if(BUILD_SHARED_LIBS)
@@ -919,23 +943,23 @@
       # BUILD_SHARED_LIBS is true.
       add_custom_target(test_tclsh_standard_examples
 	COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/tclsh_standard_examples
-	DEPENDS ${xwin_target}
+	DEPENDS ${${generic_interactive_device}_target}
 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tcl
 	)
       add_dependencies(test_tclsh_standard_examples
 	plplottcltk${LIB_TAG}
 	tcl_examples
 	tclIndex_tcl
-	xwin
+	${generic_interactive_device}
 	)
-      if(FILE_DEPENDS_xwin)
-	add_dependencies(test_tclsh_standard_examples test_xwin_dyndriver)
-      endif(FILE_DEPENDS_xwin)
+      if(FILE_DEPENDS_${generic_interactive_device})
+	add_dependencies(test_tclsh_standard_examples test_${generic_interactive_device}_dyndriver)
+      endif(FILE_DEPENDS_${generic_interactive_device})
       list(APPEND interactive_targets_LIST test_tclsh_standard_examples)
     endif(BUILD_SHARED_LIBS)
-  endif(ENABLE_tcl AND PLD_xwin)
+  endif(ENABLE_tcl AND PLD_${generic_interactive_device})
 
-  if(ENABLE_tk AND PLD_tk)
+  if(ENABLE_tkX AND PLD_tk)
     set(targets_examples_tk)
 
     add_custom_target(test_tk_01
@@ -1043,7 +1067,7 @@
       # list(APPEND targets_examples_tk test_wish_standard_examples)
     endif(BUILD_SHARED_LIBS)
 
-    if(ENABLE_itk)
+    if(ENABLE_itkX)
       add_custom_target(test_tk_02
 	COMMAND xtk02 -f ${CMAKE_CURRENT_BINARY_DIR}/tk/tk02
 	DEPENDS ${xwin_target}
@@ -1124,8 +1148,8 @@
 	# list(APPEND targets_examples_tk test_wish_runAlldemos)
       endif(BUILD_SHARED_LIBS)
 
-    endif(ENABLE_itk)
-  endif(ENABLE_tk AND PLD_tk)
+    endif(ENABLE_itkX)
+  endif(ENABLE_tkX AND PLD_tk)
 
   if(targets_examples_tk)
     list(APPEND interactive_targets_LIST ${targets_examples_tk})

Modified: trunk/examples/plplot_configure.cmake_installed_examples.in
===================================================================
--- trunk/examples/plplot_configure.cmake_installed_examples.in	2014-01-12 02:53:54 UTC (rev 12933)
+++ trunk/examples/plplot_configure.cmake_installed_examples.in	2014-01-12 03:12:25 UTC (rev 12934)
@@ -49,6 +49,7 @@
 
 # Interactive bindings
 set(ENABLE_tk @ENABLE_tk@)
+set(ENABLE_tkX @ENABLE_tkX@)
 set(ENABLE_gnome2 @ENABLE_gnome2@)
 set(ENABLE_wxwidgets @ENABLE_wxwidgets@)
 set(ENABLE_qt @ENABLE_qt@)
@@ -137,6 +138,7 @@
 
 if(ENABLE_tk)
   set(ENABLE_itk @ENABLE_itk@)
+  set(ENABLE_itkX @ENABLE_itkX@)
   set(TCL_INCLUDE_PATH @TCL_INCLUDE_PATH@)
   set(TK_INCLUDE_PATH @TK_INCLUDE_PATH@)
   set(TCL_LIBRARY @TCL_LIBRARY@)

Modified: trunk/examples/python/CMakeLists.txt
===================================================================
--- trunk/examples/python/CMakeLists.txt	2014-01-12 02:53:54 UTC (rev 12933)
+++ trunk/examples/python/CMakeLists.txt	2014-01-12 03:12:25 UTC (rev 12934)
@@ -93,7 +93,7 @@
   test_linebreak.py
   )
 
-if(ENABLE_tk)
+if(ENABLE_tkX)
   set(python_SCRIPTS ${python_SCRIPTS}
     pytkdemo
     x01.py
@@ -116,7 +116,7 @@
     x18.py
     x19.py
     )
-endif(ENABLE_tk)
+endif(ENABLE_tkX)
 
 if(ENABLE_pyqt4)
   set(

Modified: trunk/examples/tcl/tclsh_standard_examples.in
===================================================================
--- trunk/examples/tcl/tclsh_standard_examples.in	2014-01-12 02:53:54 UTC (rev 12933)
+++ trunk/examples/tcl/tclsh_standard_examples.in	2014-01-12 03:12:25 UTC (rev 12934)
@@ -1,7 +1,5 @@
 #!@SH_EXECUTABLE@
 # Examples 14 and 31 commented out - see Tk standard_examples.in
-# Choose the xwin device below although any other interactive
-# device would work.  
 # The following exec command reexecutes the script under tclsh.  This
 # is possible because all comment lines are ignored by tclsh including
 # continued ones with a trailing backslash like this one \
@@ -9,7 +7,7 @@
 lappend auto_path @pkgIndex_LOCATION@
 package require Pltcl
 source tcldemos.tcl
-plsdev "xwin"
+plsdev "@generic_interactive_device@"
 plinit
 # Disable pausing.
 plspause 0

Modified: trunk/examples/tk/CMakeLists.txt
===================================================================
--- trunk/examples/tk/CMakeLists.txt	2014-01-12 02:53:54 UTC (rev 12933)
+++ trunk/examples/tk/CMakeLists.txt	2014-01-12 03:12:25 UTC (rev 12934)
@@ -122,13 +122,18 @@
   DEPENDS ${tk_FILES} ${CMAKE_CURRENT_BINARY_DIR}/tclIndex
   )
 
+set(tk_SRC)
+if(ENABLE_tkX)
+  list(APPEND tk_SRC xtk01.c)
+endif(ENABLE_tkX)
+
 # The third example is run using a configured shell script which invokes
 # plserver so there is no source code to be compiled.
-set(tk_SRC xtk01.c)
+
 # The second and fourth Tk examples depend on Itk to work.
-if(ENABLE_itk)
+if(ENABLE_itkX)
   list(APPEND tk_SRC xtk02.c xtk04.c)
-endif(ENABLE_itk)
+endif(ENABLE_itkX)
 
 # The first, second, and fourth tk examples depend on configured bang
 # scripts to work which depends directly on the executables, xtk01,
@@ -150,14 +155,14 @@
   wish_standard_examples
   )
 # These examples depend on Itk to work.
-if(ENABLE_itk)
+if(ENABLE_itkX)
   list(APPEND tk_SCRIPTS 
     tk02
     tk04
     plserver_runAllDemos
     wish_runAllDemos
     )
-endif(ENABLE_itk)
+endif(ENABLE_itkX)
 
 if(BUILD_TEST)
   if(CORE_BUILD)

Modified: trunk/examples/tk/CMakeLists.txt_installed_examples_tk
===================================================================
--- trunk/examples/tk/CMakeLists.txt_installed_examples_tk	2014-01-12 02:53:54 UTC (rev 12933)
+++ trunk/examples/tk/CMakeLists.txt_installed_examples_tk	2014-01-12 03:12:25 UTC (rev 12934)
@@ -114,10 +114,10 @@
 set(tk_SCRIPTS tk01 tk03)
 set(tk_SRC xtk01.c)
   
-if(ENABLE_itk)
+if(ENABLE_itkX)
   list(APPEND tk_SCRIPTS tk02 tk04)
   list(APPEND tk_SRC xtk02.c xtk04.c)
-endif(ENABLE_itk)
+endif(ENABLE_itkX)
 
 include_directories(
   ${TCL_INCLUDE_PATH}

Modified: trunk/plplot_test/plplot-test-interactive.sh.in
===================================================================
--- trunk/plplot_test/plplot-test-interactive.sh.in	2014-01-12 02:53:54 UTC (rev 12933)
+++ trunk/plplot_test/plplot-test-interactive.sh.in	2014-01-12 03:12:25 UTC (rev 12934)
@@ -2,7 +2,7 @@
 # -*- mode: shell-script -*-
 # $Id$
 #
-# Copyright (C) 2009 Alan W. Irwin
+# Copyright (C) 2009-2014 Alan W. Irwin
 #
 # This file is part of PLplot.
 #
@@ -207,28 +207,28 @@
     COUNT=$(( $COUNT + 1 ))
 fi
 
-if [ "@ENABLE_tk@" = "ON" ] ; then
+if [ "@ENABLE_tkX@" = "ON" ] ; then
     INDEX_LIST="$INDEX_LIST $COUNT"
     DIRECTORY[$COUNT]="${EXAMPLES_DIR}/tk"
     COMMAND[$COUNT]="./xtk01 -f tk01"
     COUNT=$(( $COUNT + 1 ))
 fi
 
-if [ "@ENABLE_itk@" = "ON" ] ; then
+if [ "@ENABLE_itkX@" = "ON" ] ; then
     INDEX_LIST="$INDEX_LIST $COUNT"
     DIRECTORY[$COUNT]="${EXAMPLES_DIR}/tk"
     COMMAND[$COUNT]="./xtk02 -f tk02"
     COUNT=$(( $COUNT + 1 ))
 fi
 
-if [ "@ENABLE_tk@" = "ON" ] ; then
+if [ "@ENABLE_tkX@" = "ON" ] ; then
     INDEX_LIST="$INDEX_LIST $COUNT"
     DIRECTORY[$COUNT]="${EXAMPLES_DIR}/tk"
     COMMAND[$COUNT]="plserver -f tk03"
     COUNT=$(( $COUNT + 1 ))
 fi
 
-if [ "@ENABLE_itk@" = "ON" ] ; then
+if [ "@ENABLE_itkX@" = "ON" ] ; then
     INDEX_LIST="$INDEX_LIST $COUNT"
     DIRECTORY[$COUNT]="${EXAMPLES_DIR}/tk"
     COMMAND[$COUNT]="./xtk04 -f tk04"
@@ -256,7 +256,7 @@
     popd
 done
 
-if [ "@ENABLE_tk@" = "ON" ] ; then
+if [ "@ENABLE_tkX@" = "ON" ] ; then
 
     cd "${SRC_EXAMPLES_DIR}"/tcl
     plserver <<EOF

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12933] trunk/bindings/tk

From: <ai...@us...> - 2014-01-12 02:53:59

Revision: 12933
          http://sourceforge.net/p/plplot/code/12933
Author:   airwin
Date:     2014-01-12 02:53:54 +0000 (Sun, 12 Jan 2014)
Log Message:
-----------
Fix build errors on MinGW.

Modified Paths:
--------------
    trunk/bindings/tk/pltkd.h
    trunk/bindings/tk/tcpip.c

Modified: trunk/bindings/tk/pltkd.h
===================================================================
--- trunk/bindings/tk/pltkd.h	2014-01-12 02:18:40 UTC (rev 12932)
+++ trunk/bindings/tk/pltkd.h	2014-01-12 02:53:54 UTC (rev 12933)
@@ -21,8 +21,9 @@
 #include <dp.h>
 #endif
 
-// Define the type pid_t - a dummy for the moment - for MS Windows
-#if defined ( __WIN32__ )
+// typedef the type pid_t - a dummy for the moment - for MS Windows
+// platforms other than those (e.g., MinGW) that typedef it already.
+#if defined ( __WIN32__ ) && !defined ( __MINGW32__ )
 typedef unsigned int   pid_t;
 #endif
 

Modified: trunk/bindings/tk/tcpip.c
===================================================================
--- trunk/bindings/tk/tcpip.c	2014-01-12 02:18:40 UTC (rev 12932)
+++ trunk/bindings/tk/tcpip.c	2014-01-12 02:53:54 UTC (rev 12933)
@@ -110,6 +110,19 @@
 #endif
 #include <errno.h>
 
+#if defined ( __WIN32__ )
+// This is the source of the WSAEWOULDBLOCK macro on Windows platforms.
+  #include <winerror.h>
+#endif
+
+#if defined ( EWOULDBLOCK )
+  #define PLPLOT_EWOULDBLOCK    EWOULDBLOCK
+#elif defined ( WSAEWOULDBLOCK )
+  #define PLPLOT_EWOULDBLOCK    WSAEWOULDBLOCK
+#else
+  #error broken system where neither EWOULDBLOCK nor WSAEWOULDBLOCK macros are #defined
+#endif
+
 // Supply dummy macros for the low-level I/O functions - Windows
 #if defined ( __WIN32__ )
 #define read( a, b, c )     0
@@ -561,7 +574,7 @@
     // return a null string.
     //
 
-    if ( errno == EWOULDBLOCK || errno == EAGAIN )
+    if ( errno == PLPLOT_EWOULDBLOCK || errno == EAGAIN )
     {
         Tcl_ResetResult( interp );
         return TCL_OK;
@@ -686,7 +699,7 @@
 
     if ( (unsigned) numSent != packetLen )
     {
-        if ( ( errno == 0 ) || ( errno == EWOULDBLOCK || errno == EAGAIN ) )
+        if ( ( errno == 0 ) || ( errno == PLPLOT_EWOULDBLOCK || errno == EAGAIN ) )
         {
             //
             // Non-blocking I/O: return number of bytes actually sent.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12932] trunk/drivers/ntk.c

From: <ai...@us...> - 2014-01-12 02:18:44

Revision: 12932
          http://sourceforge.net/p/plplot/code/12932
Author:   airwin
Date:     2014-01-12 02:18:40 +0000 (Sun, 12 Jan 2014)
Log Message:
-----------
Get rid of debugging "flush" output to stderr.

Modified Paths:
--------------
    trunk/drivers/ntk.c

Modified: trunk/drivers/ntk.c
===================================================================
--- trunk/drivers/ntk.c	2014-01-12 02:14:07 UTC (rev 12931)
+++ trunk/drivers/ntk.c	2014-01-12 02:18:40 UTC (rev 12932)
@@ -342,7 +342,7 @@
 
     if ( curpts == NPTS )
     {
-        fprintf( stderr, "\nflush: %d ", curpts );
+        //fprintf( stderr, "\nflush: %d ", curpts );
         flushbuffer( pls );
     }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12931] trunk/drivers/ntk.c

From: <ai...@us...> - 2014-01-12 02:14:12

Revision: 12931
          http://sourceforge.net/p/plplot/code/12931
Author:   airwin
Date:     2014-01-12 02:14:07 +0000 (Sun, 12 Jan 2014)
Log Message:
-----------
Fix overflowed cmd buffer caused by example 27.

Modified Paths:
--------------
    trunk/drivers/ntk.c

Modified: trunk/drivers/ntk.c
===================================================================
--- trunk/drivers/ntk.c	2014-01-10 20:05:57 UTC (rev 12930)
+++ trunk/drivers/ntk.c	2014-01-12 02:14:07 UTC (rev 12931)
@@ -77,11 +77,15 @@
 static Tk_Window  mainw;          // tk main window
 
 static char       curcolor[80];   // current color in #rrggbb notation
-static char       cmd[10000];     // buffer to build command to interp
-static int        ccanv = 0;      // current canvas number
-static char       base[80];       // name of frame that contains the canvas
-static char       dash[80];       // dash string, as <mark space>*
 
+// 12000 is large enough to satisfy example 27 needs without
+// erroring out in plD_polyline_ntk.  Quadruple that to be conservative.
+#define PLPLOT_NTK_CMD_SIZE    48000
+static char cmd[PLPLOT_NTK_CMD_SIZE]; // buffer to build command to interp
+static int  ccanv = 0;                // current canvas number
+static char base[80];                 // name of frame that contains the canvas
+static char dash[80];                 // dash string, as <mark space>*
+
 // line buffering
 #define NPTS    1000
 static short xold = -1, yold = -1; // last point of last 2 points line
@@ -103,7 +107,7 @@
 static void
 tk_cmd( const char *gcmd )
 {
-    static char scmd[10000];
+    static char scmd[PLPLOT_NTK_CMD_SIZE];
 
     if ( local )
         Tcl_Eval( interp, gcmd );
@@ -351,8 +355,14 @@
     // there must exist a way to code this using the tk C API
     j = sprintf( cmd, "$plf.f2.c%d create line ", ccanv );
     for ( i = 0; i < npts; i++ )
+    {
+        // To be completely safe, assume 5 characters to the left of the
+        // decimal point ==> 2*(5+3) characters written per sprintf
+        // call.
+        if ( ( j + 16 ) > PLPLOT_NTK_CMD_SIZE )
+            plexit( "plD_polyline_ntk: too many x, y values to hold in static cmd array" );
         j += sprintf( &cmd[j], "%.1f %.1f ", xa[i] / scale, ymax - ya[i] / scale );
-
+    }
     j += sprintf( &cmd[j], " -fill %s", curcolor );
     if ( dash[0] == '-' )
         j += sprintf( &cmd[j], " %s", dash );
@@ -526,7 +536,7 @@
     case PLESC_FILL:
         if ( pls->patt != 0 )
         {
-            // this is a hack! The real solution is in the if(0) bellow
+            // this is a hack! The real solution is in the if(0) below
             pls->xpmm *= scale;
             pls->ypmm *= scale;
             plfill_soft( pls->dev_x, pls->dev_y, pls->dev_npts );

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12930] trunk/bindings/tk/PLWin.itk

From: <ai...@us...> - 2014-01-10 20:06:02

Revision: 12930
          http://sourceforge.net/p/plplot/code/12930
Author:   airwin
Date:     2014-01-10 20:05:57 +0000 (Fri, 10 Jan 2014)
Log Message:
-----------
Follow the directions in bindings/tcl/plitclgen to run that perl
script in the bindings/tcl directory and replace the
methods listed near the end of bindings/tk/PLWin.itk with the
gen.itcl results that are generated by plitclgen.

It has been many years since this was done before so the effect of all
this is a fairly large number of additions to the methods listed in
PLWin.itk (because the PLplot API has expanded) and the removal of a
few methods that are no longer a part of the PLplot API.

Modified Paths:
--------------
    trunk/bindings/tk/PLWin.itk

Modified: trunk/bindings/tk/PLWin.itk
===================================================================
--- trunk/bindings/tk/PLWin.itk	2014-01-10 07:43:02 UTC (rev 12929)
+++ trunk/bindings/tk/PLWin.itk	2014-01-10 20:05:57 UTC (rev 12930)
@@ -70,10 +70,22 @@
 # reason, then add the method name to the ignore list in plitclgen,
 # and provide an explicit coding, ABOVE THIS LINE.
 
+    method pl_setcontlabelformat {args} {
+        eval $plwin cmd pl_setcontlabelformat $args
+    }
+
+    method pl_setcontlabelparam {args} {
+        eval $plwin cmd pl_setcontlabelparam $args
+    }
+
     method pladv {args} {
         eval $plwin cmd pladv $args
     }
 
+    method plarc {args} {
+        eval $plwin cmd plarc $args
+    }
+
     method plaxes {args} {
         eval $plwin cmd plaxes $args
     }
@@ -94,6 +106,18 @@
         eval $plwin cmd plbox3 $args
     }
 
+    method plbtime {args} {
+        eval $plwin cmd plbtime $args
+    }
+
+    method plcalc_world {args} {
+        eval $plwin cmd plcalc_world $args
+    }
+
+    method plclear {args} {
+        eval $plwin cmd plclear $args
+    }
+
     method plcol0 {args} {
         eval $plwin cmd plcol0 $args
     }
@@ -102,6 +126,18 @@
         eval $plwin cmd plcol1 $args
     }
 
+    method plconfigtime {args} {
+        eval $plwin cmd plconfigtime $args
+    }
+
+    method plcpstrm {args} {
+        eval $plwin cmd plcpstrm $args
+    }
+
+    method plctime {args} {
+        eval $plwin cmd plctime $args
+    }
+
     method pldid2pc {args} {
         eval $plwin cmd pldid2pc $args
     }
@@ -114,6 +150,10 @@
         eval $plwin cmd plenv $args
     }
 
+    method plenv0 {args} {
+        eval $plwin cmd plenv0 $args
+    }
+
     method pleop {args} {
         eval $plwin cmd pleop $args
     }
@@ -130,6 +170,14 @@
         eval $plwin cmd plfill $args
     }
 
+    method plfill3 {args} {
+        eval $plwin cmd plfill3 $args
+    }
+
+    method plflush {args} {
+        eval $plwin cmd plflush $args
+    }
+
     method plfont {args} {
         eval $plwin cmd plfont $args
     }
@@ -142,10 +190,34 @@
         eval $plwin cmd plgchr $args
     }
 
+    method plgcmap1_range {args} {
+        eval $plwin cmd plgcmap1_range $args
+    }
+
     method plgcol0 {args} {
         eval $plwin cmd plgcol0 $args
     }
 
+    method plgcol0a {args} {
+        eval $plwin cmd plgcol0a $args
+    }
+
+    method plgcolbg {args} {
+        eval $plwin cmd plgcolbg $args
+    }
+
+    method plgcolbga {args} {
+        eval $plwin cmd plgcolbga $args
+    }
+
+    method plgcompression {args} {
+        eval $plwin cmd plgcompression $args
+    }
+
+    method plgdev {args} {
+        eval $plwin cmd plgdev $args
+    }
+
     method plgdidev {args} {
         eval $plwin cmd plgdidev $args
     }
@@ -158,6 +230,26 @@
         eval $plwin cmd plgdiplt $args
     }
 
+    method plgesc {args} {
+        eval $plwin cmd plgesc $args
+    }
+
+    method plgfci {args} {
+        eval $plwin cmd plgfci $args
+    }
+
+    method plgfnam {args} {
+        eval $plwin cmd plgfnam $args
+    }
+
+    method plgfont {args} {
+        eval $plwin cmd plgfont $args
+    }
+
+    method plglevel {args} {
+        eval $plwin cmd plglevel $args
+    }
+
     method plgpage {args} {
         eval $plwin cmd plgpage $args
     }
@@ -166,6 +258,10 @@
         eval $plwin cmd plgra $args
     }
 
+    method plgradient {args} {
+        eval $plwin cmd plgradient $args
+    }
+
     method plgspa {args} {
         eval $plwin cmd plgspa $args
     }
@@ -174,6 +270,18 @@
         eval $plwin cmd plgstrm $args
     }
 
+    method plgver {args} {
+        eval $plwin cmd plgver $args
+    }
+
+    method plgvpd {args} {
+        eval $plwin cmd plgvpd $args
+    }
+
+    method plgvpw {args} {
+        eval $plwin cmd plgvpw $args
+    }
+
     method plgxax {args} {
         eval $plwin cmd plgxax $args
     }
@@ -190,10 +298,14 @@
         eval $plwin cmd plhist $args
     }
 
-    method plhls {args} {
-        eval $plwin cmd plhls $args
+    method plhlsrgb {args} {
+        eval $plwin cmd plhlsrgb $args
     }
 
+    method plinit {args} {
+        eval $plwin cmd plinit $args
+    }
+
     method pljoin {args} {
         eval $plwin cmd pljoin $args
     }
@@ -202,6 +314,10 @@
         eval $plwin cmd pllab $args
     }
 
+    method pllightsource {args} {
+        eval $plwin cmd pllightsource $args
+    }
+
     method plline {args} {
         eval $plwin cmd plline $args
     }
@@ -214,10 +330,18 @@
         eval $plwin cmd pllsty $args
     }
 
+    method plmkstrm {args} {
+        eval $plwin cmd plmkstrm $args
+    }
+
     method plmtex {args} {
         eval $plwin cmd plmtex $args
     }
 
+    method plmtex3 {args} {
+        eval $plwin cmd plmtex3 $args
+    }
+
     method plpat {args} {
         eval $plwin cmd plpat $args
     }
@@ -250,54 +374,86 @@
         eval $plwin cmd plptex $args
     }
 
+    method plptex3 {args} {
+        eval $plwin cmd plptex3 $args
+    }
+
     method plreplot {args} {
         eval $plwin cmd plreplot $args
     }
 
-    method plrgb {args} {
-        eval $plwin cmd plrgb $args
+    method plrgbhls {args} {
+        eval $plwin cmd plrgbhls $args
     }
 
-    method plrgb1 {args} {
-        eval $plwin cmd plrgb1 $args
-    }
-
     method plschr {args} {
         eval $plwin cmd plschr $args
     }
 
-    method plscmap0n {args} {
-        eval $plwin cmd plscmap0n $args
+    method plscmap0 {args} {
+        eval $plwin cmd plscmap0 $args
     }
 
-    method plscmap1n {args} {
-        eval $plwin cmd plscmap1n $args
+    method plscmap0a {args} {
+        eval $plwin cmd plscmap0a $args
     }
 
-    method plscmap0 {args} {
-        eval $plwin cmd plscmap0 $args
+    method plscmap0n {args} {
+        eval $plwin cmd plscmap0n $args
     }
 
     method plscmap1 {args} {
         eval $plwin cmd plscmap1 $args
     }
 
+    method plscmap1a {args} {
+        eval $plwin cmd plscmap1a $args
+    }
+
     method plscmap1l {args} {
         eval $plwin cmd plscmap1l $args
     }
 
+    method plscmap1la {args} {
+        eval $plwin cmd plscmap1la $args
+    }
+
+    method plscmap1n {args} {
+        eval $plwin cmd plscmap1n $args
+    }
+
+    method plscmap1_range {args} {
+        eval $plwin cmd plscmap1_range $args
+    }
+
     method plscol0 {args} {
         eval $plwin cmd plscol0 $args
     }
 
+    method plscol0a {args} {
+        eval $plwin cmd plscol0a $args
+    }
+
     method plscolbg {args} {
         eval $plwin cmd plscolbg $args
     }
 
+    method plscolbga {args} {
+        eval $plwin cmd plscolbga $args
+    }
+
     method plscolor {args} {
         eval $plwin cmd plscolor $args
     }
 
+    method plscompression {args} {
+        eval $plwin cmd plscompression $args
+    }
+
+    method plsdev {args} {
+        eval $plwin cmd plsdev $args
+    }
+
     method plsdidev {args} {
         eval $plwin cmd plsdidev $args
     }
@@ -318,6 +474,22 @@
         eval $plwin cmd plsdiplz $args
     }
 
+    method plseed {args} {
+        eval $plwin cmd plseed $args
+    }
+
+    method plsesc {args} {
+        eval $plwin cmd plsesc $args
+    }
+
+    method plsfci {args} {
+        eval $plwin cmd plsfci $args
+    }
+
+    method plsfont {args} {
+        eval $plwin cmd plsfont $args
+    }
+
     method plsmaj {args} {
         eval $plwin cmd plsmaj $args
     }
@@ -354,6 +526,30 @@
         eval $plwin cmd plssym $args
     }
 
+    method plstar {args} {
+        eval $plwin cmd plstar $args
+    }
+
+    method plstart {args} {
+        eval $plwin cmd plstart $args
+    }
+
+    method plstring {args} {
+        eval $plwin cmd plstring $args
+    }
+
+    method plstring3 {args} {
+        eval $plwin cmd plstring3 $args
+    }
+
+    method plstripa {args} {
+        eval $plwin cmd plstripa $args
+    }
+
+    method plstripd {args} {
+        eval $plwin cmd plstripd $args
+    }
+
     method plstyl {args} {
         eval $plwin cmd plstyl $args
     }
@@ -366,10 +562,6 @@
         eval $plwin cmd plsxax $args
     }
 
-    method plsxwin {args} {
-        eval $plwin cmd plsxwin $args
-    }
-
     method plsyax {args} {
         eval $plwin cmd plsyax $args
     }
@@ -386,6 +578,10 @@
         eval $plwin cmd pltext $args
     }
 
+    method pltimefmt {args} {
+        eval $plwin cmd pltimefmt $args
+    }
+
     method plvasp {args} {
         eval $plwin cmd plvasp $args
     }
@@ -413,4 +609,9 @@
     method plwind {args} {
         eval $plwin cmd plwind $args
     }
+
+    method plxormod {args} {
+        eval $plwin cmd plxormod $args
+    }
+
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12929] trunk/cmake/modules/tcl-related.cmake

From: <ai...@us...> - 2014-01-10 07:43:05

Revision: 12929
          http://sourceforge.net/p/plplot/code/12929
Author:   airwin
Date:     2014-01-10 07:43:02 +0000 (Fri, 10 Jan 2014)
Log Message:
-----------
Improve the reliability of determining the Tcl and Tk library version
numbers by only version parsing the library name rather the full path
of the library name.  This change solved a bug where the library
version was being parsed from the wine (!) version number that I 
happened to be using in my build tree prefix to keep track of various
results for various wine versions.

Add some additional names (with a compact numeric suffix and with no
numerical suffix at all) to search for the itcl and itk libraries.
This change solved a bug where epa_build creates itcl and itk
libraries with compact numerical suffixes on the MinGW/MSYS platform.

Modified Paths:
--------------
    trunk/cmake/modules/tcl-related.cmake

Modified: trunk/cmake/modules/tcl-related.cmake
===================================================================
--- trunk/cmake/modules/tcl-related.cmake	2014-01-10 01:45:35 UTC (rev 12928)
+++ trunk/cmake/modules/tcl-related.cmake	2014-01-10 07:43:02 UTC (rev 12929)
@@ -128,7 +128,8 @@
 
   # Sanity checking of Tcl version consistency _if_ a Tcl version string
   # can be extracted from the Tcl library name.
-  string(REGEX MATCH "[0-9]+[.]?[0-9]+" library_version ${TCL_LIBRARY})
+  get_filename_component(library_name ${TCL_LIBRARY} NAME)
+  string(REGEX MATCH "[0-9]+[.]?[0-9]+" library_version ${library_name})
   if(library_version)
     # If no decimal point in version insert as the second character.
     if(NOT library_version MATCHES "[.]")
@@ -226,8 +227,9 @@
       if(ENABLE_itcl)
         message(STATUS "Looking for itcl library")
 	# Search first for epa_build install location.
-        find_library(ITCL_LIBRARY itcl${PLPLOT_ITCL_VERSION} HINTS ${TCL_LIBRARY_PATH}/itcl${PLPLOT_ITCL_VERSION})
-        find_library(ITCL_LIBRARY itcl${PLPLOT_ITCL_VERSION} HINTS ${TCL_LIBRARY_PATH})
+	string(REGEX REPLACE "\\." "" COMPACT_PLPLOT_ITCL_VERSION ${PLPLOT_ITCL_VERSION})
+        find_library(ITCL_LIBRARY NAMES itcl${PLPLOT_ITCL_VERSION} itcl${COMPACT_PLPLOT_ITCL_VERSION} itcl HINTS ${TCL_LIBRARY_PATH}/itcl${PLPLOT_ITCL_VERSION})
+        find_library(ITCL_LIBRARY NAMES itcl${PLPLOT_ITCL_VERSION} itcl${COMPACT_PLPLOT_ITCL_VERSION} itcl HINTS ${TCL_LIBRARY_PATH})
         if(ITCL_LIBRARY)
           message(STATUS "Looking for itcl library - found")
 	  message(STATUS "ITCL_LIBRARY = ${ITCL_LIBRARY}")
@@ -305,7 +307,8 @@
 		# Sanity checking of Tk version consistency _if_ a Tk
 		# version string can be extracted from the Tk library
 		# name.
-		string(REGEX MATCH "[0-9]+[.]?[0-9]+" library_version ${TK_LIBRARY})
+		get_filename_component(library_name ${TK_LIBRARY} NAME)
+		string(REGEX MATCH "[0-9]+[.]?[0-9]+" library_version ${library_name})
 		if(library_version)
 		  # If no decimal point in version insert as the second character.
 		  if(NOT library_version MATCHES "[.]")
@@ -467,8 +470,9 @@
       if(ENABLE_itk)
         message(STATUS "Looking for itk library")
 	# Search first for epa_build install location.
-        find_library(ITK_LIBRARY itk${PLPLOT_ITK_VERSION} HINTS ${TCL_LIBRARY_PATH}/itk${PLPLOT_ITK_VERSION})
-        find_library(ITK_LIBRARY itk${PLPLOT_ITK_VERSION} HINTS ${TCL_LIBRARY_PATH})
+	string(REGEX REPLACE "\\." "" COMPACT_PLPLOT_ITK_VERSION ${PLPLOT_ITK_VERSION})
+        find_library(ITK_LIBRARY NAMES itk${PLPLOT_ITK_VERSION} itk${COMPACT_PLPLOT_ITK_VERSION} itk HINTS ${TK_LIBRARY_PATH}/itk${PLPLOT_ITK_VERSION})
+        find_library(ITK_LIBRARY NAMES itk${PLPLOT_ITK_VERSION} itk${COMPACT_PLPLOT_ITK_VERSION} itk HINTS ${TK_LIBRARY_PATH})
         if(ITK_LIBRARY)
           message(STATUS "Looking for itk library - found")
 	  message(STATUS "ITK_LIBRARY = ${ITK_LIBRARY}")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12928] trunk/bindings/tcl/CMakeLists.txt

From: <ai...@us...> - 2014-01-10 01:45:38

Revision: 12928
          http://sourceforge.net/p/plplot/code/12928
Author:   airwin
Date:     2014-01-10 01:45:35 +0000 (Fri, 10 Jan 2014)
Log Message:
-----------
Only link the pltcl executable to libitcl when appropriate.

Modified Paths:
--------------
    trunk/bindings/tcl/CMakeLists.txt

Modified: trunk/bindings/tcl/CMakeLists.txt
===================================================================
--- trunk/bindings/tcl/CMakeLists.txt	2014-01-10 01:44:07 UTC (rev 12927)
+++ trunk/bindings/tcl/CMakeLists.txt	2014-01-10 01:45:35 UTC (rev 12928)
@@ -580,7 +580,11 @@
 
   add_executable(pltcl pltcl.c)
 
-  target_link_libraries(pltcl plplot${LIB_TAG} plplottcltk_Main${LIB_TAG} plplottcltk${LIB_TAG} ${ITCL_LIBRARY} ${TCL_LIBRARY})
+  if(ENABLE_itcl)
+    target_link_libraries(pltcl plplot${LIB_TAG} plplottcltk_Main${LIB_TAG} plplottcltk${LIB_TAG} ${ITCL_LIBRARY} ${TCL_LIBRARY})
+  else(ENABLE_itcl)
+    target_link_libraries(pltcl plplot${LIB_TAG} plplottcltk_Main${LIB_TAG} plplottcltk${LIB_TAG} ${TCL_LIBRARY})
+  endif(ENABLE_itcl)
 
   if(USE_RPATH)
     set_target_properties(pltcl

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12927] trunk/cmake/modules/tcl-related.cmake

From: <ai...@us...> - 2014-01-10 01:44:13

Revision: 12927
          http://sourceforge.net/p/plplot/code/12927
Author:   airwin
Date:     2014-01-10 01:44:07 +0000 (Fri, 10 Jan 2014)
Log Message:
-----------
Move setup of RPATH directory lists to better locations in the logic
where there has been complete success at finding the associated Tcl
extension package.

Modified Paths:
--------------
    trunk/cmake/modules/tcl-related.cmake

Modified: trunk/cmake/modules/tcl-related.cmake
===================================================================
--- trunk/cmake/modules/tcl-related.cmake	2014-01-09 21:38:57 UTC (rev 12926)
+++ trunk/cmake/modules/tcl-related.cmake	2014-01-10 01:44:07 UTC (rev 12927)
@@ -78,9 +78,6 @@
 
     get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH)
     message(STATUS "TCL_LIBRARY_PATH = ${TCL_LIBRARY_PATH}")
-    set(TCL_RPATH ${TCL_LIBRARY_PATH})
-    set(TCL_TK_RPATH ${TCL_RPATH})
-    set(TCL_TK_ITCL_ITK_RPATH ${TCL_RPATH})
 
     if(TCL_TCLSH)
       message(STATUS "Looking for tclsh - found")
@@ -125,6 +122,10 @@
 if(ENABLE_tcl)
   message(STATUS "PLPLOT_TCL_VERSION = ${PLPLOT_TCL_VERSION}")
 
+  set(TCL_RPATH ${TCL_LIBRARY_PATH})
+  set(TCL_TK_RPATH ${TCL_RPATH})
+  set(TCL_TK_ITCL_ITK_RPATH ${TCL_RPATH})
+
   # Sanity checking of Tcl version consistency _if_ a Tcl version string
   # can be extracted from the Tcl library name.
   string(REGEX MATCH "[0-9]+[.]?[0-9]+" library_version ${TCL_LIBRARY})
@@ -256,10 +257,6 @@
     message(STATUS "TK_LIBRARY = ${TK_LIBRARY}")
     message(STATUS "TK_STUB_LIBRARY = ${TK_STUB_LIBRARY}")
 
-    get_filename_component(TK_LIBRARY_PATH ${TK_LIBRARY} PATH)
-    list(APPEND TCL_TK_RPATH ${TK_LIBRARY_PATH})
-    list(APPEND TCL_TK_ITCL_ITK_RPATH ${TK_LIBRARY_PATH})
-
     message(STATUS "TK_LIBRARY_PATH = ${TK_LIBRARY_PATH}")
     if(NOT ${TK_LIBRARY_PATH} STREQUAL ${TCL_LIBRARY_PATH})
       message(STATUS "WARNING: the Tcl and Tk library locations are inconsistent so those libraries are likely not compatible")
@@ -382,10 +379,14 @@
     endif(WIN32 AND NOT CYGWIN)
   endif(ENABLE_tk AND NOT X11_FOUND)
 
-  if(NOT ENABLE_tk)
+  if(ENABLE_tk)
+    get_filename_component(TK_LIBRARY_PATH ${TK_LIBRARY} PATH)
+    list(APPEND TCL_TK_RPATH ${TK_LIBRARY_PATH})
+    list(APPEND TCL_TK_ITCL_ITK_RPATH ${TK_LIBRARY_PATH})
+  else(ENABLE_tk)
     message(STATUS "WARNING: Because Tk is disabled must disable Itk as well")
     set(ENABLE_itk OFF CACHE BOOL "Enable Itk interface code" FORCE)
-  endif(NOT ENABLE_tk)
+  endif(ENABLE_tk)
 
   if(ENABLE_itk)
     if(USE_INCRTCL_VERSION_4)
@@ -472,8 +473,6 @@
           message(STATUS "Looking for itk library - found")
 	  message(STATUS "ITK_LIBRARY = ${ITK_LIBRARY}")
 	  set(HAVE_ITK ON)
-	  get_filename_component(ITK_LIBRARY_PATH ${ITK_LIBRARY} PATH)
-	  list(APPEND TCL_TK_ITCL_ITK_RPATH ${ITK_LIBRARY_PATH})
 
 	  # Test version consistency between iwidgets, itk, and itcl.
 	  if(NOT IWIDGETS_VERSIONS_LIST)
@@ -535,6 +534,8 @@
 	    message(STATUS "Checking that the Iwidgets, Itk, and Itcl packages are consistent")
 	    if(CONSISTENT_ITCL_VERSION STREQUAL PLPLOT_ITCL_VERSION AND CONSISTENT_ITK_VERSION STREQUAL PLPLOT_ITK_VERSION)
 	      message(STATUS "Checking that the Iwidgets, Itk, and Itcl packages are consistent - true")
+	      get_filename_component(ITK_LIBRARY_PATH ${ITK_LIBRARY} PATH)
+	      list(APPEND TCL_TK_ITCL_ITK_RPATH ${ITK_LIBRARY_PATH})
 	    else(CONSISTENT_ITCL_VERSION STREQUAL PLPLOT_ITCL_VERSION AND CONSISTENT_ITK_VERSION STREQUAL PLPLOT_ITK_VERSION)
 	      message(STATUS "PLPLOT_ITK_VERSION = ${PLPLOT_ITK_VERSION}")
 	      message(STATUS "CONSISTENT_ITK_VERSION = ${CONSISTENT_ITK_VERSION}")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12926] trunk/cmake/epa_build/itk3

From: <ai...@us...> - 2014-01-09 21:39:02

Revision: 12926
          http://sourceforge.net/p/plplot/code/12926
Author:   airwin
Date:     2014-01-09 21:38:57 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
Backport itk version 4 autotools build-system changes to itk version 3 to fix
internal error in the autotools-generated configure script that occurs
otherwise for the epa_build of itk3 on the MinGW/MSYS platform.

Tested by: Alan W. Irwin <ai...@us...> on both Linux
and MinGW/MSYS/Wine platforms using the epa_build
-DBUILD_THE_BUILDTOOLS=ON cmake option and by running the resulting
build_itk3 target.

Modified Paths:
--------------
    trunk/cmake/epa_build/itk3/CMakeLists.txt

Added Paths:
-----------
    trunk/cmake/epa_build/itk3/autotools_backport.patch

Modified: trunk/cmake/epa_build/itk3/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/itk3/CMakeLists.txt	2014-01-07 20:57:43 UTC (rev 12925)
+++ trunk/cmake/epa_build/itk3/CMakeLists.txt	2014-01-09 21:38:57 UTC (rev 12926)
@@ -41,6 +41,14 @@
   source_PATH
   ) 
 
+if(MSYS_PLATFORM)
+  set(library_prefix)
+  set(library_suffix .dll)
+else(MSYS_PLATFORM)
+  set(library_prefix lib)
+  set(library_suffix .so)
+endif(MSYS_PLATFORM)
+
 set(CFLAGS "$ENV{CFLAGS}")
 # Drop -fvisibility=hidden since that option does not work for itk3.
 string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}")
@@ -51,10 +59,16 @@
 # But currently just use the ordinary install location.
 set(INCRTCL3_PREFIX ${EPA_CMAKE_INSTALL_PREFIX})
 
+set(VERSION 3.3)
+set(DIRVERSION 3.3)
+set(ITCL3_DIRVERSION 3.4)
+if(MSYS_PLATFORM)
+  string(REGEX REPLACE "\\." "" LIBVERSION ${DIRVERSION})
+else(MSYS_PLATFORM)
+  set(LIBVERSION ${DIRVERSION})
+endif(MSYS_PLATFORM)
+
 # Data that is related to downloads.
-set(VERSION 3.3)
-set(LIBVERSION 3.3)
-set(ITCL3_LIBVERSION 3.4)
 set(URL http://downloads.sourceforge.net/project/incrtcl/%5bIncr%20Tcl_Tk%5d-source/${VERSION}-RC/itk${VERSION}.tar.gz)
 set(DOWNLOAD_HASH_TYPE MD5)
 set(DOWNLOAD_HASH a97c17f3cfa5e377f43073c653c501b5)
@@ -70,22 +84,45 @@
   URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
   # Order of CPPFLAGS is important since want to access the version 3
   # itcl header.
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CPPFLAGS=-I${INCRTCL3_PREFIX}/include/itcl${ITCL3_LIBVERSION} -I${EPA_CMAKE_INSTALL_PREFIX}/include" ${source_PATH}/configure --prefix=${INCRTCL3_PREFIX} --exec-prefix=${INCRTCL3_PREFIX} --includedir=${INCRTCL3_PREFIX}/include/itcl${ITCL3_LIBVERSION} --mandir=${INCRTCL3_PREFIX}/share/man ${ENABLE_64_BIT} --with-tcl=${EPA_CMAKE_INSTALL_PREFIX}/lib --with-tk=${EPA_CMAKE_INSTALL_PREFIX}/lib --with-itcl=${INCRTCL3_PREFIX}/lib/itcl${ITCL3_LIBVERSION}
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CPPFLAGS=-I${INCRTCL3_PREFIX}/include/itcl${ITCL3_DIRVERSION} -I${EPA_CMAKE_INSTALL_PREFIX}/include" ${source_PATH}/configure --prefix=${INCRTCL3_PREFIX} --exec-prefix=${INCRTCL3_PREFIX} --includedir=${INCRTCL3_PREFIX}/include/itcl${ITCL3_DIRVERSION} --mandir=${INCRTCL3_PREFIX}/share/man ${ENABLE_64_BIT} --with-tcl=${EPA_CMAKE_INSTALL_PREFIX}/lib --with-tk=${EPA_CMAKE_INSTALL_PREFIX}/lib --with-itcl=${INCRTCL3_PREFIX}/lib/itcl${ITCL3_DIRVERSION}
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install
   )
 
 add_custom_command(
   OUTPUT
+  ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-patch
+  COMMAND ${CMAKE_COMMAND} -E echo 
+  "Apply a patch for backporting the autotools changes for itk (version 4.0.0) to itk3"
+  # These changes are replacing the old contents of the tclconfig
+  # directory with the modern itk versions of those files and small
+  # edits to the itk3 versions of configure.in. In addition the
+  # "autoreconf -i" command was run on Linux to propagate these
+  # changes to the corresponding configure shell script.  This could
+  # not be done for each platform since the autoreconf command is
+  # broken on MSYS.  A final change in this patch is Makefile.in was
+  # edited to make it compatible with the itk version, and finally an
+  # additional edit was made to this file so that CPPFLAGS and CFLAGS
+  # take precedence over CONFIGS which contains the values derived
+  # from the tclConfig.sh, tkConfig.sh, and itclConfig.sh files.
+  # Without this final change the -I options come out in the wrong
+  # order so that the itcl4 version of headers is (incorrectly) used
+  # rather than the itcl3 version provided by CPPFLAGS.
+  COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/autotools_backport.patch
+  APPEND
+  )
+
+add_custom_command(
+  OUTPUT
   ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-build
   COMMAND echo "Replace build-tree locations by install-tree locations"
   COMMAND ${SED_EXECUTABLE}
   # Cover two different patterns of uppercasing.
-  -e "s@^\\(itk_SRC_DIR='\\).*@\\1${INCRTCL3_PREFIX}/include/itcl${ITCL3_LIBVERSION}'@"
-  -e "s@^\\(ITK_SRC_DIR='\\).*@\\1${INCRTCL3_PREFIX}/include/itcl${ITCL3_LIBVERSION}'@"
+  -e "s@^\\(itk_SRC_DIR='\\).*@\\1${INCRTCL3_PREFIX}/include/itcl${ITCL3_DIRVERSION}'@"
+  -e "s@^\\(ITK_SRC_DIR='\\).*@\\1${INCRTCL3_PREFIX}/include/itcl${ITCL3_DIRVERSION}'@"
   # Cover two different patterns of uppercasing.
-  -e "/itk_B/s@='\\(-L\\)\\?.*build_itk3@='\\1${INCRTCL3_PREFIX}/lib/itk${ITK3_LIBVERSION}@"
-  -e "/ITK_B/s@='\\(-L\\)\\?.*build_itk3@='\\1${INCRTCL3_PREFIX}/lib/itk${ITK3_LIBVERSION}@"
+  -e "/itk_B/s@='\\(-L\\)\\?.*build_itk3@='\\1${INCRTCL3_PREFIX}/lib/itk${DIRVERSION}@"
+  -e "/ITK_B/s@='\\(-L\\)\\?.*build_itk3@='\\1${INCRTCL3_PREFIX}/lib/itk${DIRVERSION}@"
   # Overwrite original file.
   -i itkConfig.sh
   APPEND
@@ -95,6 +132,6 @@
   OUTPUT
   ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-install
   COMMAND echo "Install-tree fixups"
-  COMMAND ${CHMOD_EXECUTABLE} -v ${SO_NUMERICAL_PERMISSIONS} ${INCRTCL3_PREFIX}/lib/itk${LIBVERSION}/libitk${LIBVERSION}.so
+  COMMAND ${CHMOD_EXECUTABLE} -v ${SO_NUMERICAL_PERMISSIONS} ${INCRTCL3_PREFIX}/lib/itk${DIRVERSION}/${library_prefix}itk${LIBVERSION}${library_suffix}
   APPEND
   )

Added: trunk/cmake/epa_build/itk3/autotools_backport.patch
===================================================================
--- trunk/cmake/epa_build/itk3/autotools_backport.patch	                        (rev 0)
+++ trunk/cmake/epa_build/itk3/autotools_backport.patch	2014-01-09 21:38:57 UTC (rev 12926)
@@ -0,0 +1,21373 @@
+diff -Naur build_itk3_pristine/Makefile.in build_itk3/Makefile.in
+--- build_itk3_pristine/Makefile.in	2014-01-09 11:29:48.164234522 -0800
++++ build_itk3/Makefile.in	2014-01-09 11:43:24.332934141 -0800
+@@ -88,6 +88,7 @@
+ 
+ bindir		= @bindir@
+ libdir		= @libdir@
++datarootdir     = @datarootdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+ includedir	= @includedir@
+@@ -101,10 +102,11 @@
+ 
+ top_builddir	= .
+ 
+-INSTALL		= @INSTALL@
+-INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+-INSTALL_DATA	= @INSTALL_DATA@
+-INSTALL_SCRIPT	= @INSTALL_SCRIPT@
++INSTALL_OPTIONS        =
++INSTALL         = $(SHELL) $(srcdir)/tclconfig/install-sh -c ${INSTALL_OPTIONS}
++INSTALL_PROGRAM        = ${INSTALL} -m 755
++INSTALL_DATA   = ${INSTALL} -m 444
++INSTALL_SCRIPT = ${INSTALL_SCRIPT_PROGRAM}
+ 
+ PACKAGE_NAME	= @PACKAGE_NAME@
+ PACKAGE_VERSION	= @PACKAGE_VERSION@
+@@ -171,7 +173,7 @@
+ LIBS		= @PKG_LIBS@ @LIBS@
+ AR		= @AR@
+ CFLAGS		= @CFLAGS@
+-COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++COMPILE		= $(CC) $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES)
+ 
+ #========================================================================
+ # Start of user-definable TARGETS section
+diff -Naur build_itk3_pristine/configure build_itk3/configure
+--- build_itk3_pristine/configure	2014-01-09 11:29:48.180234220 -0800
++++ build_itk3/configure	2014-01-09 11:45:19.418783410 -0800
+@@ -1,81 +1,459 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59 for itk 3.3.
++# Generated by GNU Autoconf 2.69 for itk 3.3.
++#
++#
++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
++#
+ #
+-# Copyright (C) 2003 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+-## --------------------- ##
+-## M4sh Initialization.  ##
+-## --------------------- ##
++## -------------------- ##
++## M4sh Initialization. ##
++## -------------------- ##
+ 
+-# Be Bourne compatible
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+   emulate sh
+   NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in #(
++  *posix*) :
++    set -o posix ;; #(
++  *) :
++     ;;
++esac
+ fi
+-DUALCASE=1; export DUALCASE # for MKS sh
+ 
+-# Support unset when possible.
+-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+-  as_unset=unset
+-else
+-  as_unset=false
++
++as_nl='
++'
++export as_nl
++# Printing a long string crashes Solaris 7 /usr/bin/printf.
++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
++# Prefer a ksh shell builtin over an external printf program on Solaris,
++# but without wasting forks for bash or zsh.
++if test -z "$BASH_VERSION$ZSH_VERSION" \
++    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='print -r --'
++  as_echo_n='print -rn --'
++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='printf %s\n'
++  as_echo_n='printf %s'
++else
++  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
++    as_echo_n='/usr/ucb/echo -n'
++  else
++    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
++    as_echo_n_body='eval
++      arg=$1;
++      case $arg in #(
++      *"$as_nl"*)
++	expr "X$arg" : "X\\(.*\\)$as_nl";
++	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
++      esac;
++      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
++    '
++    export as_echo_n_body
++    as_echo_n='sh -c $as_echo_n_body as_echo'
++  fi
++  export as_echo_body
++  as_echo='sh -c $as_echo_body as_echo'
+ fi
+ 
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  PATH_SEPARATOR=:
++  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
++    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
++      PATH_SEPARATOR=';'
++  }
++fi
++
++
++# IFS
++# We need space, tab and new line, in precisely that order.  Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++IFS=" ""	$as_nl"
++
++# Find who we are.  Look in the path if we contain no directory separator.
++as_myself=
++case $0 in #((
++  *[\\/]* ) as_myself=$0 ;;
++  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++  done
++IFS=$as_save_IFS
+ 
+-# Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++     ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++  as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  exit 1
++fi
++
++# Unset variables that we do not need and which cause bugs (e.g. in
++# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
++# suppresses any "Segmentation fault" message there.  '((' could
++# trigger a bug in pdksh 5.2.14.
++for as_var in BASH_ENV ENV MAIL MAILPATH
++do eval test x\${$as_var+set} = xset \
++  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+ 
+ # NLS nuisances.
+-for as_var in \
+-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+-  LC_TELEPHONE LC_TIME
++LC_ALL=C
++export LC_ALL
++LANGUAGE=C
++export LANGUAGE
++
++# CDPATH.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++# Use a proper internal environment variable to ensure we don't fall
++  # into an infinite loop, continuously re-executing ourselves.
++  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
++    _as_can_reexec=no; export _as_can_reexec;
++    # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++  *v*x* | *x*v* ) as_opts=-vx ;;
++  *v* ) as_opts=-v ;;
++  *x* ) as_opts=-x ;;
++  * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++as_fn_exit 255
++  fi
++  # We don't want this to propagate to other subprocesses.
++          { _as_can_reexec=; unset _as_can_reexec;}
++if test "x$CONFIG_SHELL" = x; then
++  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
++  emulate sh
++  NULLCMD=:
++  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '\${1+\"\$@\"}'='\"\$@\"'
++  setopt NO_GLOB_SUBST
++else
++  case \`(set -o) 2>/dev/null\` in #(
++  *posix*) :
++    set -o posix ;; #(
++  *) :
++     ;;
++esac
++fi
++"
++  as_required="as_fn_return () { (exit \$1); }
++as_fn_success () { as_fn_return 0; }
++as_fn_failure () { as_fn_return 1; }
++as_fn_ret_success () { return 0; }
++as_fn_ret_failure () { return 1; }
++
++exitcode=0
++as_fn_success || { exitcode=1; echo as_fn_success failed.; }
++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
++
++else
++  exitcode=1; echo positional parameters were not saved.
++fi
++test x\$exitcode = x0 || exit 1
++test -x / || exit 1"
++  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
++  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
++  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
++  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
++test \$(( 1 + 1 )) = 2 || exit 1"
++  if (eval "$as_required") 2>/dev/null; then :
++  as_have_required=yes
++else
++  as_have_required=no
++fi
++  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
++
++else
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_found=false
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+-    eval $as_var=C; export $as_var
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  as_found=:
++  case $as_dir in #(
++	 /*)
++	   for as_base in sh bash ksh sh5; do
++	     # Try only shells that exist, to save several forks.
++	     as_shell=$as_dir/$as_base
++	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
++		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
++  CONFIG_SHELL=$as_shell as_have_required=yes
++		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
++  break 2
++fi
++fi
++	   done;;
++       esac
++  as_found=false
++done
++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
++	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
++  CONFIG_SHELL=$SHELL as_have_required=yes
++fi; }
++IFS=$as_save_IFS
++
++
++      if test "x$CONFIG_SHELL" != x; then :
++  export CONFIG_SHELL
++             # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++  *v*x* | *x*v* ) as_opts=-vx ;;
++  *v* ) as_opts=-v ;;
++  *x* ) as_opts=-x ;;
++  * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++exit 255
++fi
++
++    if test x$as_have_required = xno; then :
++  $as_echo "$0: This script requires a shell more modern than all"
++  $as_echo "$0: the shells that I found on your system."
++  if test x${ZSH_VERSION+set} = xset ; then
++    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
++    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+   else
+-    $as_unset $as_var
++    $as_echo "$0: Please tell bug...@gn... about your system,
++$0: including any error possibly output before this
++$0: message. Then install a modern shell, or manually run
++$0: the script under such a shell if you do have one."
+   fi
+-done
++  exit 1
++fi
++fi
++fi
++SHELL=${CONFIG_SHELL-/bin/sh}
++export SHELL
++# Unset more variables known to interfere with behavior of common tools.
++CLICOLOR_FORCE= GREP_OPTIONS=
++unset CLICOLOR_FORCE GREP_OPTIONS
++
++## --------------------- ##
++## M4sh Shell Functions. ##
++## --------------------- ##
++# as_fn_unset VAR
++# ---------------
++# Portably unset VAR.
++as_fn_unset ()
++{
++  { eval $1=; unset $1;}
++}
++as_unset=as_fn_unset
++
++# as_fn_set_status STATUS
++# -----------------------
++# Set $? to STATUS, without forking.
++as_fn_set_status ()
++{
++  return $1
++} # as_fn_set_status
++
++# as_fn_exit STATUS
++# -----------------
++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
++as_fn_exit ()
++{
++  set +e
++  as_fn_set_status $1
++  exit $1
++} # as_fn_exit
++
++# as_fn_mkdir_p
++# -------------
++# Create "$as_dir" as a directory, including parents if necessary.
++as_fn_mkdir_p ()
++{
++
++  case $as_dir in #(
++  -*) as_dir=./$as_dir;;
++  esac
++  test -d "$as_dir" || eval $as_mkdir_p || {
++    as_dirs=
++    while :; do
++      case $as_dir in #(
++      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
++      *) as_qdir=$as_dir;;
++      esac
++      as_dirs="'$as_qdir' $as_dirs"
++      as_dir=`$as_dirname -- "$as_dir" ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++      test -d "$as_dir" && break
++    done
++    test -z "$as_dirs" || eval "mkdir $as_dirs"
++  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
++
++
++} # as_fn_mkdir_p
++
++# as_fn_executable_p FILE
++# -----------------------
++# Test if FILE is an executable regular file.
++as_fn_executable_p ()
++{
++  test -f "$1" && test -x "$1"
++} # as_fn_executable_p
++# as_fn_append VAR VALUE
++# ----------------------
++# Append the text in VALUE to the end of the definition contained in VAR. Take
++# advantage of any shell optimizations that allow amortized linear growth over
++# repeated appends, instead of the typical quadratic growth present in naive
++# implementations.
++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
++  eval 'as_fn_append ()
++  {
++    eval $1+=\$2
++  }'
++else
++  as_fn_append ()
++  {
++    eval $1=\$$1\$2
++  }
++fi # as_fn_append
++
++# as_fn_arith ARG...
++# ------------------
++# Perform arithmetic evaluation on the ARGs, and store the result in the
++# global $as_val. Take advantage of shells that can avoid forks. The arguments
++# must be portable across $(()) and expr.
++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
++  eval 'as_fn_arith ()
++  {
++    as_val=$(( $* ))
++  }'
++else
++  as_fn_arith ()
++  {
++    as_val=`expr "$@" || test $? -eq 1`
++  }
++fi # as_fn_arith
++
++
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
++# script with STATUS, using 1 if that was 0.
++as_fn_error ()
++{
++  as_status=$1; test $as_status -eq 0 && as_status=1
++  if test "$4"; then
++    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
++  fi
++  $as_echo "$as_me: error: $2" >&2
++  as_fn_exit $as_status
++} # as_fn_error
+ 
+-# Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+   as_basename=basename
+ else
+   as_basename=false
+ fi
+ 
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++  as_dirname=dirname
++else
++  as_dirname=false
++fi
+ 
+-# Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)$' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\/\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+ 
+-
+-# PATH needs CR, and LINENO needs CR and PATH.
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+@@ -83,146 +461,91 @@
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conf$$.sh
+-fi
+-
+-
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+-  # Find who we are.  Look in the path if we contain no path at all
+-  # relative or not.
+-  case $0 in
+-    *[\\/]* ) as_myself=$0 ;;
+-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
+-
+-       ;;
+-  esac
+-  # We did not find ourselves, most probably we were run as `sh COMMAND'
+-  # in which case we are not to be found in the path.
+-  if test "x$as_myself" = x; then
+-    as_myself=$0
+-  fi
+-  if test ! -f "$as_myself"; then
+-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+-   { (exit 1); exit 1; }; }
+-  fi
+-  case $CONFIG_SHELL in
+-  '')
+-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for as_base in sh bash ksh sh5; do
+-	 case $as_dir in
+-	 /*)
+-	   if ("$as_dir/$as_base" -c '
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+-	     CONFIG_SHELL=$as_dir/$as_base
+-	     export CONFIG_SHELL
+-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+-	   fi;;
+-	 esac
+-       done
+-done
+-;;
+-  esac
+ 
+-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+-  # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line before each line; the second 'sed' does the real
+-  # work.  The second script uses 'N' to pair each line-number line
+-  # with the numbered line, and appends trailing '-' during
+-  # substitution so that $LINENO is not a special case at line end.
+-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+-  sed '=' <$as_myself |
++  as_lineno_1=$LINENO as_lineno_1a=$LINENO
++  as_lineno_2=$LINENO as_lineno_2a=$LINENO
++  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
++  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
++  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
++  sed -n '
++    p
++    /[$]LINENO/=
++  ' <$as_myself |
+     sed '
++      s/[$]LINENO.*/&-/
++      t lineno
++      b
++      :lineno
+       N
+-      s,$,-,
+-      : loop
+-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      :loop
++      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+       t loop
+-      s,-$,,
+-      s,^['$as_cr_digits']*\n,,
++      s/-\n.*//
+     ' >$as_me.lineno &&
+-  chmod +x $as_me.lineno ||
+-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+-   { (exit 1); exit 1; }; }
++  chmod +x "$as_me.lineno" ||
++    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ 
++  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
++  # already done that, so ensure we don't try to do so again and fall
++  # in an infinite loop.  This has already happened in practice.
++  _as_can_reexec=no; export _as_can_reexec
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensible to this).
+-  . ./$as_me.lineno
++  # original and so on.  Autoconf is especially sensitive to this).
++  . "./$as_me.lineno"
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+-
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+-  *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T='	' ;;
+-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in #(((((
++-n*)
++  case `echo 'xy\c'` in
++  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
++  xy)  ECHO_C='\c';;
++  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
++       ECHO_T='	';;
++  esac;;
++*)
++  ECHO_N='-n';;
+ esac
+ 
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+-  as_expr=expr
++rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++  rm -f conf$$.dir/conf$$.file
+ else
+-  as_expr=false
++  rm -f conf$$.dir
++  mkdir conf$$.dir 2>/dev/null
+ fi
+-
+-rm -f conf$$ conf$$.exe conf$$.file
+-echo >conf$$.file
+-if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conf$$.exe; then
+-    # Don't use ln at all; we don't have any links
+-    as_ln_s='cp -p'
+-  else
++if (echo >conf$$.file) 2>/dev/null; then
++  if ln -s conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s='ln -s'
++    # ... but there are two gotchas:
++    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++    # In both cases, we have to default to `cp -pR'.
++    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
++      as_ln_s='cp -pR'
++  elif ln conf$$.file conf$$ 2>/dev/null; then
++    as_ln_s=ln
++  else
++    as_ln_s='cp -pR'
+   fi
+-elif ln conf$$.file conf$$ 2>/dev/null; then
+-  as_ln_s=ln
+ else
+-  as_ln_s='cp -p'
++  as_ln_s='cp -pR'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
+ 
+ if mkdir -p . 2>/dev/null; then
+-  as_mkdir_p=:
++  as_mkdir_p='mkdir -p "$as_dir"'
+ else
+   test -d ./-p && rmdir ./-p
+   as_mkdir_p=false
+ fi
+ 
+-as_executable_p="test -f"
++as_test_x='test -x'
++as_executable_p=as_fn_executable_p
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -231,38 +554,25 @@
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" 	$as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
+ 
+ # Name of the host.
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ 
+-exec 6>&1
+-
+ #
+ # Initializations.
+ #
+ ac_default_prefix=/usr/local
++ac_clean_files=
+ ac_config_libobj_dir=.
++LIBOBJS=
+ cross_compiling=no
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+-SHELL=${CONFIG_SHELL-/bin/sh}
+-
+-# Maximum number of lines to put in a shell here document.
+-# This variable seems obsolete.  It should probably be removed, and
+-# only ac_max_sed_lines should be used.
+-: ${ac_max_here_lines=38}
+ 
+ # Identity of this package.
+ PACKAGE_NAME='itk'
+@@ -270,50 +580,212 @@
+ PACKAGE_VERSION='3.3'
+ PACKAGE_STRING='itk 3.3'
+ PACKAGE_BUGREPORT=''
++PACKAGE_URL=''
+ 
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+-#if HAVE_SYS_TYPES_H
++#ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+-#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+-#if STDC_HEADERS
++#ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+-# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
+ #  include <stdlib.h>
+ # endif
+ #endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+ #  include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+-#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+-#if HAVE_INTTYPES_H
++#ifdef HAVE_INTTYPES_H
+ # include <inttypes.h>
+-#else
+-# if HAVE_STDINT_H
+-#  include <stdint.h>
+-# endif
+ #endif
+-#if HAVE_UNISTD_H
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#endif
++#ifdef HAVE_UNISTD_H
+ # 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 LN_S CONFIG_CLEAN_FILES 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 itcl_VERSION itcl_BIN_DIR itcl_SRC_DIR itcl_LIB_FILE itcl_LIB_SPEC itcl_STUB_LIB_FILE itcl_STUB_LIB_SPEC itcl_STUB_LIB_PATH 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 CLEANFILES 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 SHARED_BUILD AR TCLSH_PROG CELIB_DIR LIBOBJS DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING STLIB_LD SHLIB_LD SHLIB_CFLAGS SHLIB_LD_LIBS LDFLAGS_DEBUG LDFLAGS_OPTIMIZE LD_LIBRARY_PATH_VAR TCL_DBGX CFLAGS_DEFAULT LDFLAGS_DEFAULT MAKE_LIB MAKE_SHARED_LIB MAKE_STATIC_LIB MAKE_STUB_LIB RANLIB_STUB itkstub_LIB_FILE itk_LIB_FILE WISH_PROG LTLIBOBJS'
++ac_subst_vars='LTLIBOBJS
++LIBOBJS
++WISH_PROG
++TCLSH_PROG
++itk_LIB_FILE
++itkstub_LIB_FILE
++VC_MANIFEST_EMBED_EXE
++VC_MANIFEST_EMBED_DLL
++RANLIB_STUB
++MAKE_STUB_LIB
++MAKE_STATIC_LIB
++MAKE_SHARED_LIB
++MAKE_LIB
++TCL_DBGX
++LDFLAGS_DEFAULT
++CFLAGS_DEFAULT
++LD_LIBRARY_PATH_VAR
++SHLIB_CFLAGS
++SHLIB_LD_LIBS
++SHLIB_LD
++STLIB_LD
++CFLAGS_WARNING
++CFLAGS_OPTIMIZE
++CFLAGS_DEBUG
++RC
++CELIB_DIR
++AR
++SHARED_BUILD
++XMKMF
++TK_XLIB_DIR_NATIVE
++TK_TOP_DIR_NATIVE
++TK_INCLUDES
++TCL_TOP_DIR_NATIVE
++TCL_INCLUDES
++PKG_OBJECTS
++PKG_SOURCES
++MATH_LIBS
++EGREP
++GREP
++RANLIB
++SET_MAKE
++CPP
++OBJEXT
++ac_ct_CC
++CPPFLAGS
++LDFLAGS
++CFLAGS
++CC
++itcl_STUB_LIB_PATH
++itcl_STUB_LIB_SPEC
++itcl_STUB_LIB_FILE
++itcl_LIB_SPEC
++itcl_LIB_FILE
++itcl_SRC_DIR
++itcl_BIN_DIR
++itcl_VERSION
++TK_XINCLUDES
++TK_LIBS
++TK_STUB_LIB_SPEC
++TK_STUB_LIB_FLAG
++TK_STUB_LIB_FILE
++TK_LIB_SPEC
++TK_LIB_FLAG
++TK_LIB_FILE
++TK_SRC_DIR
++TK_BIN_DIR
++TK_VERSION
++TCL_SHLIB_LD_LIBS
++TCL_LD_FLAGS
++TCL_EXTRA_CFLAGS
++TCL_DEFS
++TCL_LIBS
++CLEANFILES
++TCL_STUB_LIB_SPEC
++TCL_STUB_LIB_FLAG
++TCL_STUB_LIB_FILE
++TCL_LIB_SPEC
++TCL_LIB_FLAG
++TCL_LIB_FILE
++TCL_SRC_DIR
++TCL_BIN_DIR
++TCL_PATCH_LEVEL
++TCL_VERSION
++CONFIG_CLEAN_FILES
++LN_S
++PKG_CFLAGS
++PKG_LIBS
++PKG_INCLUDES
++PKG_HEADERS
++PKG_TCL_SOURCES
++PKG_STUB_OBJECTS
++PKG_STUB_SOURCES
++PKG_STUB_LIB_FILE
++PKG_LIB_FILE
++EXEEXT
++CYGPATH
++target_alias
++host_alias
++build_alias
++LIBS
++ECHO_T
++ECHO_N
++ECHO_C
++DEFS
++mandir
++localedir
++libdir
++psdir
++pdfdir
++dvidir
++htmldir
++infodir
++docdir
++oldincludedir
++includedir
++localstatedir
++sharedstatedir
++sysconfdir
++datadir
++datarootdir
++libexecdir
++sbindir
++bindir
++program_transform_name
++prefix
++exec_prefix
++PACKAGE_URL
++PACKAGE_BUGREPORT
++PACKAGE_STRING
++PACKAGE_VERSION
++PACKAGE_TARNAME
++PACKAGE_NAME
++PATH_SEPARATOR
++SHELL'
+ ac_subst_files=''
++ac_user_opts='
++enable_option_checking
++with_tcl
++with_tk
++with_itcl
++with_tclinclude
++with_tkinclude
++with_x
++enable_shared
++enable_64bit
++enable_64bit_vis
++enable_rpath
++enable_wince
++with_celib
++enable_symbols
++'
++      ac_precious_vars='build_alias
++host_alias
++target_alias
++CC
++CFLAGS
++LDFLAGS
++LIBS
++CPPFLAGS
++CPP
++XMKMF'
++
+ 
+ # Initialize some variables set by options.
+ ac_init_help=
+ ac_init_version=false
++ac_unrecognized_opts=
++ac_unrecognized_sep=
+ # The variables have the same names as the options, with
+ # dashes changed to underlines.
+ cache_file=/dev/null
+@@ -336,34 +808,49 @@
+ # and all the variables that are supposed to be based on exec_prefix
+ # by default will actually change.
+ # Use braces instead of parens because sh, perl, etc. also accept them.
++# (The list follows the same order as the GNU Coding Standards.)
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datarootdir='${prefix}/share'
++datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+-libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-infodir='${prefix}/info'
+-mandir='${prefix}/man'
++docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
++infodir='${datarootdir}/info'
++htmldir='${docdir}'
++dvidir='${docdir}'
++pdfdir='${docdir}'
++psdir='${docdir}'
++libdir='${exec_prefix}/lib'
++localedir='${datarootdir}/locale'
++mandir='${datarootdir}/man'
+ 
+ ac_prev=
++ac_dashdash=
+ for ac_option
+ do
+   # If the previous option needs an argument, assign it.
+   if test -n "$ac_prev"; then
+-    eval "$ac_prev=\$ac_option"
++    eval $ac_prev=\$ac_option
+     ac_prev=
+     continue
+   fi
+ 
+-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
++  case $ac_option in
++  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++  *=)   ac_optarg= ;;
++  *)    ac_optarg=yes ;;
++  esac
+ 
+   # Accept the important Cygnus configure options, so we can diagnose typos.
+ 
+-  case $ac_option in
++  case $ac_dashdash$ac_option in
++  --)
++    ac_dashdash=yes ;;
+ 
+   -bindir | --bindir | --bindi | --bind | --bin | --bi)
+     ac_prev=bindir ;;
+@@ -385,33 +872,59 @@
+   --config-cache | -C)
+     cache_file=config.cache ;;
+ 
+-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++  -datadir | --datadir | --datadi | --datad)
+     ac_prev=datadir ;;
+-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+-  | --da=*)
++  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+     datadir=$ac_optarg ;;
+ 
++  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
++  | --dataroo | --dataro | --datar)
++    ac_prev=datarootdir ;;
++  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
++  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
++    datarootdir=$ac_optarg ;;
++
+   -disable-* | --disable-*)
+-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+-   { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+-    eval "enable_$ac_feature=no" ;;
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      as_fn_error $? "invalid feature name: $ac_useropt"
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"enable_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
++    esac
++    eval enable_$ac_useropt=no ;;
++
++  -docdir | --docdir | --docdi | --doc | --do)
++    ac_prev=docdir ;;
++  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
++    docdir=$ac_optarg ;;
++
++  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
++    ac_prev=dvidir ;;
++  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
++    dvidir=$ac_optarg ;;
+ 
+   -enable-* | --enable-*)
+-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+-   { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+-    case $ac_option in
+-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+-      *) ac_optarg=yes ;;
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      as_fn_error $? "invalid feature name: $ac_useropt"
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"enable_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
+     esac
+-    eval "enable_$ac_feature='$ac_optarg'" ;;
++    eval enable_$ac_useropt=\$ac_optarg ;;
+ 
+   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -438,6 +951,12 @@
+   -host=* | --host=* | --hos=* | --ho=*)
+     host_alias=$ac_optarg ;;
+ 
++  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
++    ac_prev=htmldir ;;
++  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
++  | --ht=*)
++    htmldir=$ac_optarg ;;
++
+   -includedir | --includedir | --includedi | --included | --include \
+   | --includ | --inclu | --incl | --inc)
+     ac_prev=includedir ;;
+@@ -462,13 +981,16 @@
+   | --libexe=* | --libex=* | --libe=*)
+     libexecdir=$ac_optarg ;;
+ 
++  -localedir | --localedir | --localedi | --localed | --locale)
++    ac_prev=localedir ;;
++  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
++    localedir=$ac_optarg ;;
++
+   -localstatedir | --localstatedir | --localstatedi | --localstated \
+-  | --localstate | --localstat | --localsta | --localst \
+-  | --locals | --local | --loca | --loc | --lo)
++  | --localstate | --localstat | --localsta | --localst | --locals)
+     ac_prev=localstatedir ;;
+   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
++  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+     localstatedir=$ac_optarg ;;
+ 
+   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+@@ -533,6 +1055,16 @@
+   | --progr-tra=* | --program-tr=* | --program-t=*)
+     program_transform_name=$ac_optarg ;;
+ 
++  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
++    ac_prev=pdfdir ;;
++  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
++    pdfdir=$ac_optarg ;;
++
++  -psdir | --psdir | --psdi | --psd | --ps)
++    ac_prev=psdir ;;
++  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
++    psdir=$ac_optarg ;;
++
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+@@ -583,26 +1115,36 @@
+     ac_init_version=: ;;
+ 
+   -with-* | --with-*)
+-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+-   { (exit 1); exit 1; }; }
+-    ac_package=`echo $ac_package| sed 's/-/_/g'`
+-    case $ac_option in
+-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+-      *) ac_optarg=yes ;;
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      as_fn_error $? "invalid package name: $ac_useropt"
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"with_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
+     esac
+-    eval "with_$ac_package='$ac_optarg'" ;;
++    eval with_$ac_useropt=\$ac_optarg ;;
+ 
+   -without-* | --without-*)
+-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+-   { (exit 1); exit 1; }; }
+-    ac_package=`echo $ac_package | sed 's/-/_/g'`
+-    eval "with_$ac_package=no" ;;
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      as_fn_error $? "invalid package name: $ac_useropt"
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"with_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
++    esac
++    eval with_$ac_useropt=no ;;
+ 
+   --x)
+     # Obsolete; use --with-x.
+@@ -622,27 +1164,26 @@
+   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+     x_libraries=$ac_optarg ;;
+ 
+-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+-Try \`$0 --help' for more information." >&2
+-   { (exit 1); exit 1; }; }
++  -*) as_fn_error $? "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information"
+     ;;
+ 
+   *=*)
+     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+-   { (exit 1); exit 1; }; }
+-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+-    eval "$ac_envvar='$ac_optarg'"
++    case $ac_envvar in #(
++      '' | [0-9]* | *[!_$as_cr_alnum]* )
++      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
++    esac
++    eval $ac_envvar=\$ac_optarg
+     export $ac_envvar ;;
+ 
+   *)
+     # FIXME: should be removed in autoconf 3.0.
+-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
++    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
++    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+     ;;
+ 
+   esac
+@@ -650,31 +1191,36 @@
+ 
+ if test -n "$ac_prev"; then
+   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+-  { echo "$as_me: error: missing argument to $ac_option" >&2
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "missing argument to $ac_option"
+ fi
+ 
+-# Be sure to have absolute paths.
+-for ac_var in exec_prefix prefix
+-do
+-  eval ac_val=$`echo $ac_var`
+-  case $ac_val in
+-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
++if test -n "$ac_unrecognized_opts"; then
++  case $enable_option_checking in
++    no) ;;
++    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
++    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+   esac
+-done
++fi
+ 
+-# Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+-	      localstatedir libdir includedir oldincludedir infodir mandir
++# Check all directory arguments for consistency.
++for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
++		datadir sysconfdir sharedstatedir localstatedir includedir \
++		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
++		libdir localedir mandir
+ do
+-  eval ac_val=$`echo $ac_var`
++  eval ac_val=\$$ac_var
++  # Remove trailing slashes.
++  case $ac_val in
++    */ )
++      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
++      eval $ac_var=\$ac_val;;
++  esac
++  # Be sure to have absolute directory names.
+   case $ac_val in
+-    [\\/$]* | ?:[\\/]* ) ;;
+-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
++    [\\/$]* | ?:[\\/]* )  continue;;
++    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+   esac
++  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ done
+ 
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -688,8 +1234,6 @@
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+-    If a cross compiler is detected then cross compile mode will be used." >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+   fi
+@@ -701,74 +1245,72 @@
+ test "$silent" = yes && exec 6>/dev/null
+ 
+ 
++ac_pwd=`pwd` && test -n "$ac_pwd" &&
++ac_ls_di=`ls -di .` &&
++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
++  as_fn_error $? "working directory cannot be determined"
++test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
++  as_fn_error $? "pwd does not report name of working directory"
++
++
+ # Find the source files, if location was not specified.
+ if test -z "$srcdir"; then
+   ac_srcdir_defaulted=yes
+-  # Try the directory containing this script, then its parent.
+-  ac_confdir=`(dirname "$0") 2>/dev/null ||
+-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$0" : 'X\(//\)[^/]' \| \
+-	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$0" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++  # Try the directory containing this script, then the parent directory.
++  ac_confdir=`$as_dirname -- "$as_myself" ||
++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_myself" : 'X\(//\)[^/]' \| \
++	 X"$as_myself" : 'X\(//\)$' \| \
++	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_myself" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+   srcdir=$ac_confdir
+-  if test ! -r $srcdir/$ac_unique_file; then
++  if test ! -r "$srcdir/$ac_unique_file"; then
+     srcdir=..
+   fi
+ else
+   ac_srcdir_defaulted=no
+ fi
+-if test ! -r $srcdir/$ac_unique_file; then
+-  if test "$ac_srcdir_defaulted" = yes; then
+-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+-   { (exit 1); exit 1; }; }
+-  else
+-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+-   { (exit 1); exit 1; }; }
+-  fi
+-fi
+-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+-   { (exit 1); exit 1; }; }
+-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+-ac_env_build_alias_set=${build_alias+set}
+-ac_env_build_alias_value=$build_alias
+-ac_cv_env_build_alias_set=${build_alias+set}
+-ac_cv_env_build_alias_value=$build_alias
+-ac_env_host_alias_set=${host_alias+set}
+-ac_env_host_alias_value=$host_alias
+-ac_cv_env_host_alias_set=${host_alias+set}
+-ac_cv_env_host_alias_value=$host_alias
+-ac_env_target_alias_set=${target_alias+set}
+-ac_env_target_alias_value=$target_alias
+-ac_cv_env_target_alias_set=${target_alias+set}
+-ac_cv_env_target_alias_value=$target_alias
+-ac_env_CC_set=${CC+set}
+-ac_env_CC_value=$CC
+-ac_cv_env_CC_set=${CC+set}
+-ac_cv_env_CC_value=$CC
+-ac_env_CFLAGS_set=${CFLAGS+set}
+-ac_env_CFLAGS_value=$CFLAGS
+-ac_cv_env_CFLAGS_set=${CFLAGS+set}
+-ac_cv_env_CFLAGS_value=$CFLAGS
+-ac_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_env_LDFLAGS_value=$LDFLAGS
+-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_cv_env_LDFLAGS_value=$LDFLAGS
+-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_env_CPPFLAGS_value=$CPPFLAGS
+-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+-ac_env_CPP_set=${CPP+set}
+-ac_env_CPP_value=$CPP
+-ac_cv_env_CPP_set=${CPP+set}
+-ac_cv_env_CPP_value=$CPP
++if test ! -r "$srcdir/$ac_unique_file"; then
++  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
++  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
++fi
++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
++ac_abs_confdir=`(
++	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
++	pwd)`
++# When building in place, set srcdir=.
++if test "$ac_abs_confdir" = "$ac_pwd"; then
++  srcdir=.
++fi
++# Remove unnecessary trailing slashes from srcdir.
++# Double slashes in file names in object file debugging info
++# mess up M-x gdb in Emacs.
++case $srcdir in
++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
++esac
++for ac_var in $ac_precious_vars; do
++  eval ac_env_${ac_var}_set=\${${ac_var}+set}
++  eval ac_env_${ac_var}_value=\$${ac_var}
++  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
++  eval ac_cv_env_${ac_var}_value=\$${ac_var}
++done
+ 
+ #
+ # Report the --help message.
+@@ -791,20 +1333,17 @@
+       --help=short        display options specific to this package
+       --help=recursive    display the short help of all the included packages
+   -V, --version           display version information and exit
+-  -q, --quiet, --silent   do not print \`checking...' messages
++  -q, --quiet, --silent   do not print \`checking ...' messages
+       --cache-file=FILE   cache test results in FILE [disabled]
+   -C, --config-cache      alias for \`--cache-file=config.cache'
+   -n, --no-create         do not create output files
+       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+ 
+-_ACEOF
+-
+-  cat <<_ACEOF
+ Installation directories:
+   --prefix=PREFIX         install architecture-independent files in PREFIX
+-			  [$ac_default_prefix]
++                          [$ac_default_prefix]
+   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+-			  [PREFIX]
++                          [PREFIX]
+ 
+ By default, \`make install' will install all the files in
+ \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+@@ -814,18 +1353,25 @@
+ For better control, use the options below.
+ 
+ Fine tuning of the installation directories:
+-  --bindir=DIR           user executables [EPREFIX/bin]
+-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+-  --libexecdir=DIR       program executables [EPREFIX/libexec]
+-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+-  --libdir=DIR           object code libraries [EPREFIX/lib]
+-  --includedir=DIR       C header files [PREFIX/include]
+-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+-  --infodir=DIR          info documentation [PREFIX/info]
+-  --mandir=DIR           man documentation [PREFIX/man]
++  --bindir=DIR            user executables [EPREFIX/bin]
++  --sbindir=DIR           system admin executables [EPREFIX/sbin]
++  --libexecdir=DIR        program executables [EPREFIX/libexec]
++  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
++  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
++  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
++  --libdir=DIR            object code libraries [EPREFIX/lib]
++  --includedir=DIR        C header files [PREFIX/include]
++  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
++  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
++  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
++  --infodir=DIR           info documentation [DATAROOTDIR/info]
++  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
++  --mandir=DIR            man documentation [DATAROOTDIR/man]
++  --docdir=DIR            documentation root [DATAROOTDIR/doc/itk]
++  --htmldir=DIR           html documentation [DOCDIR]
++  --dvidir=DIR            dvi documentation [DOCDIR]
++  --pdfdir=DIR            pdf documentation [DOCDIR]
++  --psdir=DIR             ps documentation [DOCDIR]
+ _ACEOF
+ 
+   cat <<\_ACEOF
+@@ -843,21 +1389,25 @@
+   cat <<\_ACEOF
+ 
+ Optional Features:
++  --disable-option-checking  ignore unrecognized --enable/--with options
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+-  --enable-shared         build and link with shared libraries --enable-shared
+-  --enable-64bit          enable 64bit support (where applicable)
+-  --enable-64bit-vis      enable 64bit Sparc VIS support
++  --enable-shared         build and link with shared libraries (default: on)
++  --enable-64bit          enable 64bit support (default: off)
++  --enable-64bit-vis      enable 64bit Sparc VIS support (default: off)
++  --disable-rpath         disable rpath support (default: on)
+   --enable-wince          enable Win/CE support (where applicable)
+-  --disable-load          disallow dynamic loading and "load" command
+-  --enable-symbols        build with debugging symbols --disable-symbols
++  --enable-symbols        build with debugging symbols (default: off)
+ 
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+-  --with-tcl              directory containing tcl configuration (tclConfig.sh)
++  --with-tcl              directory containing tcl configuration
++                          (tclConfig.sh)
+   --with-tk               directory containing tk configuration (tkConfig.sh)
+   --with-itcl              directory containing itcl configuration (itclConfig.sh)
++  --with-tclinclude       directory containing the public Tcl header files
++  --with-tkinclude        directory containing the public Tk header files
+   --with-x                use the X Window System
+   --with-celib=DIR        use Windows/CE support library from DIR
+ 
+@@ -866,169 +1416,492 @@
+   CFLAGS      C compiler flags
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
+-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+-              headers in a nonstandard directory <include dir>
++  LIBS        libraries to pass to the linker, e.g. -l<library>
++  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
++              you have headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
++  XMKMF       Path to xmkmf, Makefile generator for X Window System
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+ 
++Report bugs to the package provider.
+ _ACEOF
++ac_status=$?
+ fi
+ 
+ if test "$ac_init_help" = "recursive"; then
+   # If there are subdirs, report their specific --help.
+-  ac_popdir=`pwd`
+   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+-    test -d $ac_dir || continue
++    test -d "$ac_dir" ||
++      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && t...
 
[truncated message content]

[Plplot-cvs] SF.net SVN: plplot:[12925] trunk/cmake/epa_build/itk

From: <ai...@us...> - 2014-01-07 20:57:46

Revision: 12925
          http://sourceforge.net/p/plplot/code/12925
Author:   airwin
Date:     2014-01-07 20:57:43 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
Update epa_build configuration so that itk (version 4.0.0) successfully builds on
MinGW/MSYS.

N.B. A patch corresponding to running "autoreconf -i" on Linux has
been applied rather than just running "autoreconf -i" on all platforms
because autoreconf is broken on MSYS. Note, this patch is not really
necessary for itk because the resulting changes to the configure
script are so small they don't make a practical difference.  However,
I wanted to pioneer applying "autoreconf -i" this way since
configure.in for itk4 is not that different than for itk3, and the
equivalent patch for the itk3 case might make such a large change in
the itk3 configure script that it solves the internal error for that
script that is current stopping the itk3 epa_build.

Modified Paths:
--------------
    trunk/cmake/epa_build/itk/CMakeLists.txt

Added Paths:
-----------
    trunk/cmake/epa_build/itk/autoreconf.patch

Modified: trunk/cmake/epa_build/itk/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/itk/CMakeLists.txt	2014-01-06 21:18:18 UTC (rev 12924)
+++ trunk/cmake/epa_build/itk/CMakeLists.txt	2014-01-07 20:57:43 UTC (rev 12925)
@@ -41,13 +41,27 @@
   source_PATH
   ) 
 
+if(MSYS_PLATFORM)
+  set(library_prefix)
+  set(library_suffix .dll)
+else(MSYS_PLATFORM)
+  set(library_prefix lib)
+  set(library_suffix .so)
+endif(MSYS_PLATFORM)
+
 set(CFLAGS "$ENV{CFLAGS}")
 # Drop -fvisibility=hidden since that option does not work for itk.
 string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}")
 
+set(VERSION 4.0.0)
+set(DIRVERSION 4.0.0)
+if(MSYS_PLATFORM)
+  string(REGEX REPLACE "\\." "" LIBVERSION ${DIRVERSION})
+else(MSYS_PLATFORM)
+  set(LIBVERSION ${DIRVERSION})
+endif(MSYS_PLATFORM)
+
 # Data that is related to downloads.
-set(VERSION 4.0.0)
-set(LIBVERSION ${VERSION})
 set(URL http://downloads.sourceforge.net/project/incrtcl/%5bincr%20Tcl_Tk%5d-4-source/Itcl%20${VERSION}/itk${VERSION}.tar.gz)
 set(DOWNLOAD_HASH_TYPE MD5)
 set(DOWNLOAD_HASH e3600a9ad0fcdcbbc4138af5a4893b7e)
@@ -62,7 +76,7 @@
   URL ${URL}
   URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
   PATCH_COMMAND ""
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CPPFLAGS=-I${EPA_CMAKE_INSTALL_PREFIX}/include" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --mandir=${EPA_CMAKE_INSTALL_PREFIX}/share/man ${ENABLE_64_BIT} --with-itcl=${EPA_CMAKE_INSTALL_PREFIX}/lib/itcl${LIBVERSION}
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CPPFLAGS=-I${EPA_CMAKE_INSTALL_PREFIX}/include" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --mandir=${EPA_CMAKE_INSTALL_PREFIX}/share/man ${ENABLE_64_BIT} --with-itcl=${EPA_CMAKE_INSTALL_PREFIX}/lib/itcl${DIRVERSION}
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install
   )
@@ -78,6 +92,9 @@
   "Add generic/itkDecls.h to the list of itk headers that must be installed."
   # This patch has been publicly distributed at https://sourceforge.net/p/incrtcl/patches/53/
   COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/itk4_header_list.patch
+  COMMAND ${CMAKE_COMMAND} -E echo 
+  "Apply a patch for the results of \"autoreconf -i\" run on Linux."
+  COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/autoreconf.patch
   APPEND
   )
 
@@ -98,6 +115,6 @@
   OUTPUT
   ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-install
   COMMAND echo "Install-tree fixups"
-  COMMAND ${CHMOD_EXECUTABLE} -v ${SO_NUMERICAL_PERMISSIONS} ${EPA_CMAKE_INSTALL_PREFIX}/lib/itk${LIBVERSION}/libitk${LIBVERSION}.so
+  COMMAND ${CHMOD_EXECUTABLE} -v ${SO_NUMERICAL_PERMISSIONS} ${EPA_CMAKE_INSTALL_PREFIX}/lib/itk${DIRVERSION}/${library_prefix}itk${LIBVERSION}${library_suffix}
   APPEND
   )

Added: trunk/cmake/epa_build/itk/autoreconf.patch
===================================================================
--- trunk/cmake/epa_build/itk/autoreconf.patch	                        (rev 0)
+++ trunk/cmake/epa_build/itk/autoreconf.patch	2014-01-07 20:57:43 UTC (rev 12925)
@@ -0,0 +1,471 @@
+diff -Naur build_itk_pristine/configure build_itk/configure
+--- build_itk_pristine/configure	2014-01-07 11:42:48.000000000 -0800
++++ build_itk/configure	2014-01-07 12:13:48.859248141 -0800
+@@ -1,11 +1,9 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.68 for itk 4.0.0.
++# Generated by GNU Autoconf 2.69 for itk 4.0.0.
+ #
+ #
+-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+-# Foundation, Inc.
++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+ #
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -134,6 +132,31 @@
+ # CDPATH.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
++# Use a proper internal environment variable to ensure we don't fall
++  # into an infinite loop, continuously re-executing ourselves.
++  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
++    _as_can_reexec=no; export _as_can_reexec;
++    # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++  *v*x* | *x*v* ) as_opts=-vx ;;
++  *v* ) as_opts=-v ;;
++  *x* ) as_opts=-x ;;
++  * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++as_fn_exit 255
++  fi
++  # We don't want this to propagate to other subprocesses.
++          { _as_can_reexec=; unset _as_can_reexec;}
+ if test "x$CONFIG_SHELL" = x; then
+   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+   emulate sh
+@@ -167,7 +190,8 @@
+ else
+   exitcode=1; echo positional parameters were not saved.
+ fi
+-test x\$exitcode = x0 || exit 1"
++test x\$exitcode = x0 || exit 1
++test -x / || exit 1"
+   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+@@ -212,21 +236,25 @@
+ 
+ 
+       if test "x$CONFIG_SHELL" != x; then :
+-  # We cannot yet assume a decent shell, so we have to provide a
+-	# neutralization value for shells without unset; and this also
+-	# works around shells that cannot unset nonexistent variables.
+-	# Preserve -v and -x to the replacement shell.
+-	BASH_ENV=/dev/null
+-	ENV=/dev/null
+-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+-	export CONFIG_SHELL
+-	case $- in # ((((
+-	  *v*x* | *x*v* ) as_opts=-vx ;;
+-	  *v* ) as_opts=-v ;;
+-	  *x* ) as_opts=-x ;;
+-	  * ) as_opts= ;;
+-	esac
+-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
++  export CONFIG_SHELL
++             # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++  *v*x* | *x*v* ) as_opts=-vx ;;
++  *v* ) as_opts=-v ;;
++  *x* ) as_opts=-x ;;
++  * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++exit 255
+ fi
+ 
+     if test x$as_have_required = xno; then :
+@@ -328,6 +356,14 @@
+ 
+ 
+ } # as_fn_mkdir_p
++
++# as_fn_executable_p FILE
++# -----------------------
++# Test if FILE is an executable regular file.
++as_fn_executable_p ()
++{
++  test -f "$1" && test -x "$1"
++} # as_fn_executable_p
+ # as_fn_append VAR VALUE
+ # ----------------------
+ # Append the text in VALUE to the end of the definition contained in VAR. Take
+@@ -449,6 +485,10 @@
+   chmod +x "$as_me.lineno" ||
+     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ 
++  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
++  # already done that, so ensure we don't try to do so again and fall
++  # in an infinite loop.  This has already happened in practice.
++  _as_can_reexec=no; export _as_can_reexec
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+   # original and so on.  Autoconf is especially sensitive to this).
+@@ -483,16 +523,16 @@
+     # ... but there are two gotchas:
+     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+-    # In both cases, we have to default to `cp -p'.
++    # In both cases, we have to default to `cp -pR'.
+     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+-      as_ln_s='cp -p'
++      as_ln_s='cp -pR'
+   elif ln conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s=ln
+   else
+-    as_ln_s='cp -p'
++    as_ln_s='cp -pR'
+   fi
+ else
+-  as_ln_s='cp -p'
++  as_ln_s='cp -pR'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+ rmdir conf$$.dir 2>/dev/null
+@@ -504,28 +544,8 @@
+   as_mkdir_p=false
+ fi
+ 
+-if test -x / >/dev/null 2>&1; then
+-  as_test_x='test -x'
+-else
+-  if ls -dL / >/dev/null 2>&1; then
+-    as_ls_L_option=L
+-  else
+-    as_ls_L_option=
+-  fi
+-  as_test_x='
+-    eval sh -c '\''
+-      if test -d "$1"; then
+-	test -d "$1/.";
+-      else
+-	case $1 in #(
+-	-*)set "./$1";;
+-	esac;
+-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+-	???[sx]*):;;*)false;;esac;fi
+-    '\'' sh
+-  '
+-fi
+-as_executable_p=$as_test_x
++as_test_x='test -x'
++as_executable_p=as_fn_executable_p
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -1211,8 +1231,6 @@
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+-    If a cross compiler is detected then cross compile mode will be used" >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+   fi
+@@ -1468,9 +1486,9 @@
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ itk configure 4.0.0
+-generated by GNU Autoconf 2.68
++generated by GNU Autoconf 2.69
+ 
+-Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2012 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -1656,7 +1674,7 @@
+ 	 test ! -s conftest.err
+        } && test -s conftest$ac_exeext && {
+ 	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
++	 test -x conftest$ac_exeext
+        }; then :
+   ac_retval=0
+ else
+@@ -1833,7 +1851,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by itk $as_me 4.0.0, which was
+-generated by GNU Autoconf 2.68.  Invocation command line was
++generated by GNU Autoconf 2.69.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -2226,7 +2244,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CYGPATH="cygpath -w"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3174,7 +3192,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3214,7 +3232,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_CC="gcc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3267,7 +3285,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3308,7 +3326,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+@@ -3366,7 +3384,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3410,7 +3428,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3856,8 +3874,7 @@
+ /* end confdefs.h.  */
+ #include <stdarg.h>
+ #include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
++struct stat;
+ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+ struct buf { int x; };
+ FILE * (*rcsopen) (struct buf *, struct stat *, int);
+@@ -4137,7 +4154,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4177,7 +4194,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_RANLIB="ranlib"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -4238,7 +4255,7 @@
+     for ac_prog in grep ggrep; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
++      as_fn_executable_p "$ac_path_GREP" || continue
+ # Check for GNU ac_path_GREP and select it if it is found.
+   # Check for GNU $ac_path_GREP
+ case `"$ac_path_GREP" --version 2>&1` in
+@@ -4304,7 +4321,7 @@
+     for ac_prog in egrep; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++      as_fn_executable_p "$ac_path_EGREP" || continue
+ # Check for GNU ac_path_EGREP and select it if it is found.
+   # Check for GNU $ac_path_EGREP
+ case `"$ac_path_EGREP" --version 2>&1` in
+@@ -5995,7 +6012,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6035,7 +6052,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_RANLIB="ranlib"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6259,7 +6276,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_AR="${ac_tool_prefix}ar"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6299,7 +6316,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_AR="ar"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6590,7 +6607,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_RC="${ac_tool_prefix}windres"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -6630,7 +6647,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_RC="windres"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -8941,16 +8958,16 @@
+     # ... but there are two gotchas:
+     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+-    # In both cases, we have to default to `cp -p'.
++    # In both cases, we have to default to `cp -pR'.
+     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+-      as_ln_s='cp -p'
++      as_ln_s='cp -pR'
+   elif ln conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s=ln
+   else
+-    as_ln_s='cp -p'
++    as_ln_s='cp -pR'
+   fi
+ else
+-  as_ln_s='cp -p'
++  as_ln_s='cp -pR'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+ rmdir conf$$.dir 2>/dev/null
+@@ -9010,28 +9027,16 @@
+   as_mkdir_p=false
+ fi
+ 
+-if test -x / >/dev/null 2>&1; then
+-  as_test_x='test -x'
+-else
+-  if ls -dL / >/dev/null 2>&1; then
+-    as_ls_L_option=L
+-  else
+-    as_ls_L_option=
+-  fi
+-  as_test_x='
+-    eval sh -c '\''
+-      if test -d "$1"; then
+-	test -d "$1/.";
+-      else
+-	case $1 in #(
+-	-*)set "./$1";;
+-	esac;
+-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+-	???[sx]*):;;*)false;;esac;fi
+-    '\'' sh
+-  '
+-fi
+-as_executable_p=$as_test_x
++
++# as_fn_executable_p FILE
++# -----------------------
++# Test if FILE is an executable regular file.
++as_fn_executable_p ()
++{
++  test -f "$1" && test -x "$1"
++} # as_fn_executable_p
++as_test_x='test -x'
++as_executable_p=as_fn_executable_p
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -9053,7 +9058,7 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by itk $as_me 4.0.0, which was
+-generated by GNU Autoconf 2.68.  Invocation command line was
++generated by GNU Autoconf 2.69.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -9106,10 +9111,10 @@
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ itk config.status 4.0.0
+-configured by $0, generated by GNU Autoconf 2.68,
++configured by $0, generated by GNU Autoconf 2.69,
+   with options \\"\$ac_cs_config\\"
+ 
+-Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2012 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+ 
+@@ -9186,7 +9191,7 @@
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ if \$ac_cs_recheck; then
+-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+   shift
+   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+   CONFIG_SHELL='$SHELL'

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12924] trunk/cmake/epa_build/README

From: <ai...@us...> - 2014-01-06 21:18:21

Revision: 12924
          http://sourceforge.net/p/plplot/code/12924
Author:   airwin
Date:     2014-01-06 21:18:18 +0000 (Mon, 06 Jan 2014)
Log Message:
-----------
Replace references to the "make" command by ${BUILD_COMMAND} (now
implemented by the setup files for each appropriate CMake generator
for maximum generality.

Other changes (such as the reference to the now working "MinGW Makefiles"
generator) to bring this documention up to date.

Modified Paths:
--------------
    trunk/cmake/epa_build/README

Modified: trunk/cmake/epa_build/README
===================================================================
--- trunk/cmake/epa_build/README	2014-01-06 20:51:38 UTC (rev 12923)
+++ trunk/cmake/epa_build/README	2014-01-06 21:18:18 UTC (rev 12924)
@@ -83,15 +83,15 @@
 
 * Linux
 
-Tailor the indicated values in setup/setup_linux for your own
+Tailor the indicated values in setup/setup_linux_makefiles for your own
 system, then source that file, e.g.,
 
-source <Top directory of PLplot source tree>/cmake/epa_build/setup/setup_linux
+source <Top directory of PLplot source tree>/cmake/epa_build/setup/setup_linux_makefiles
 
 * Mac OS X
 
-This has not been tried yet, but something similar to setup_linux should
-do the job.
+This has not been tried yet, but something similar to
+setup_linux_makefiles should do the job.
 
 * Cygwin on Windows
 
@@ -146,8 +146,10 @@
 
 * Linux
 
-Note that setup_linux sets up all the important environment variables you
-need including GENERATOR_STRING, INSTALL_PREFIX, and EPA_BUILD_SOURCE_PATH.
+Note that setup_linux_makefiles (which needs to be tailored by each
+individual who uses epa_build) sets up all the important environment
+variables you need including GENERATOR_STRING, INSTALL_PREFIX,
+EPA_BUILD_SOURCE_PATH, and BUILD_COMMAND.
 
 A. [OPTIONAL] build necessary additional buildtools whose versions you
 prefer compared to the versions available on your Linux distro.
@@ -165,7 +167,7 @@
 less cmake.out
 
 # Figure out which buildtools you want to build
-make help
+${BUILD_COMMAND} help
 
 # I recommend building all of them on Linux.
 make build_all >& build_all.out
@@ -192,16 +194,16 @@
 less cmake.out
 
 # Figure out which packages you want to build
-make help
+${BUILD_COMMAND} help
 
 # Build and test the "lite" version of PLplot
-make build_plplot_lite >& build_plplot_lite.out
+${BUILD_COMMAND} build_plplot_lite >& build_plplot_lite.out
 
 # Check build_plplot_lite.out for any errors
 less build_plplot_lite.out
 
 # [OPTIONAL] Build and test the complete version of PLplot.
-make build_plplot >& build_plplot.out
+${BUILD_COMMAND} build_plplot >& build_plplot.out
 
 # Check build_plplot.out for any errors
 less build_plplot.out
@@ -224,6 +226,15 @@
 
 II. Non-Cygwin Windows platforms
 
+Note that setup_msys_makefiles and setup_mingw_makefiles (which need
+to be tailored by each individual who uses epa_build) are designed to
+set up for the "MSYS Makefiles" generator and the "MinGW Makefiles
+generator all the important environment variables you need including
+GENERATOR_STRING, INSTALL_PREFIX, EPA_BUILD_SOURCE_PATH, and
+BUILD_COMMAND.  Similarly, other setup files should be created for
+other Windows generators that I (AWI) have tried so far by hand such as
+"NMake Makefiles JOM" and "Ninja".
+
 For the MinGW/MSYS/Wine case, I (AWI) essentially followed the same
 instructions as above for the Linux case.  However, some of the
 buildtools (e.g., Tcl/Tk/Itcl/Itk/Iwidgets variants) don't yet build

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12923] trunk/cmake/epa_build/setup

From: <ai...@us...> - 2014-01-06 20:51:41

Revision: 12923
          http://sourceforge.net/p/plplot/code/12923
Author:   airwin
Date:     2014-01-06 20:51:38 +0000 (Mon, 06 Jan 2014)
Log Message:
-----------
Implement the BUILD_COMMAND variable which is a variable that
contains the name of the correct build command for the generator.

Drop MAKE_COMMAND if it has been implemented.  I prefer the variable
name BUILD_COMMAND instead because some generators (e.g., ninja) use a
build command that has nothing to do with make.

Modified Paths:
--------------
    trunk/cmake/epa_build/setup/setup_linux_makefiles
    trunk/cmake/epa_build/setup/setup_mingw_makefiles
    trunk/cmake/epa_build/setup/setup_msys_makefiles

Modified: trunk/cmake/epa_build/setup/setup_linux_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_linux_makefiles	2014-01-06 20:41:54 UTC (rev 12922)
+++ trunk/cmake/epa_build/setup/setup_linux_makefiles	2014-01-06 20:51:38 UTC (rev 12923)
@@ -56,4 +56,7 @@
 # so they are only used as a last resort.
 PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig
 
+# BUILD_COMMAND contains the appropriate build command for this generator.
+export BUILD_COMMAND=make
+
 export GENERATOR_STRING="Unix Makefiles"

Modified: trunk/cmake/epa_build/setup/setup_mingw_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_mingw_makefiles	2014-01-06 20:41:54 UTC (rev 12922)
+++ trunk/cmake/epa_build/setup/setup_mingw_makefiles	2014-01-06 20:51:38 UTC (rev 12923)
@@ -31,8 +31,9 @@
 # Put install-location pkg-config directories at top of PKG_CONFIG_PATH
 PKG_CONFIG_PATH=$INSTALL_PREFIX/share/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
 
-# MAKE_COMMAND contains the appropriate make command for this generator.
-export MAKE_COMMAND=mingw32-make
+# BUILD_COMMAND contains the appropriate build command for this generator.
+export BUILD_COMMAND=make
+export BUILD_COMMAND=mingw32-make
 
 # Apparently the presence of sh.exe on the PATH is a signal to
 # mingw32-make.exe to use different (incorrect from the CMake point of

Modified: trunk/cmake/epa_build/setup/setup_msys_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_msys_makefiles	2014-01-06 20:41:54 UTC (rev 12922)
+++ trunk/cmake/epa_build/setup/setup_msys_makefiles	2014-01-06 20:51:38 UTC (rev 12923)
@@ -31,8 +31,8 @@
 # Put install-location pkg-config directories at top of PKG_CONFIG_PATH
 PKG_CONFIG_PATH=$INSTALL_PREFIX/share/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
 
-# MAKE_COMMAND contains the appropriate make command for this generator.
-export MAKE_COMMAND=make
+# BUILD_COMMAND contains the appropriate build command for this generator.
+export BUILD_COMMAND=make
 
 # Put MSYS at the top of the PATH
 PATH=$MINGW_PREFIX/msys/1.0/bin/:$PATH

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12922] trunk/cmake/epa_build/setup

From: <ai...@us...> - 2014-01-06 20:41:57

Revision: 12922
          http://sourceforge.net/p/plplot/code/12922
Author:   airwin
Date:     2014-01-06 20:41:54 +0000 (Mon, 06 Jan 2014)
Log Message:
-----------
Rename setup_linux ==> setup_linux_makefiles

Added Paths:
-----------
    trunk/cmake/epa_build/setup/setup_linux_makefiles

Removed Paths:
-------------
    trunk/cmake/epa_build/setup/setup_linux

Deleted: trunk/cmake/epa_build/setup/setup_linux
===================================================================
--- trunk/cmake/epa_build/setup/setup_linux	2014-01-06 09:35:54 UTC (rev 12921)
+++ trunk/cmake/epa_build/setup/setup_linux	2014-01-06 20:41:54 UTC (rev 12922)
@@ -1,59 +0,0 @@
-# Source this file to setup a Linux build_packages build.
-
-# Tailor these values.
-
-# Put latest CMake on PATH
-PATH=/home/software/cmake/install/bin:$PATH
-
-export INSTALL_PREFIX=/home/wine/newstart/build_script/install-linux
-
-export EPA_BUILD_SOURCE_PATH=/home/software/plplot_svn/HEAD/plplot_allura/cmake/epa_build
-
-# gcc, g++, and gfortran flags you might want to tailor to different values.
-export CFLAGS='-O3 -fvisibility=hidden -Wuninitialized'
-export CXXFLAGS='-O3 -fvisibility=hidden -Wuninitialized'
-export FFLAGS='-O3 -Wuninitialized'
-
-# The debian gcj-4.7-jdk package (or its dependencies) has
-# some peculiar locations for java components so CMake needs
-# some help in finding those.
-export CMAKE_INCLUDE_PATH=/usr/lib/gcc/x86_64-linux-gnu/4.7/include
-export CMAKE_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/gcj-4.7-13
-
-# In the past, CMake has needed help finding the Phobos library for D
-# for Debian stable.  I am not sure this is necessary anymore with D2,
-# but it apparently does not hurt.
-CMAKE_LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/4.6/:$CMAKE_LIBRARY_PATH
-
-# End of tailored values.
-
-# Put buildtools that have been built and installed by build_packages on PATH.
-PATH=${INSTALL_PREFIX}_buildtools/bin:$PATH
-
-# Put Linux install directory on PATH (so that, e.g., the wxwidgets 
-# configuration tool will be found.
-PATH=${INSTALL_PREFIX}/bin:$PATH
-
-CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}_buildtools/include:$CMAKE_INCLUDE_PATH
-CMAKE_LIBRARY_PATH=${INSTALL_PREFIX}_buildtools/lib:$CMAKE_LIBRARY_PATH
-
-# Put version 3 of itcl and friends higher on CMAKE_INCLUDE_PATH then
-# the above default.
-CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}_buildtools/include/itcl3.4:$CMAKE_INCLUDE_PATH
-
-# Put appropriate install areas on these.
-CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}/include:$CMAKE_INCLUDE_PATH
-CMAKE_LIBRARY_PATH=${INSTALL_PREFIX}/lib:$CMAKE_LIBRARY_PATH
-
-# Put buildtools pkg-config directories at top of PKG_CONFIG_PATH
-export PKG_CONFIG_PATH=${INSTALL_PREFIX}_buildtools/share/pkgconfig:${INSTALL_PREFIX}_buildtools/lib/pkgconfig
-
-# Put install-location pkg-config directories at top of PKG_CONFIG_PATH
-PKG_CONFIG_PATH=$INSTALL_PREFIX/share/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
-
-# As temporary measure also use system-installed *.pc files for dependencies
-# which are currently not built.  Put these at the end of PKG_CONFIG_PATH
-# so they are only used as a last resort.
-PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig
-
-export GENERATOR_STRING="Unix Makefiles"

Copied: trunk/cmake/epa_build/setup/setup_linux_makefiles (from rev 12912, trunk/cmake/epa_build/setup/setup_linux)
===================================================================
--- trunk/cmake/epa_build/setup/setup_linux_makefiles	                        (rev 0)
+++ trunk/cmake/epa_build/setup/setup_linux_makefiles	2014-01-06 20:41:54 UTC (rev 12922)
@@ -0,0 +1,59 @@
+# Source this file to setup a Linux build_packages build.
+
+# Tailor these values.
+
+# Put latest CMake on PATH
+PATH=/home/software/cmake/install/bin:$PATH
+
+export INSTALL_PREFIX=/home/wine/newstart/build_script/install-linux
+
+export EPA_BUILD_SOURCE_PATH=/home/software/plplot_svn/HEAD/plplot_allura/cmake/epa_build
+
+# gcc, g++, and gfortran flags you might want to tailor to different values.
+export CFLAGS='-O3 -fvisibility=hidden -Wuninitialized'
+export CXXFLAGS='-O3 -fvisibility=hidden -Wuninitialized'
+export FFLAGS='-O3 -Wuninitialized'
+
+# The debian gcj-4.7-jdk package (or its dependencies) has
+# some peculiar locations for java components so CMake needs
+# some help in finding those.
+export CMAKE_INCLUDE_PATH=/usr/lib/gcc/x86_64-linux-gnu/4.7/include
+export CMAKE_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/gcj-4.7-13
+
+# In the past, CMake has needed help finding the Phobos library for D
+# for Debian stable.  I am not sure this is necessary anymore with D2,
+# but it apparently does not hurt.
+CMAKE_LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/4.6/:$CMAKE_LIBRARY_PATH
+
+# End of tailored values.
+
+# Put buildtools that have been built and installed by build_packages on PATH.
+PATH=${INSTALL_PREFIX}_buildtools/bin:$PATH
+
+# Put Linux install directory on PATH (so that, e.g., the wxwidgets 
+# configuration tool will be found.
+PATH=${INSTALL_PREFIX}/bin:$PATH
+
+CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}_buildtools/include:$CMAKE_INCLUDE_PATH
+CMAKE_LIBRARY_PATH=${INSTALL_PREFIX}_buildtools/lib:$CMAKE_LIBRARY_PATH
+
+# Put version 3 of itcl and friends higher on CMAKE_INCLUDE_PATH then
+# the above default.
+CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}_buildtools/include/itcl3.4:$CMAKE_INCLUDE_PATH
+
+# Put appropriate install areas on these.
+CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}/include:$CMAKE_INCLUDE_PATH
+CMAKE_LIBRARY_PATH=${INSTALL_PREFIX}/lib:$CMAKE_LIBRARY_PATH
+
+# Put buildtools pkg-config directories at top of PKG_CONFIG_PATH
+export PKG_CONFIG_PATH=${INSTALL_PREFIX}_buildtools/share/pkgconfig:${INSTALL_PREFIX}_buildtools/lib/pkgconfig
+
+# Put install-location pkg-config directories at top of PKG_CONFIG_PATH
+PKG_CONFIG_PATH=$INSTALL_PREFIX/share/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
+
+# As temporary measure also use system-installed *.pc files for dependencies
+# which are currently not built.  Put these at the end of PKG_CONFIG_PATH
+# so they are only used as a last resort.
+PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig
+
+export GENERATOR_STRING="Unix Makefiles"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12921] trunk/bindings/tcl/README.tclAPI

From: <arj...@us...> - 2014-01-06 09:35:57

Revision: 12921
          http://sourceforge.net/p/plplot/code/12921
Author:   arjenmarkus
Date:     2014-01-06 09:35:54 +0000 (Mon, 06 Jan 2014)
Log Message:
-----------
Updating information on the generation of the Tcl API. Just a minor update

Modified Paths:
--------------
    trunk/bindings/tcl/README.tclAPI

Modified: trunk/bindings/tcl/README.tclAPI
===================================================================
--- trunk/bindings/tcl/README.tclAPI	2014-01-05 23:04:10 UTC (rev 12920)
+++ trunk/bindings/tcl/README.tclAPI	2014-01-06 09:35:54 UTC (rev 12921)
@@ -6,10 +6,12 @@
 files as a guide.  If plapi.tpl has been changed, then the Makefile
 generates the files tclgen.c, tclgen.h, tclgen_s.h using the command
 
-perl pltclgen
+tclsh ${CMAKE_CURRENT_SOURCE_DIR}/pltclgen.tcl ${CMAKE_CURRENT_SOURCE_DIR}
 
-(now tclsh ${CMAKE_CURRENT_SOURCE_DIR}/pltclgen.tcl ${CMAKE_CURRENT_SOURCE_DIR})
-
 tclAPI.c includes the generated files tclgen.c, tclgen.h, tclgen_s.h
 where appropriate and also adds additional more complicated API as required
 to define the overall PLplot API for Tcl.
+
+Note: For the Itcl interface the perl script plitclgen is used instead:
+
+perl plitclgen

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12920] trunk/cmake/epa_build/itcl3/CMakeLists.txt

From: <ai...@us...> - 2014-01-05 23:04:16

Revision: 12920
          http://sourceforge.net/p/plplot/code/12920
Author:   airwin
Date:     2014-01-05 23:04:10 +0000 (Sun, 05 Jan 2014)
Log Message:
-----------
Update epa_build configuration of itcl3 so that it works on MinGW/MSYS.

Modified Paths:
--------------
    trunk/cmake/epa_build/itcl3/CMakeLists.txt

Modified: trunk/cmake/epa_build/itcl3/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/itcl3/CMakeLists.txt	2014-01-05 20:14:19 UTC (rev 12919)
+++ trunk/cmake/epa_build/itcl3/CMakeLists.txt	2014-01-05 23:04:10 UTC (rev 12920)
@@ -41,6 +41,14 @@
   source_PATH
   )
 
+if(MSYS_PLATFORM)
+  set(library_prefix)
+  set(library_suffix .dll)
+else(MSYS_PLATFORM)
+  set(library_prefix lib)
+  set(library_suffix .so)
+endif(MSYS_PLATFORM)
+
 set(CFLAGS "$ENV{CFLAGS}")
 # Drop -fvisibility=hidden since that option does not for itcl3.
 string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}")
@@ -51,9 +59,15 @@
 # But currently just use the ordinary install location.
 set(INCRTCL3_PREFIX ${EPA_CMAKE_INSTALL_PREFIX})
 
+set(VERSION 3.4.1)
+string(REGEX REPLACE "\\.[0-9]$" "" DIRVERSION ${VERSION})
+if(MSYS_PLATFORM)
+  string(REGEX REPLACE "\\." "" LIBVERSION ${DIRVERSION})
+else(MSYS_PLATFORM)
+  set(LIBVERSION ${DIRVERSION})
+endif(MSYS_PLATFORM)
+
 # Data that is related to downloads.
-set(VERSION 3.4.1)
-set(LIBVERSION 3.4)
 set(URL http://downloads.sourceforge.net/project/incrtcl/%5bIncr%20Tcl_Tk%5d-source/${VERSION}/itcl${VERSION}.tar.gz)
 set(DOWNLOAD_HASH_TYPE MD5)
 set(DOWNLOAD_HASH e7c98e0f69df1a675073ddd3344f0b7f)
@@ -67,7 +81,7 @@
   DEPENDS ${dependencies_targets}
   URL ${URL}
   URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" ${source_PATH}/configure --prefix=${INCRTCL3_PREFIX} --exec-prefix=${INCRTCL3_PREFIX} --includedir=${INCRTCL3_PREFIX}/include/itcl${LIBVERSION} --mandir=${INCRTCL3_PREFIX}/share/man ${ENABLE_64_BIT} --with-tcl=${EPA_CMAKE_INSTALL_PREFIX}/lib --with-tclinclude=${EPA_CMAKE_INSTALL_PREFIX}/include 
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" ${source_PATH}/configure --prefix=${INCRTCL3_PREFIX} --exec-prefix=${INCRTCL3_PREFIX} --includedir=${INCRTCL3_PREFIX}/include/itcl${DIRVERSION} --mandir=${INCRTCL3_PREFIX}/share/man ${ENABLE_64_BIT} --with-tcl=${EPA_CMAKE_INSTALL_PREFIX}/lib --with-tclinclude=${EPA_CMAKE_INSTALL_PREFIX}/include 
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install
   )
@@ -78,11 +92,11 @@
   COMMAND echo "Replace build-tree locations by install-tree locations"
   COMMAND ${SED_EXECUTABLE}
   # Cover two different patterns of uppercasing.
-  -e "s@^\\(itcl_SRC_DIR='\\).*@\\1${INCRTCL3_PREFIX}/include/itcl${LIBVERSION}'@"
-  -e "s@^\\(ITCL_SRC_DIR='\\).*@\\1${INCRTCL3_PREFIX}/include/itcl${LIBVERSION}'@"
+  -e "s@^\\(itcl_SRC_DIR='\\).*@\\1${INCRTCL3_PREFIX}/include/itcl${DIRVERSION}'@"
+  -e "s@^\\(ITCL_SRC_DIR='\\).*@\\1${INCRTCL3_PREFIX}/include/itcl${DIRVERSION}'@"
   # Cover two different patterns of uppercasing.
-  -e "/itcl_B/s@='\\(-L\\)\\?.*build_itcl3@='\\1${INCRTCL3_PREFIX}/lib/itcl${LIBVERSION}@"
-  -e "/ITCL_B/s@='\\(-L\\)\\?.*build_itcl3@='\\1${INCRTCL3_PREFIX}/lib/itcl${LIBVERSION}@"
+  -e "/itcl_B/s@='\\(-L\\)\\?.*build_itcl3@='\\1${INCRTCL3_PREFIX}/lib/itcl${DIRVERSION}@"
+  -e "/ITCL_B/s@='\\(-L\\)\\?.*build_itcl3@='\\1${INCRTCL3_PREFIX}/lib/itcl${DIRVERSION}@"
   # Overwrite original file.
   -i itclConfig.sh
   APPEND
@@ -92,7 +106,7 @@
   OUTPUT
   ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-install
   COMMAND ${CMAKE_COMMAND} -E echo "Install-tree fixups"
-  COMMAND ${CHMOD_EXECUTABLE} -v ${SO_NUMERICAL_PERMISSIONS} ${INCRTCL3_PREFIX}/lib/itcl${LIBVERSION}/libitcl${LIBVERSION}.so
-  COMMAND ${CMAKE_COMMAND} -E rename ${INCRTCL3_PREFIX}/lib/itclConfig.sh ${INCRTCL3_PREFIX}/lib/itcl${LIBVERSION}/itclConfig.sh
+  COMMAND ${CHMOD_EXECUTABLE} -v ${SO_NUMERICAL_PERMISSIONS} ${INCRTCL3_PREFIX}/lib/itcl${DIRVERSION}/${library_prefix}itcl${LIBVERSION}${library_suffix}
+  COMMAND ${CMAKE_COMMAND} -E rename ${INCRTCL3_PREFIX}/lib/itclConfig.sh ${INCRTCL3_PREFIX}/lib/itcl${DIRVERSION}/itclConfig.sh
   APPEND
   )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12919] trunk/cmake/epa_build/tk/CMakeLists.txt

From: <ai...@us...> - 2014-01-05 20:14:22

Revision: 12919
          http://sourceforge.net/p/plplot/code/12919
Author:   airwin
Date:     2014-01-05 20:14:19 +0000 (Sun, 05 Jan 2014)
Log Message:
-----------
Update the epa_build configuration of tk so that it works on MinGW/MSYS.

Tested by: Alan W. Irwin <ai...@us...> on
MinGW/MSYS/Wine-1.6.1 for the epa_build project with
-DBUILD_THE_BUILDTOOLS=ON using the build_tk target.

N.B. this test shows that Tk builds without issues on MinGW/MSYS
against the installed Tcl epa_build result, but the test
does not include run-time testing.

Modified Paths:
--------------
    trunk/cmake/epa_build/tk/CMakeLists.txt

Modified: trunk/cmake/epa_build/tk/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/tk/CMakeLists.txt	2014-01-05 06:47:16 UTC (rev 12918)
+++ trunk/cmake/epa_build/tk/CMakeLists.txt	2014-01-05 20:14:19 UTC (rev 12919)
@@ -41,25 +41,35 @@
   ) 
 
 # Data that is related to the PATH that must be used.
-# N.B. note below that we always use the unix subdirectory of the
-# source tree to find the configure script.  Note, there is a macosx
-# and win subdirectory there as well that contain configure scripts
-# with additional options for those platforms, but for now the unix
-# version of configure may be good enough for our needs for all
-# platforms.
+# N.B. note below that we currently use the unix subdirectory for the
+# Mac OS X case.  There is also a Tcl macosx subdirectory we might
+# want to try in that case once an epa_build user with access to a Mac
+# OS X platform gives this a try.
 if(MSYS_PLATFORM)
-  set(source_PATH ${source_PATH}\\unix)
+  set(source_PATH ${source_PATH}/win)
+  set(executable_suffix .exe)
+  set(library_suffix .a)
+  # Workaround for the Tk autotools build system for Windows not
+  # propagating CFLAGS to windres.
+  set(make_args "RC=windres -I${EPA_CMAKE_INSTALL_PREFIX}/include")
 else(MSYS_PLATFORM)
   set(source_PATH ${source_PATH}/unix)
+  set(executable_suffix)
+  set(library_suffix .so)
+  set(make_args)
 endif(MSYS_PLATFORM)
 
 set(CFLAGS "$ENV{CFLAGS}")
 # Drop -fvisibility=hidden since that option may not work for this package.
 string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}")
 
-# Data that is related to downloads.
 set(TCL_TK_VERSION 8.6.1)
 string(REGEX REPLACE "\\.[0-9]$" "" TCL_TK_LIBVERSION ${TCL_TK_VERSION})
+if(MSYS_PLATFORM)
+  string(REGEX REPLACE "\\." "" TCL_TK_LIBVERSION ${TCL_TK_LIBVERSION})
+endif(MSYS_PLATFORM)
+
+# Data that is related to downloads.
 set(URL http://downloads.sourceforge.net/project/tcl/Tcl/${TCL_TK_VERSION}/tk${TCL_TK_VERSION}-src.tar.gz)
 set(DOWNLOAD_HASH_TYPE MD5)
 set(DOWNLOAD_HASH 63f21c3a0e0cefbd854b4eb29b129ac6)
@@ -73,9 +83,9 @@
   DEPENDS ${dependencies_targets}
   URL ${URL}
   URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" CPPFLAGS=-I${EPA_CMAKE_INSTALL_PREFIX}/include ${source_PATH}/${EPA_CONFIGURE_COMMAND} --mandir=${EPA_CMAKE_INSTALL_PREFIX}/share/man ${ENABLE_64_BIT}
-  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
-  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS} -I${EPA_CMAKE_INSTALL_PREFIX}/include" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --mandir=${EPA_CMAKE_INSTALL_PREFIX}/share/man ${ENABLE_64_BIT}
+  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} ${make_args}
+  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install ${make_args}
   )
 
 add_custom_command(
@@ -94,7 +104,7 @@
   ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-install
   COMMAND echo "Install-tree fixups"
   COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install-private-headers
-  COMMAND ${LN_EXECUTABLE} -v -sf wish${TCL_TK_LIBVERSION} ${EPA_CMAKE_INSTALL_PREFIX}/bin/wish
-  COMMAND ${CHMOD_EXECUTABLE} -v ${SO_NUMERICAL_PERMISSIONS} ${EPA_CMAKE_INSTALL_PREFIX}/lib/libtk${TCL_TK_LIBVERSION}.so
+  COMMAND ${LN_EXECUTABLE} -v -sf wish${TCL_TK_LIBVERSION}${executable_suffix} ${EPA_CMAKE_INSTALL_PREFIX}/bin/wish${executable_suffix}
+  COMMAND ${CHMOD_EXECUTABLE} -v ${SO_NUMERICAL_PERMISSIONS} ${EPA_CMAKE_INSTALL_PREFIX}/lib/libtk${TCL_TK_LIBVERSION}${library_suffix}
   APPEND
   )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12918] trunk/cmake/epa_build/tcl/CMakeLists.txt

From: <ai...@us...> - 2014-01-05 06:47:23

Revision: 12918
          http://sourceforge.net/p/plplot/code/12918
Author:   airwin
Date:     2014-01-05 06:47:16 +0000 (Sun, 05 Jan 2014)
Log Message:
-----------
Update tcl epa_build configuration so that it works on MinGW/MSYS.

Modified Paths:
--------------
    trunk/cmake/epa_build/tcl/CMakeLists.txt

Modified: trunk/cmake/epa_build/tcl/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/tcl/CMakeLists.txt	2014-01-04 22:38:22 UTC (rev 12917)
+++ trunk/cmake/epa_build/tcl/CMakeLists.txt	2014-01-05 06:47:16 UTC (rev 12918)
@@ -41,16 +41,18 @@
   ) 
 
 # Data that is related to the PATH that must be used.
-# N.B. note below that we always use the unix subdirectory of the
-# source tree to find the configure script.  Note, there is a macosx
-# and win subdirectory there as well that contain configure scripts
-# with additional options for those platforms, but for now the unix
-# version of configure may be good enough for our needs for all
-# platforms.
+# N.B. note below that we currently use the unix subdirectory for the
+# Mac OS X case.  There is also a Tcl macosx subdirectory we might
+# want to try in that case once an epa_build user with access to a Mac
+# OS X platform gives this a try.
 if(MSYS_PLATFORM)
-  set(source_PATH ${source_PATH}\\unix)
+  set(source_PATH ${source_PATH}/win)
+  set(executable_suffix .exe)
+  set(library_suffix .a)
 else(MSYS_PLATFORM)
   set(source_PATH ${source_PATH}/unix)
+  set(executable_suffix)
+  set(library_suffix .so)
 endif(MSYS_PLATFORM)
 
 set(CFLAGS "$ENV{CFLAGS}")
@@ -62,6 +64,9 @@
 
 set(TCL_TK_VERSION 8.6.1)
 string(REGEX REPLACE "\\.[0-9]$" "" TCL_TK_LIBVERSION ${TCL_TK_VERSION})
+if(MSYS_PLATFORM)
+  string(REGEX REPLACE "\\." "" TCL_TK_LIBVERSION ${TCL_TK_LIBVERSION})
+endif(MSYS_PLATFORM)
 
 # Data that is related to downloads.
 set(URL http://downloads.sourceforge.net/project/tcl/Tcl/${TCL_TK_VERSION}/tcl${TCL_TK_VERSION}-src.tar.gz)
@@ -98,7 +103,7 @@
   ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-install
   COMMAND echo "Install-tree fixups"
   COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install-private-headers
-  COMMAND ${LN_EXECUTABLE} -v -sf tclsh${TCL_TK_LIBVERSION} ${EPA_CMAKE_INSTALL_PREFIX}/bin/tclsh
-  COMMAND ${CHMOD_EXECUTABLE} -v ${SO_NUMERICAL_PERMISSIONS} ${EPA_CMAKE_INSTALL_PREFIX}/lib/libtcl${TCL_TK_LIBVERSION}.so
+  COMMAND ${LN_EXECUTABLE} -v -sf tclsh${TCL_TK_LIBVERSION}${executable_suffix} ${EPA_CMAKE_INSTALL_PREFIX}/bin/tclsh${executable_suffix}
+  COMMAND ${CHMOD_EXECUTABLE} -v ${SO_NUMERICAL_PERMISSIONS} ${EPA_CMAKE_INSTALL_PREFIX}/lib/libtcl${TCL_TK_LIBVERSION}${library_suffix}
   APPEND
   )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12917] trunk/cmake/epa_build/setup

From: <ai...@us...> - 2014-01-04 22:38:24

Revision: 12917
          http://sourceforge.net/p/plplot/code/12917
Author:   airwin
Date:     2014-01-04 22:38:22 +0000 (Sat, 04 Jan 2014)
Log Message:
-----------
Add a setup for the "MinGW Makefiles" generator case.

Add the MAKE_COMMAND environment variable for the "MSYS Makefiles"
generator case.

Modified Paths:
--------------
    trunk/cmake/epa_build/setup/setup_msys_makefiles

Added Paths:
-----------
    trunk/cmake/epa_build/setup/setup_mingw_makefiles

Added: trunk/cmake/epa_build/setup/setup_mingw_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_mingw_makefiles	                        (rev 0)
+++ trunk/cmake/epa_build/setup/setup_mingw_makefiles	2014-01-04 22:38:22 UTC (rev 12917)
@@ -0,0 +1,42 @@
+# This script should be sourced from an MSYS bash environment.  Its
+# purpose is to setup environment variables needed to run any standard
+# cmake "MinGW Makefiles" build on a Windows platform.
+
+source setup_mingw_msys_wine_toolchain
+
+# Tailor this install location for "MinGW Makefiles" builds to your local needs:
+export INSTALL_PREFIX=/z/home/wine/newstart/build_script/install-$WINEVERSION_mingw
+
+# End of tailored values.
+
+# Put buildtools that have been built and installed by build_packages on PATH.
+PATH=${INSTALL_PREFIX}_buildtools/bin:$PATH
+
+# Put install directory on PATH (so that, e.g., the wxwidgets 
+# configuration tool will be found.
+PATH=${INSTALL_PREFIX}/bin:$PATH
+
+# Put appropriate buildtools areas on these.
+CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}_buildtools/include:$CMAKE_INCLUDE_PATH
+CMAKE_LIBRARY_PATH=${INSTALL_PREFIX}_buildtools/lib:$CMAKE_LIBRARY_PATH
+
+# Put version 3 of itcl and friends higher on CMAKE_INCLUDE_PATH then
+# the above default.
+CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}_buildtools/include/itcl3.4:$CMAKE_INCLUDE_PATH
+
+# Put appropriate install areas on these.
+CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}/include:$CMAKE_INCLUDE_PATH
+CMAKE_LIBRARY_PATH=${INSTALL_PREFIX}/lib:$CMAKE_LIBRARY_PATH
+
+# Put install-location pkg-config directories at top of PKG_CONFIG_PATH
+PKG_CONFIG_PATH=$INSTALL_PREFIX/share/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
+
+# MAKE_COMMAND contains the appropriate make command for this generator.
+export MAKE_COMMAND=mingw32-make
+
+# Apparently the presence of sh.exe on the PATH is a signal to
+# mingw32-make.exe to use different (incorrect from the CMake point of
+# view) PATH processing.  So make sure sh.exe is not on the PATH.
+PATH=$MINGW_PREFIX/msys/1.0/bin_without_sh/:$PATH
+
+export GENERATOR_STRING="MinGW Makefiles"

Modified: trunk/cmake/epa_build/setup/setup_msys_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_msys_makefiles	2013-12-31 18:06:30 UTC (rev 12916)
+++ trunk/cmake/epa_build/setup/setup_msys_makefiles	2014-01-04 22:38:22 UTC (rev 12917)
@@ -31,6 +31,9 @@
 # Put install-location pkg-config directories at top of PKG_CONFIG_PATH
 PKG_CONFIG_PATH=$INSTALL_PREFIX/share/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
 
+# MAKE_COMMAND contains the appropriate make command for this generator.
+export MAKE_COMMAND=make
+
 # Put MSYS at the top of the PATH
 PATH=$MINGW_PREFIX/msys/1.0/bin/:$PATH
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12916] trunk/www/index.php

From: <ai...@us...> - 2013-12-31 18:06:34

Revision: 12916
          http://sourceforge.net/p/plplot/code/12916
Author:   airwin
Date:     2013-12-31 18:06:30 +0000 (Tue, 31 Dec 2013)
Log Message:
-----------
Replace "Fortran 77/90" ==> "Fortran 95".

Modified Paths:
--------------
    trunk/www/index.php

Modified: trunk/www/index.php
===================================================================
--- trunk/www/index.php	2013-12-31 17:39:32 UTC (rev 12915)
+++ trunk/www/index.php	2013-12-31 18:06:30 UTC (rev 12916)
@@ -39,7 +39,7 @@
 				<ul class="arrowlist">
 				  <li>Ada</li>
 				  <li>C/C++/D</li>
-				  <li>Fortran 77/90</li>
+				  <li>Fortran 95</li>
 				  <li>Java</li>
 				  <li><a href="http://common-lisp.net/project/cl-plplot/">Lisp</a></li>
 				  <li>Lua</li>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12915] trunk/INSTALL

From: <ai...@us...> - 2013-12-31 17:39:34

Revision: 12915
          http://sourceforge.net/p/plplot/code/12915
Author:   airwin
Date:     2013-12-31 17:39:32 +0000 (Tue, 31 Dec 2013)
Log Message:
-----------
Replace g77 by gfortran in build instructions.

Modified Paths:
--------------
    trunk/INSTALL

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2013-12-29 20:11:07 UTC (rev 12914)
+++ trunk/INSTALL	2013-12-31 17:39:32 UTC (rev 12915)
@@ -65,7 +65,7 @@
 
 export CC="gcc -O2"
 export CXX="g++ -O2"
-export FC="g77 -O2"
+export FC="gfortran -O2"
 
 If you don't set the environment variables above, then by default no
 compiler options (i.e., no optimization and no debugging symbols) are used

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12914] trunk

From: <ai...@us...> - 2013-12-29 20:11:11

Revision: 12914
          http://sourceforge.net/p/plplot/code/12914
Author:   airwin
Date:     2013-12-29 20:11:07 +0000 (Sun, 29 Dec 2013)
Log Message:
-----------
Rename config.h to plplot_config.h to avoid name clashes with other
projects (such as octave) which have headers named config.h.  This
change was comprehensive involving all files found by the following
command:

find . -type f |grep -v .svn |xargs grep config\\.h |grep -v epa_build \
|grep -vi changelog |grep -v plplot_config\\.h

Tested by: Alan W. Irwin <ai...@us...> on Linux
using 

scripts/make_tarball.sh -c -i /tmp/plplot_install
find /tmp/plplot* -name "*.out" |xargs grep -i error

Modified Paths:
--------------
    trunk/CMakeLists.txt
    trunk/doc/CMakeLists.txt
    trunk/doc/Doxyfile.in
    trunk/drivers/plplotcanvas-hacktext.c
    trunk/include/plConfig.h.in
    trunk/scripts/style_source.sh

Added Paths:
-----------
    trunk/plplot_config.h.in

Removed Paths:
-------------
    trunk/config.h.in

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2013-12-29 02:13:54 UTC (rev 12913)
+++ trunk/CMakeLists.txt	2013-12-29 20:11:07 UTC (rev 12914)
@@ -121,10 +121,10 @@
   )
 
 configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
-  ${CMAKE_CURRENT_BINARY_DIR}/config.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/plplot_config.h.in
+  ${CMAKE_CURRENT_BINARY_DIR}/plplot_config.h
   )
-# Allow access to the generated config.h for this build.
+# Allow access to the generated plplot_config.h for this build.
 add_definitions("-DHAVE_CONFIG_H")
 # Install top-level files
 

Deleted: trunk/config.h.in
===================================================================
--- trunk/config.h.in	2013-12-29 02:13:54 UTC (rev 12913)
+++ trunk/config.h.in	2013-12-29 20:11:07 UTC (rev 12914)
@@ -1,311 +0,0 @@
-// Configured (by CMake) macros for PLplot that are required for the
-// core build but _not_ required for the build of the installed
-// examples (and presumably any user applications).  Therefore, the
-// configured config.h should not be installed.  In contrast,
-// include/plConfig.h.cmake (note, plConfig.h #includes config.h for
-// the core build because HAVE_CONFIG_H is #defined in that case)
-// contains configured macros that are required for the core build,
-// installed examples build, and build of user applications.
-// Therefore, in contrast to config.h, plConfig.h should be installed.
-//
-// Maintenance issue: in makes no sense to configure duplicate macros
-// for both config.h and plConfig.h.  Therefore, when adding a macro
-// decide which file to put it in depending on whether the result is
-// needed for the installed examples build or not.  Furthermore, move
-// configured macros from one file to the other as needed depending on
-// that criterion, but do not copy them.
-//
-//
-
-// Location of executables
-#define BIN_DIR                  "@BIN_DIR@"
-
-// Location of Build tree
-#define BUILD_DIR                "@BUILD_DIR@"
-
-// Location of package data files
-#define DATA_DIR                 "@DATA_DIR@"
-
-// Location of dynamically loaded drivers
-#define DRV_DIR                  "@DRV_DIR@"
-
-// Name of the default cmap0 palette to use
-#define PL_DEFAULT_CMAP0_FILE    "@DEFAULT_CMAP0_FILE@"
-
-// Name of the default cmap1 palette to use
-#define PL_DEFAULT_CMAP1_FILE    "@DEFAULT_CMAP1_FILE@"
-
-// Define if support for deprecated plplot functions should be compiled
-#cmakedefine PL_DEPRECATED
-
-// Define if there is support for dynamically loaded drivers
-#cmakedefine ENABLE_DYNDRIVERS
-
-// Define to 1 if you have the <cmath> header file.
-#cmakedefine HAVE_CMATH 1
-
-// Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-//
-#cmakedefine HAVE_DIRENT_H 1
-
-// Define to 1 if you have the <dlfcn.h> header file.
-#cmakedefine HAVE_DLFCN_H 1
-
-// Define if [freetype] is available
-#cmakedefine PL_HAVE_FREETYPE
-
-// Define if [shapelib] is available
-#cmakedefine HAVE_SHAPELIB
-
-// Define if [agg] is available
-#cmakedefine HAVE_AGG
-
-// Define to 1 if you have the <glib.h> header file.
-#cmakedefine HAVE_GLIB_H 1
-
-// Define to 1 if you have the <glib-object.h> header file.
-#cmakedefine HAVE_GLIB_OBJECT_H 1
-
-// Define to 1 if you have the <gtk/gtk.h> header file.
-#cmakedefine HAVE_GTK_GTK_H 1
-
-// Define to 1 if you have the <inttypes.h> header file.
-#cmakedefine HAVE_INTTYPES_H 1
-
-// Define if [incr], [Tcl] is available
-#cmakedefine HAVE_ITCL
-
-// Define to 1 if you have the <itclDecls.h> header file.
-#cmakedefine HAVE_ITCLDECLS_H 1
-
-// Define if Tk is available
-#cmakedefine ENABLE_tk
-
-// Define if [incr], [Tk] is available
-#cmakedefine HAVE_ITK
-
-// Define to 1 if you have the <jni.h> header file.
-#cmakedefine HAVE_JNI_H 1
-
-// Define to 1 if you have the <libart_lgpl/libart.h> header file.
-#cmakedefine HAVE_LIBART_LGPL_LIBART_H 1
-
-// Define to 1 if you have the <libgnomecanvas/libgnomecanvas.h> header file.
-//
-#cmakedefine HAVE_LIBGNOMECANVAS_LIBGNOMECANVAS_H 1
-
-// Define to 1 if you have the <libgnomeprint/gnome-print.h> header file.
-#cmakedefine HAVE_LIBGNOMEPRINT_GNOME_PRINT_H 1
-
-// Define if libunicode is available
-#cmakedefine HAVE_LIBUNICODE
-
-// Define to 1 if you have the <math.h> header file.
-#cmakedefine HAVE_MATH_H 1
-
-// Define to 1 if you have the <memory.h> header file.
-#cmakedefine HAVE_MEMORY_H 1
-
-// Define to 1 if the function mkstemp is available.
-#cmakedefine PL_HAVE_MKSTEMP 1
-
-// Define to 1 if the function mkdtemp is available.
-#cmakedefine PL_HAVE_MKDTEMP 1
-
-// Define to 1 if the function mkfifo is available.
-#cmakedefine PL_HAVE_MKFIFO 1
-
-// Define to 1 if you have the <ndir.h> header file, and it defines `DIR'.
-#cmakedefine HAVE_NDIR_H 1
-
-// Define if libpango is available
-#cmakedefine HAVE_PANGO
-
-// Define if popen is available
-#cmakedefine HAVE_POPEN
-
-// Define if _NSGetArgc is available
-#cmakedefine HAVE_NSGETARGC
-
-// Define if pthreads is available
-#cmakedefine PL_HAVE_PTHREAD
-
-// Define if Qhull is available
-#cmakedefine PL_HAVE_QHULL
-
-// Define to 1 if you have the <stdlib.h> header file.
-#cmakedefine HAVE_STDLIB_H 1
-
-// Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-//
-#cmakedefine HAVE_SYS_DIR_H 1
-
-// Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-//
-#cmakedefine HAVE_SYS_NDIR_H 1
-
-// Define to 1 if you have the <sys/stat.h> header file.
-#cmakedefine HAVE_SYS_STAT_H 1
-
-// Define to 1 if you have the <sys/types.h> header file.
-#cmakedefine HAVE_SYS_TYPES_H 1
-
-// Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible.
-#cmakedefine HAVE_SYS_WAIT_H 1
-
-// Define to 1 if you have the <termios.h> header file.
-#cmakedefine HAVE_TERMIOS_H 1
-
-// Define to 1 if you have the <crt_externs.h> header file.
-#cmakedefine HAVE_CRT_EXTERNS_H 1
-
-// Define to 1 if the function unlink is available
-#cmakedefine PL_HAVE_UNLINK 1
-
-// Define to 1 if you have the `vfork' function.
-#cmakedefine HAVE_VFORK 1
-
-// Define to 1 if you have the <vfork.h> header file.
-#cmakedefine HAVE_VFORK_H 1
-
-// Include sys/type.h if needed
-#cmakedefine NEED_SYS_TYPE_H
-
-// Name of package
-#define PACKAGE    "@PACKAGE@"
-
-// Define if the win32 ltdl implementation should be used
-#cmakedefine LTDL_WIN32
-
-// Portable definition for PTHREAD_MUTEX_RECURSIVE
-#define PLPLOT_MUTEX_RECURSIVE             @PLPLOT_MUTEX_RECURSIVE@
-
-// Directory containing fonts that are accessible from freetype
-#define PL_FREETYPE_FONT_DIR               "@PL_FREETYPE_FONT_DIR@"
-
-// MONO font accessible from freetype
-#define PL_FREETYPE_MONO                   "@PL_FREETYPE_MONO@"
-
-// MONO_BOLD font accessible from freetype
-#define PL_FREETYPE_MONO_BOLD              "@PL_FREETYPE_MONO_BOLD@"
-
-// MONO_BOLD_ITALIC font accessible from freetype
-#define PL_FREETYPE_MONO_BOLD_ITALIC       "@PL_FREETYPE_MONO_BOLD_ITALIC@"
-
-// MONO_BOLD_OBLIQUE font accessible from freetype
-#define PL_FREETYPE_MONO_BOLD_OBLIQUE      "@PL_FREETYPE_MONO_BOLD_OBLIQUE@"
-
-// MONO_ITALIC font accessible from freetype
-#define PL_FREETYPE_MONO_ITALIC            "@PL_FREETYPE_MONO_ITALIC@"
-
-// MONO_OBLIQUE font accessible from freetype
-#define PL_FREETYPE_MONO_OBLIQUE           "@PL_FREETYPE_MONO_OBLIQUE@"
-
-// SANS font accessible from freetype
-#define PL_FREETYPE_SANS                   "@PL_FREETYPE_SANS@"
-
-// SANS_BOLD font accessible from freetype
-#define PL_FREETYPE_SANS_BOLD              "@PL_FREETYPE_SANS_BOLD@"
-
-// SANS_BOLD_ITALIC font accessible from freetype
-#define PL_FREETYPE_SANS_BOLD_ITALIC       "@PL_FREETYPE_SANS_BOLD_ITALIC@"
-
-// SANS_BOLD_OBLIQUE font accessible from freetype
-#define PL_FREETYPE_SANS_BOLD_OBLIQUE      "@PL_FREETYPE_SANS_BOLD_OBLIQUE@"
-
-// SANS_ITALIC font accessible from freetype
-#define PL_FREETYPE_SANS_ITALIC            "@PL_FREETYPE_SANS_ITALIC@"
-
-// SANS_OBLIQUE font accessible from freetype
-#define PL_FREETYPE_SANS_OBLIQUE           "@PL_FREETYPE_SANS_OBLIQUE@"
-
-// SCRIPT font accessible from freetype
-#define PL_FREETYPE_SCRIPT                 "@PL_FREETYPE_SCRIPT@"
-
-// SCRIPT_BOLD font accessible from freetype
-#define PL_FREETYPE_SCRIPT_BOLD            "@PL_FREETYPE_SCRIPT_BOLD@"
-
-// SCRIPT_BOLD_ITALIC font accessible from freetype
-#define PL_FREETYPE_SCRIPT_BOLD_ITALIC     "@PL_FREETYPE_SCRIPT_BOLD_ITALIC@"
-
-// SCRIPT_BOLD_OBLIQUE font accessible from freetype
-#define PL_FREETYPE_SCRIPT_BOLD_OBLIQUE    "@PL_FREETYPE_SCRIPT_BOLD_OBLIQUE@"
-
-// SCRIPT_ITALIC font accessible from freetype
-#define PL_FREETYPE_SCRIPT_ITALIC          "@PL_FREETYPE_SCRIPT_ITALIC@"
-
-// SCRIPT_OBLIQUE font accessible from freetype
-#define PL_FREETYPE_SCRIPT_OBLIQUE         "@PL_FREETYPE_SCRIPT_OBLIQUE@"
-
-// SERIF font accessible from freetype
-#define PL_FREETYPE_SERIF                  "@PL_FREETYPE_SERIF@"
-
-// SERIF_BOLD font accessible from freetype
-#define PL_FREETYPE_SERIF_BOLD             "@PL_FREETYPE_SERIF_BOLD@"
-
-// SERIF_BOLD_ITALIC font accessible from freetype
-#define PL_FREETYPE_SERIF_BOLD_ITALIC      "@PL_FREETYPE_SERIF_BOLD_ITALIC@"
-
-// SERIF_BOLD_OBLIQUE font accessible from freetype
-#define PL_FREETYPE_SERIF_BOLD_OBLIQUE     "@PL_FREETYPE_SERIF_BOLD_OBLIQUE@"
-
-// SERIF_ITALIC font accessible from freetype
-#define PL_FREETYPE_SERIF_ITALIC           "@PL_FREETYPE_SERIF_ITALIC@"
-
-// SERIF_OBLIQUE font accessible from freetype
-#define PL_FREETYPE_SERIF_OBLIQUE          "@PL_FREETYPE_SERIF_OBLIQUE@"
-
-// Symbol font accessible from freetype
-#define PL_FREETYPE_SYMBOL                 "@PL_FREETYPE_SYMBOL@"
-
-// SYMBOL_BOLD font accessible from freetype
-#define PL_FREETYPE_SYMBOL_BOLD            "@PL_FREETYPE_SYMBOL_BOLD@"
-
-// SYMBOL_BOLD_ITALIC font accessible from freetype
-#define PL_FREETYPE_SYMBOL_BOLD_ITALIC     "@PL_FREETYPE_SYMBOL_BOLD_ITALIC@"
-
-// SYMBOL_BOLD_OBLIQUE font accessible from freetype
-#define PL_FREETYPE_SYMBOL_BOLD_OBLIQUE    "@PL_FREETYPE_SYMBOL_BOLD_OBLIQUE@"
-
-// SYMBOL_ITALIC font accessible from freetype
-#define PL_FREETYPE_SYMBOL_ITALIC          "@PL_FREETYPE_SYMBOL_ITALIC@"
-
-// SYMBOL_OBLIQUE font accessible from freetype
-#define PL_FREETYPE_SYMBOL_OBLIQUE         "@PL_FREETYPE_SYMBOL_OBLIQUE@"
-
-// Define as the return type of signal handlers (`int' or `void').
-#define RETSIGTYPE                         @RETSIGTYPE@
-
-// Location of Source tree
-#define SOURCE_DIR                         "@SOURCE_DIR@"
-
-// Define to 1 if you have the ANSI C header files.
-#cmakedefine STDC_HEADERS 1
-
-// Overall PLplot version number
-#define PLPLOT_VERSION             "@PLPLOT_VERSION@"
-
-// Location of Tcl stuff
-#define TCL_DIR                    "@TCL_DIR@"
-// Consistent package versions for Itcl and friends found by PLplot
-// If PLplot could not find consistent values these are set to 0.0.0
-#define PLPLOT_ITCL_VERSION        "@PLPLOT_ITCL_VERSION@"
-#define PLPLOT_ITK_VERSION         "@PLPLOT_ITK_VERSION@"
-#define PLPLOT_IWIDGETS_VERSION    "@PLPLOT_IWIDGETS_VERSION@"
-
-// Define if csa is desired
-#cmakedefine WITH_CSA
-
-// Define if want to use general fill_intersection_polygon approach
-// rather than the traditional code to fill the intersection of a polygon with
-// the clipping limits.
-#cmakedefine USE_FILL_INTERSECTION_POLYGON
-
-// Define to `char *' if <sys/types.h> does not define.
-#cmakedefine caddr_t
-
-// Define to `int' if <sys/types.h> does not define.
-#cmakedefine pid_t
-
-// Define as `fork' if `vfork' does not work.
-#cmakedefine vfork

Modified: trunk/doc/CMakeLists.txt
===================================================================
--- trunk/doc/CMakeLists.txt	2013-12-29 02:13:54 UTC (rev 12913)
+++ trunk/doc/CMakeLists.txt	2013-12-29 20:11:07 UTC (rev 12914)
@@ -60,7 +60,7 @@
   endforeach(directory ${doxygen_directories})
   # Must append one specific configured file to be consistent with
   # the INPUT parameter in Doxyfile(.in).
-  list(APPEND doxygen_globs ${CMAKE_BINARY_DIR}/config.h)
+  list(APPEND doxygen_globs ${CMAKE_BINARY_DIR}/plplot_config.h)
   #message(STATUS "DEBUG: doxygen_globs = ${doxygen_globs}")
 
   # RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} works (because that is the

Modified: trunk/doc/Doxyfile.in
===================================================================
--- trunk/doc/Doxyfile.in	2013-12-29 02:13:54 UTC (rev 12913)
+++ trunk/doc/Doxyfile.in	2013-12-29 20:11:07 UTC (rev 12914)
@@ -660,7 +660,7 @@
                          "@CMAKE_SOURCE_DIR@/drivers" \
                          "@CMAKE_SOURCE_DIR@/bindings" \
                          "@CMAKE_SOURCE_DIR@/include" \
-                         "@CMAKE_BINARY_DIR@/config.h" \
+                         "@CMAKE_BINARY_DIR@/plplot_config.h" \
                          "@CMAKE_BINARY_DIR@/lib" \
                          "@CMAKE_BINARY_DIR@/bindings" \
                          "@CMAKE_BINARY_DIR@/include"

Modified: trunk/drivers/plplotcanvas-hacktext.c
===================================================================
--- trunk/drivers/plplotcanvas-hacktext.c	2013-12-29 02:13:54 UTC (rev 12913)
+++ trunk/drivers/plplotcanvas-hacktext.c	2013-12-29 20:11:07 UTC (rev 12914)
@@ -31,7 +31,7 @@
 // FIXME: TODO: Clipping
 //
 
-#include <config.h>
+#include <plplot_config.h>
 
 #include <math.h>
 #include <string.h>

Modified: trunk/include/plConfig.h.in
===================================================================
--- trunk/include/plConfig.h.in	2013-12-29 02:13:54 UTC (rev 12913)
+++ trunk/include/plConfig.h.in	2013-12-29 20:11:07 UTC (rev 12914)
@@ -5,7 +5,7 @@
 //  IFS, University of Texas at Austin
 //  18-Jul-1994
 //
-//  Copyright (C) 2004, 2006, 2007, 2008, 2009  Alan W. Irwin
+//  Copyright (C) 2004-2013  Alan W. Irwin
 //  Copyright (C) 2004  Rafael Laboissiere
 //  Copyright (C) 2004  Joao Cardoso
 //
@@ -24,33 +24,28 @@
 //  You should have received a copy of the GNU Library General Public License
 //  along with PLplot; if not, write to the Free Software
 //  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-//
 
 // Configured (by CMake) macros for PLplot that are required for the
-// core build and the build of the installed
-// examples (and presumably any user applications).  Therefore, the
-// configured plConfig.h should be installed.  In contrast,
-// config.h.cmake (note, plConfig.h #includes config.h for
-// the core build because HAVE_CONFIG_H is #defined in that case)
-// contains configured macros that are only required for the core
-// build.  Therefore, in contrast to plConfig.h, config.h should not
-// be installed.
+// core build and the build of the installed examples (and presumably
+// any user applications).  Therefore, the configured plConfig.h
+// should be installed.  In contrast, plplot_config.h.in (note,
+// plConfig.h #includes plplot_config.h for the core build because
+// HAVE_CONFIG_H is #defined in that case) contains configured macros
+// that are only required for the core build.  Therefore, in contrast
+// to plConfig.h, plplot_config.h should not be installed.
 //
 // Maintenance issue: in makes no sense to configure duplicate macros
-// for both config.h and plConfig.h.  Therefore, when adding a macro
+// for both plplot_config.h and plConfig.h.  Therefore, when adding a macro
 // decide which file to put it in depending on whether the result is
 // needed for the installed examples build or not.  Furthermore, move
 // configured macros from one file to the other as needed depending on
 // that criterion, but do not copy them.
-//
-//
 
 #ifndef __PLCONFIG_H__
 #define __PLCONFIG_H__
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#  include <plplot_config.h>
 #endif
 
 // Define if you have c++ accessible stdint.h

Copied: trunk/plplot_config.h.in (from rev 12912, trunk/config.h.in)
===================================================================
--- trunk/plplot_config.h.in	                        (rev 0)
+++ trunk/plplot_config.h.in	2013-12-29 20:11:07 UTC (rev 12914)
@@ -0,0 +1,311 @@
+// Configured (by CMake) macros for PLplot that are required for the
+// core build but _not_ required for the build of the installed
+// examples (and presumably any user applications).  Therefore, the
+// configured plplot_config.h should not be installed.  In contrast,
+// include/plConfig.h.in (note, the configured plConfig.h result
+// #includes plplot_config.h for the core build because HAVE_CONFIG_H
+// is #defined in that case) contains configured macros that are
+// required for the core build, installed examples build, and build of
+// user applications.  Therefore, in contrast to plplot_config.h,
+// plConfig.h should be installed.
+//
+// Maintenance issue: in makes no sense to configure duplicate macros
+// for both plplot_config.h and plConfig.h.  Therefore, when adding a macro
+// decide which file to put it in depending on whether the result is
+// needed for the installed examples build or not.  Furthermore, move
+// configured macros from one file to the other as needed depending on
+// that criterion, but do not copy them.
+//
+
+// Location of executables
+#define BIN_DIR                  "@BIN_DIR@"
+
+// Location of Build tree
+#define BUILD_DIR                "@BUILD_DIR@"
+
+// Location of package data files
+#define DATA_DIR                 "@DATA_DIR@"
+
+// Location of dynamically loaded drivers
+#define DRV_DIR                  "@DRV_DIR@"
+
+// Name of the default cmap0 palette to use
+#define PL_DEFAULT_CMAP0_FILE    "@DEFAULT_CMAP0_FILE@"
+
+// Name of the default cmap1 palette to use
+#define PL_DEFAULT_CMAP1_FILE    "@DEFAULT_CMAP1_FILE@"
+
+// Define if support for deprecated plplot functions should be compiled
+#cmakedefine PL_DEPRECATED
+
+// Define if there is support for dynamically loaded drivers
+#cmakedefine ENABLE_DYNDRIVERS
+
+// Define to 1 if you have the <cmath> header file.
+#cmakedefine HAVE_CMATH 1
+
+// Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+//
+#cmakedefine HAVE_DIRENT_H 1
+
+// Define to 1 if you have the <dlfcn.h> header file.
+#cmakedefine HAVE_DLFCN_H 1
+
+// Define if [freetype] is available
+#cmakedefine PL_HAVE_FREETYPE
+
+// Define if [shapelib] is available
+#cmakedefine HAVE_SHAPELIB
+
+// Define if [agg] is available
+#cmakedefine HAVE_AGG
+
+// Define to 1 if you have the <glib.h> header file.
+#cmakedefine HAVE_GLIB_H 1
+
+// Define to 1 if you have the <glib-object.h> header file.
+#cmakedefine HAVE_GLIB_OBJECT_H 1
+
+// Define to 1 if you have the <gtk/gtk.h> header file.
+#cmakedefine HAVE_GTK_GTK_H 1
+
+// Define to 1 if you have the <inttypes.h> header file.
+#cmakedefine HAVE_INTTYPES_H 1
+
+// Define if [incr], [Tcl] is available
+#cmakedefine HAVE_ITCL
+
+// Define to 1 if you have the <itclDecls.h> header file.
+#cmakedefine HAVE_ITCLDECLS_H 1
+
+// Define if Tk is available
+#cmakedefine ENABLE_tk
+
+// Define if [incr], [Tk] is available
+#cmakedefine HAVE_ITK
+
+// Define to 1 if you have the <jni.h> header file.
+#cmakedefine HAVE_JNI_H 1
+
+// Define to 1 if you have the <libart_lgpl/libart.h> header file.
+#cmakedefine HAVE_LIBART_LGPL_LIBART_H 1
+
+// Define to 1 if you have the <libgnomecanvas/libgnomecanvas.h> header file.
+//
+#cmakedefine HAVE_LIBGNOMECANVAS_LIBGNOMECANVAS_H 1
+
+// Define to 1 if you have the <libgnomeprint/gnome-print.h> header file.
+#cmakedefine HAVE_LIBGNOMEPRINT_GNOME_PRINT_H 1
+
+// Define if libunicode is available
+#cmakedefine HAVE_LIBUNICODE
+
+// Define to 1 if you have the <math.h> header file.
+#cmakedefine HAVE_MATH_H 1
+
+// Define to 1 if you have the <memory.h> header file.
+#cmakedefine HAVE_MEMORY_H 1
+
+// Define to 1 if the function mkstemp is available.
+#cmakedefine PL_HAVE_MKSTEMP 1
+
+// Define to 1 if the function mkdtemp is available.
+#cmakedefine PL_HAVE_MKDTEMP 1
+
+// Define to 1 if the function mkfifo is available.
+#cmakedefine PL_HAVE_MKFIFO 1
+
+// Define to 1 if you have the <ndir.h> header file, and it defines `DIR'.
+#cmakedefine HAVE_NDIR_H 1
+
+// Define if libpango is available
+#cmakedefine HAVE_PANGO
+
+// Define if popen is available
+#cmakedefine HAVE_POPEN
+
+// Define if _NSGetArgc is available
+#cmakedefine HAVE_NSGETARGC
+
+// Define if pthreads is available
+#cmakedefine PL_HAVE_PTHREAD
+
+// Define if Qhull is available
+#cmakedefine PL_HAVE_QHULL
+
+// Define to 1 if you have the <stdlib.h> header file.
+#cmakedefine HAVE_STDLIB_H 1
+
+// Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+//
+#cmakedefine HAVE_SYS_DIR_H 1
+
+// Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+//
+#cmakedefine HAVE_SYS_NDIR_H 1
+
+// Define to 1 if you have the <sys/stat.h> header file.
+#cmakedefine HAVE_SYS_STAT_H 1
+
+// Define to 1 if you have the <sys/types.h> header file.
+#cmakedefine HAVE_SYS_TYPES_H 1
+
+// Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible.
+#cmakedefine HAVE_SYS_WAIT_H 1
+
+// Define to 1 if you have the <termios.h> header file.
+#cmakedefine HAVE_TERMIOS_H 1
+
+// Define to 1 if you have the <crt_externs.h> header file.
+#cmakedefine HAVE_CRT_EXTERNS_H 1
+
+// Define to 1 if the function unlink is available
+#cmakedefine PL_HAVE_UNLINK 1
+
+// Define to 1 if you have the `vfork' function.
+#cmakedefine HAVE_VFORK 1
+
+// Define to 1 if you have the <vfork.h> header file.
+#cmakedefine HAVE_VFORK_H 1
+
+// Include sys/type.h if needed
+#cmakedefine NEED_SYS_TYPE_H
+
+// Name of package
+#define PACKAGE    "@PACKAGE@"
+
+// Define if the win32 ltdl implementation should be used
+#cmakedefine LTDL_WIN32
+
+// Portable definition for PTHREAD_MUTEX_RECURSIVE
+#define PLPLOT_MUTEX_RECURSIVE             @PLPLOT_MUTEX_RECURSIVE@
+
+// Directory containing fonts that are accessible from freetype
+#define PL_FREETYPE_FONT_DIR               "@PL_FREETYPE_FONT_DIR@"
+
+// MONO font accessible from freetype
+#define PL_FREETYPE_MONO                   "@PL_FREETYPE_MONO@"
+
+// MONO_BOLD font accessible from freetype
+#define PL_FREETYPE_MONO_BOLD              "@PL_FREETYPE_MONO_BOLD@"
+
+// MONO_BOLD_ITALIC font accessible from freetype
+#define PL_FREETYPE_MONO_BOLD_ITALIC       "@PL_FREETYPE_MONO_BOLD_ITALIC@"
+
+// MONO_BOLD_OBLIQUE font accessible from freetype
+#define PL_FREETYPE_MONO_BOLD_OBLIQUE      "@PL_FREETYPE_MONO_BOLD_OBLIQUE@"
+
+// MONO_ITALIC font accessible from freetype
+#define PL_FREETYPE_MONO_ITALIC            "@PL_FREETYPE_MONO_ITALIC@"
+
+// MONO_OBLIQUE font accessible from freetype
+#define PL_FREETYPE_MONO_OBLIQUE           "@PL_FREETYPE_MONO_OBLIQUE@"
+
+// SANS font accessible from freetype
+#define PL_FREETYPE_SANS                   "@PL_FREETYPE_SANS@"
+
+// SANS_BOLD font accessible from freetype
+#define PL_FREETYPE_SANS_BOLD              "@PL_FREETYPE_SANS_BOLD@"
+
+// SANS_BOLD_ITALIC font accessible from freetype
+#define PL_FREETYPE_SANS_BOLD_ITALIC       "@PL_FREETYPE_SANS_BOLD_ITALIC@"
+
+// SANS_BOLD_OBLIQUE font accessible from freetype
+#define PL_FREETYPE_SANS_BOLD_OBLIQUE      "@PL_FREETYPE_SANS_BOLD_OBLIQUE@"
+
+// SANS_ITALIC font accessible from freetype
+#define PL_FREETYPE_SANS_ITALIC            "@PL_FREETYPE_SANS_ITALIC@"
+
+// SANS_OBLIQUE font accessible from freetype
+#define PL_FREETYPE_SANS_OBLIQUE           "@PL_FREETYPE_SANS_OBLIQUE@"
+
+// SCRIPT font accessible from freetype
+#define PL_FREETYPE_SCRIPT                 "@PL_FREETYPE_SCRIPT@"
+
+// SCRIPT_BOLD font accessible from freetype
+#define PL_FREETYPE_SCRIPT_BOLD            "@PL_FREETYPE_SCRIPT_BOLD@"
+
+// SCRIPT_BOLD_ITALIC font accessible from freetype
+#define PL_FREETYPE_SCRIPT_BOLD_ITALIC     "@PL_FREETYPE_SCRIPT_BOLD_ITALIC@"
+
+// SCRIPT_BOLD_OBLIQUE font accessible from freetype
+#define PL_FREETYPE_SCRIPT_BOLD_OBLIQUE    "@PL_FREETYPE_SCRIPT_BOLD_OBLIQUE@"
+
+// SCRIPT_ITALIC font accessible from freetype
+#define PL_FREETYPE_SCRIPT_ITALIC          "@PL_FREETYPE_SCRIPT_ITALIC@"
+
+// SCRIPT_OBLIQUE font accessible from freetype
+#define PL_FREETYPE_SCRIPT_OBLIQUE         "@PL_FREETYPE_SCRIPT_OBLIQUE@"
+
+// SERIF font accessible from freetype
+#define PL_FREETYPE_SERIF                  "@PL_FREETYPE_SERIF@"
+
+// SERIF_BOLD font accessible from freetype
+#define PL_FREETYPE_SERIF_BOLD             "@PL_FREETYPE_SERIF_BOLD@"
+
+// SERIF_BOLD_ITALIC font accessible from freetype
+#define PL_FREETYPE_SERIF_BOLD_ITALIC      "@PL_FREETYPE_SERIF_BOLD_ITALIC@"
+
+// SERIF_BOLD_OBLIQUE font accessible from freetype
+#define PL_FREETYPE_SERIF_BOLD_OBLIQUE     "@PL_FREETYPE_SERIF_BOLD_OBLIQUE@"
+
+// SERIF_ITALIC font accessible from freetype
+#define PL_FREETYPE_SERIF_ITALIC           "@PL_FREETYPE_SERIF_ITALIC@"
+
+// SERIF_OBLIQUE font accessible from freetype
+#define PL_FREETYPE_SERIF_OBLIQUE          "@PL_FREETYPE_SERIF_OBLIQUE@"
+
+// Symbol font accessible from freetype
+#define PL_FREETYPE_SYMBOL                 "@PL_FREETYPE_SYMBOL@"
+
+// SYMBOL_BOLD font accessible from freetype
+#define PL_FREETYPE_SYMBOL_BOLD            "@PL_FREETYPE_SYMBOL_BOLD@"
+
+// SYMBOL_BOLD_ITALIC font accessible from freetype
+#define PL_FREETYPE_SYMBOL_BOLD_ITALIC     "@PL_FREETYPE_SYMBOL_BOLD_ITALIC@"
+
+// SYMBOL_BOLD_OBLIQUE font accessible from freetype
+#define PL_FREETYPE_SYMBOL_BOLD_OBLIQUE    "@PL_FREETYPE_SYMBOL_BOLD_OBLIQUE@"
+
+// SYMBOL_ITALIC font accessible from freetype
+#define PL_FREETYPE_SYMBOL_ITALIC          "@PL_FREETYPE_SYMBOL_ITALIC@"
+
+// SYMBOL_OBLIQUE font accessible from freetype
+#define PL_FREETYPE_SYMBOL_OBLIQUE         "@PL_FREETYPE_SYMBOL_OBLIQUE@"
+
+// Define as the return type of signal handlers (`int' or `void').
+#define RETSIGTYPE                         @RETSIGTYPE@
+
+// Location of Source tree
+#define SOURCE_DIR                         "@SOURCE_DIR@"
+
+// Define to 1 if you have the ANSI C header files.
+#cmakedefine STDC_HEADERS 1
+
+// Overall PLplot version number
+#define PLPLOT_VERSION             "@PLPLOT_VERSION@"
+
+// Location of Tcl stuff
+#define TCL_DIR                    "@TCL_DIR@"
+// Consistent package versions for Itcl and friends found by PLplot
+// If PLplot could not find consistent values these are set to 0.0.0
+#define PLPLOT_ITCL_VERSION        "@PLPLOT_ITCL_VERSION@"
+#define PLPLOT_ITK_VERSION         "@PLPLOT_ITK_VERSION@"
+#define PLPLOT_IWIDGETS_VERSION    "@PLPLOT_IWIDGETS_VERSION@"
+
+// Define if csa is desired
+#cmakedefine WITH_CSA
+
+// Define if want to use general fill_intersection_polygon approach
+// rather than the traditional code to fill the intersection of a polygon with
+// the clipping limits.
+#cmakedefine USE_FILL_INTERSECTION_POLYGON
+
+// Define to `char *' if <sys/types.h> does not define.
+#cmakedefine caddr_t
+
+// Define to `int' if <sys/types.h> does not define.
+#cmakedefine pid_t
+
+// Define as `fork' if `vfork' does not work.
+#cmakedefine vfork

Modified: trunk/scripts/style_source.sh
===================================================================
--- trunk/scripts/style_source.sh	2013-12-29 02:13:54 UTC (rev 12913)
+++ trunk/scripts/style_source.sh	2013-12-29 20:11:07 UTC (rev 12914)
@@ -193,7 +193,7 @@
 
 export csource_LIST
 # Top level directory.
-csource_LIST="config.h.in"
+csource_LIST="plplot_config.h.in"
 
 # src directory
 csource_LIST="$csource_LIST src/*.[ch]"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 message has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 7 8 9 10 11 .. 521 > >> (Page 9 of 521)