Revision: 42402
http://brlcad.svn.sourceforge.net/brlcad/?rev=42402&view=rev
Author: d_rossberg
Date: 2011-01-17 15:50:02 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
there is no realpath() in MSVC, so replaced it by a trivial string-copy then
Modified Paths:
--------------
brlcad/trunk/configure.ac
brlcad/trunk/src/libbu/brlcad_path.c
Modified: brlcad/trunk/configure.ac
===================================================================
--- brlcad/trunk/configure.ac 2011-01-17 15:34:16 UTC (rev 42401)
+++ brlcad/trunk/configure.ac 2011-01-17 15:50:02 UTC (rev 42402)
@@ -314,7 +314,7 @@
# togl
#BC_ARG_ENABLE([build_togl], [togl-build], [Build the included togl], [no])
-# tkpng
+# tkpng
BC_ARG_ENABLE([build_tkpng], [tkpng-build], [Build the included tkpng], [auto])
# tktable
@@ -2267,6 +2267,7 @@
mkstemp \
pipe \
popen \
+ realpath \
sbrk \
setenv \
setpgid \
@@ -2377,7 +2378,7 @@
#AC_MSG_NOTICE([Installation of a modern GNU Flex before continuing is
recommended.])
#fi
#fi
-
+
AC_MSG_CHECKING([whether we have the essentials to make parsers])
if test "x$build_parsers" = "xyes" ; then
AC_MSG_RESULT(yes)
@@ -3229,7 +3230,7 @@
dnl *** tkpng ***
-dnl figure out whether we need to build tkpng
+dnl figure out whether we need to build tkpng
TKPNG_VERSION="0.8"
TKPNG_LIB_FILE="tkpng${SHLIB_SUFFIX}"
case $host_os in
@@ -4174,7 +4175,7 @@
dnl configure tkhtml
if test "x$build_brlcad_tkhtml" = "xyes" ; then
ac_configure_args="$ac_configure_args --exec-prefix=\"$bc_prefix\""
- # this is a hack to all tkhtml to see when the tk headers are in odd
+ # this is a hack to all tkhtml to see when the tk headers are in odd
# places. it seems to ignore the CPPFLAGS in it's configure phase.
if test ! "x$TKINCDIR" = "x" ; then
ac_configure_args="$ac_configure_args --with-tkinclude=$TKINCDIR"
Modified: brlcad/trunk/src/libbu/brlcad_path.c
===================================================================
--- brlcad/trunk/src/libbu/brlcad_path.c 2011-01-17 15:34:16 UTC (rev
42401)
+++ brlcad/trunk/src/libbu/brlcad_path.c 2011-01-17 15:50:02 UTC (rev
42402)
@@ -440,7 +440,11 @@
if (lhs) {
char real_path[MAXPATHLEN] = {0};
char *dirpath;
+#ifdef HAVE_REALPATH
realpath(lhs, real_path);
+#else
+ bu_strlcpy(real_path, lhs, (size_t)MAXPATHLEN);
+#endif
dirpath = bu_dirname(real_path);
snprintf(real_path, MAXPATHLEN, "%s", dirpath);
bu_free(dirpath, "free bu_dirname");
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
