Pixmap fix by Leo Jackson

[inkscape.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0fecf0ec79a48e2f54656c96588720e4a280f30d..b3c9fd06a9f75bd4ad5c5a54eee96c65a0ed65dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ(2.53)
 # `dpkg --compare-versions'.  (ii) We don't always know what the next
 # version is going to be called until about the time we release it
 # (whereas we always know what the previous version was called).
-AC_INIT(inkscape, 0.47+devel)
+AC_INIT(inkscape, 0.48.0)
 
 AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR([src/main.cpp])
@@ -192,6 +192,7 @@ if test "x$openmp_ok" = "xyes"; then
        dnl We have it, now set up the flags
        CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
        AC_CHECK_HEADER(omp.h)
+       AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP])
 fi
 
 dnl ******************************
@@ -745,10 +746,9 @@ if test "x$cairo_pdf" = "xyes"; then
 fi
 
 dnl Shouldn't we test for libpng and libz?
+INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lX11 -lxml2"
 if test "x$openmp_ok" = "xyes"; then
-       INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lgomp"
-else
-       INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz"
+       INKSCAPE_LIBS="$INKSCAPE_LIBS -lgomp"
 fi
 
 AC_CHECK_HEADER(popt.h,