add check for log2() - not available on Solaris9

diff --git a/Makefile.am b/Makefile.am
index ae1137478bae50efed6abdced1a0e942d863a408..3f8241fe90217dcc1cd0485516e36a713e8c2136 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ html =
 txt_DATA = $(txt)
 html_DATA = $(html)
 
-pkginclude_HEADERS = graphviz_version.h
+pkginclude_HEADERS = $(top_builddir)/graphviz_version.h
 
 man_MANS = graphviz.7
 
@@ -28,10 +28,10 @@ dist-hook:
 #      rm -f ToPAS
 #      find $(distdir) -type f -exec md5sum {} >>ToPAS \;
 
-BUILT_SOURCES = graphviz_version.h
+BUILT_SOURCES = $(top_builddir)/graphviz_version.h
 
-graphviz_version.h: config.h
-       $(GREP) 'PACKAGE\|VERSION\|GVPLUGIN' config.h > graphviz_version.h
+$(top_builddir)/graphviz_version.h: config.h
+       $(GREP) 'PACKAGE\|VERSION\|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h
 
 EXTRA_DIST = $(txt) $(html) graphviz.spec.in graphviz.spec \
        autogen.sh config/depcomp config/config.rpath \

diff --git a/configure.ac b/configure.ac
index bb932c28262b2a737aae31ba19e957ad616af42c..1b4ac5c36723366b852046361c44734b42563569 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -431,7 +431,7 @@ AC_SUBST(MATH_LIBS)
 
 # Check for functions that might need -lm
 LIBS="$LIBS $MATH_LIBS"
-AC_CHECK_FUNCS([feenableexcept fesetenv])
+AC_CHECK_FUNCS([feenableexcept fesetenv log2])
 
 LIBS=$save_LIBS
 

diff --git a/lib/ortho/trapezoid.c b/lib/ortho/trapezoid.c
index 93cbde59f507889abf6e819fd4877ffae99826d8..3040cf808d339d52bf35dcb603a5ec91e7c2d26e 100644 (file)
--- a/lib/ortho/trapezoid.c
+++ b/lib/ortho/trapezoid.c
@@ -28,6 +28,10 @@
 
 #ifdef WIN32
 #define log2(x)  (log(x)/log(2))
+#else
+#ifndef HAVE_LOG2
+#define log2(x)  (log(x)/log(2))
+#endif
 #endif
 
 /* Node types */