CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/01/07 21:30:38
Modified files:
. : ChangeLog
macros : boost.m4
Log message:
construct proper ac_cv_path_boost_lib and ac_cv_path_boost_extra_lib
even
if the paths contain dots. See bug #21977.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5335&r2=1.5336
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.72&r2=1.73
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5335
retrieving revision 1.5336
diff -u -b -r1.5335 -r1.5336
--- ChangeLog 7 Jan 2008 20:31:10 -0000 1.5335
+++ ChangeLog 7 Jan 2008 21:30:37 -0000 1.5336
@@ -1,3 +1,9 @@
+2008-01-07 Anonymous
+
+ * macros/boost.m4: construct proper ac_cv_path_boost_lib and
+ ac_cv_path_boost_extra_lib even if the paths contain dots.
+ See bug #21977.
+
2008-01-07 Sandro Santilli <[EMAIL PROTECTED]>
* server/sprite_instance.cpp (get_root): use VM version, not
Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- macros/boost.m4 29 Nov 2007 05:36:01 -0000 1.72
+++ macros/boost.m4 7 Jan 2008 21:30:38 -0000 1.73
@@ -14,7 +14,7 @@
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: boost.m4,v 1.72 2007/11/29 05:36:01 nihilus Exp $
+dnl $Id: boost.m4,v 1.73 2008/01/07 21:30:38 strk Exp $
dnl Boost modules are:
dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -129,7 +129,7 @@
for j in ${boost_libs}; do
dirs="`ls -dr $i/libboost_${j}*.${shlibext} $i/libboost_${j}*.a
2>/dev/null`"
if test -n "${dirs}"; then
- libname="`echo ${dirs} | sed -e 's:\..*$::' -e 's:^.*/lib::'`"
+ libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e 's:\..*$::'`"
if test x$dirname = x; then
dirname="`echo ${dirs} | sed -e 's:/libboost.*$::'`"
if test x"${dirname}" != "x/usr/lib"; then
@@ -145,7 +145,7 @@
for j in ${extra_boost_libs}; do
dirs="`ls -dr ${dirname}/libboost_${j}*.${shlibext}
${dirname}/libboost_${j}*.a 2>/dev/null`"
if test -n "${dirs}"; then
- libname="`echo ${dirs} | sed -e 's:\..*$::' -e 's:^.*/lib::'`"
+ libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e 's:\..*$::'`"
ac_cv_path_boost_extra_lib="${ac_cv_path_boost_extra_lib} -l${libname}"
else
extra_missing_libs="${extra_missing_libs} $j"
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
