Revision: 42379
http://brlcad.svn.sourceforge.net/brlcad/?rev=42379&view=rev
Author: starseeker
Date: 2011-01-17 07:35:20 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
Sync cmake to trunk r42378
Modified Paths:
--------------
brlcad/branches/cmake/configure.ac
brlcad/branches/cmake/src/other/tkpng/Makefile.am
brlcad/branches/cmake/src/other/tkpng/generic/tkImgPNGInit.c
Added Paths:
-----------
brlcad/branches/cmake/src/other/tkpng/pkgIndex.tcl.in
Property Changed:
----------------
brlcad/branches/cmake/
brlcad/branches/cmake/src/other/tkhtml/
Property changes on: brlcad/branches/cmake
___________________________________________________________________
Modified: svn:mergeinfo
-
/brlcad/trunk:37932-39894,41673-41706,41994-41998,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376
+
/brlcad/trunk:37932-39894,41673-41706,41994-41998,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376,42378
Modified: brlcad/branches/cmake/configure.ac
===================================================================
--- brlcad/branches/cmake/configure.ac 2011-01-17 07:33:12 UTC (rev 42378)
+++ brlcad/branches/cmake/configure.ac 2011-01-17 07:35:20 UTC (rev 42379)
@@ -3231,6 +3231,7 @@
dnl *** tkpng ***
dnl figure out whether we need to build tkpng
TKPNG_VERSION="0.9"
+TKPNG_LIB_FILE="tkpng${SHLIB_SUFFIX}"
case $host_os in
*netbsd-*|*freebsd-[[1-3]]*.*|*openbsd-[[1-3]]*|*sunos4*)
# some OS's don't like dots in the lib name
@@ -3238,6 +3239,7 @@
;;
esac
AC_SUBST(TKPNG_VERSION)
+AC_SUBST(TKPNG_LIB_FILE)
AC_MSG_CHECKING(whether to build tkpng)
if test ! "x$bc_build_tkpng" = "xno" ; then
build_brlcad_tkpng=yes
@@ -4362,6 +4364,7 @@
src/other/tcl/Makefile
src/other/tk/Makefile
src/other/tkpng/Makefile
+ src/other/tkpng/pkgIndex.tcl
src/other/tnt/Makefile
src/proc-db/Makefile
src/remrt/Makefile
Property changes on: brlcad/branches/cmake/src/other/tkhtml
___________________________________________________________________
Modified: svn:mergeinfo
-
/brlcad/trunk/src/other/tkhtml:37932-39894,40417,41673-41706,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376
+
/brlcad/trunk/src/other/tkhtml:37932-39894,40417,41673-41706,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376,42378
Modified: brlcad/branches/cmake/src/other/tkpng/Makefile.am
===================================================================
--- brlcad/branches/cmake/src/other/tkpng/Makefile.am 2011-01-17 07:33:12 UTC
(rev 42378)
+++ brlcad/branches/cmake/src/other/tkpng/Makefile.am 2011-01-17 07:35:20 UTC
(rev 42379)
@@ -8,6 +8,9 @@
tkpng_la_LDFLAGS = -module
lib_LTLIBRARIES = tkpng.la
+brlcadscriptdir = ${libdir}/tkpng${TKPNG_VERSION}
+brlcadscript_SCRIPTS = pkgIndex.tcl
+
tkpng_la_SOURCES = \
generic/tkImgPNG.c \
generic/tkImgPNGInit.c
@@ -18,6 +21,9 @@
${TK} \
${TCLSTUB}
+DISTCLEANFILES = \
+ pkgIndex.tcl
+
EXTRA_DIST = \
README \
ChangeLog \
Modified: brlcad/branches/cmake/src/other/tkpng/generic/tkImgPNGInit.c
===================================================================
--- brlcad/branches/cmake/src/other/tkpng/generic/tkImgPNGInit.c
2011-01-17 07:33:12 UTC (rev 42378)
+++ brlcad/branches/cmake/src/other/tkpng/generic/tkImgPNGInit.c
2011-01-17 07:35:20 UTC (rev 42379)
@@ -17,7 +17,7 @@
#include <tk.h>
#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "0.8"
+#define PACKAGE_VERSION "0.9"
#endif
extern Tk_PhotoImageFormat tkImgFmtPNG;
Copied: brlcad/branches/cmake/src/other/tkpng/pkgIndex.tcl.in (from rev 42378,
brlcad/trunk/src/other/tkpng/pkgIndex.tcl.in)
===================================================================
--- brlcad/branches/cmake/src/other/tkpng/pkgIndex.tcl.in
(rev 0)
+++ brlcad/branches/cmake/src/other/tkpng/pkgIndex.tcl.in 2011-01-17
07:35:20 UTC (rev 42379)
@@ -0,0 +1,3 @@
+# Tcl package index file, version 1.0
+
+package ifneeded tkpng @TKPNG_VERSION@ [list load [file join $dir ".."
"@TKPNG_LIB_FILE@"] tkpng]
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
