[Gnash-commit] gnash configure.ac libbase/utility.h [release_0_8_1]

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_8_1
Changes by:     Markus Gothe <nihilus>  07/08/27 21:18:11

Modified files:
        .              : configure.ac 
        libbase        : utility.h 

Log message:
        Backport

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.396.2.9&r2=1.396.2.10
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.25.2.3&r2=1.25.2.4

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.396.2.9
retrieving revision 1.396.2.10
diff -u -b -r1.396.2.9 -r1.396.2.10
--- configure.ac        23 Aug 2007 09:26:22 -0000      1.396.2.9
+++ configure.ac        27 Aug 2007 21:18:10 -0000      1.396.2.10
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.396.2.9 2007/08/23 09:26:22 strk Exp $
+dnl $Id: configure.ac,v 1.396.2.10 2007/08/27 21:18:10 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.8.1)
@@ -777,6 +777,9 @@
 AC_CHECK_LIB(m, sqrt)
 AC_CHECK_LIB(c, getpwnam,AC_DEFINE(HAVE_GETPWNAM, 1, [Has getpwnam] ))
 
+AC_CHECK_LIB(m, exp2, AC_DEFINE(HAVE_EXP2, 1, [Has exp2()]))
+AC_CHECK_LIB(m, log2, AC_DEFINE(HAVE_LOG2, 1, [Has log2()]))
+
 dnl don't look for X11 when using a raw framebuffer for the GUI
 if test x$build_gtk = xyes -o x$build_kde = xyes -o x$build_fltk = xyes -o 
x$build_sdl = xyes; then
 dnl AC_PATH_XTRA

Index: libbase/utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.25.2.3
retrieving revision 1.25.2.4
diff -u -b -r1.25.2.3 -r1.25.2.4
--- libbase/utility.h   27 Aug 2007 18:11:11 -0000      1.25.2.3
+++ libbase/utility.h   27 Aug 2007 21:18:11 -0000      1.25.2.4
@@ -113,10 +113,13 @@
 //This is from C99.
 const float LN_2 = 0.693147180559945f;
 // the overridden log(f) will use logf IFF f is a float
+#ifndef HAVE_LOG2
 inline float   log2(float f) { return std::log(f) / LN_2; }
+#endif
 //exp2 might be missing on Net-/OpenBSD.
-// TODO: check availability with a configure macro 
-//inline float    exp2(double x) { return std::pow((double)2, double(x)); }
+#ifndef HAVE_EXP2
+inline float    exp2(double x) { return std::pow((double)2, double(x)); }
+#endif
 inline int     fchop( float f ) { return (int) f; }    // replace w/ inline 
asm if desired
 inline int     frnd(float f) { return fchop(f + 0.5f); }       // replace with 
inline asm if desired