Changeset 691 for trunk/configure.ac

Timestamp:

04/06/08 14:13:13 (9 months ago)

Author:

andreas

Message:

- updated autotools build files
- build now osm plugin automatic if libxml2 is used
- moved osm/Makefile to osm/Makefile.example because if name collision

-> better move the example to another directory later

- optional CAIRO support
- changed libxml2 switch comment

Files:

• trunk/configure.ac (modified) (4 diffs)

trunk/configure.ac

@@ -76 +76 @@
 AX_LIB_POSTGRESQL
 if test "$found_postgresql" = "yes"; then
-  AM_CONDITIONAL(BUILD_POSTGRESQL, test "x$found_postgresql" = "xyes")
+  AM_CONDITIONAL(HAVE_POSTGRESQL, test "x$found_postgresql" = "xyes")
 fi
 
@@ -130 +130 @@
 
 dnl Check for option to enable libxml2
-AC_MSG_CHECKING(whether to enable included libxml2 building)
+AC_MSG_CHECKING(whether to enable libxml2 support)
 AC_ARG_ENABLE(libxml2,
-        [  --enable-libxml2=[no/yes]        enables included libxml2 build (default=no)],,
+        [  --enable-libxml2=[no/yes]        enables libxml2 support (default=no)],,
                  enable_libxml2=no)
 
@@ -145 +145 @@
 fi
 
+dnl Check for option to enable cairo
+AC_MSG_CHECKING(whether to enable cairo support)
+AC_ARG_ENABLE(cairo,
+        [  --enable-cairo=[no/yes]        enables cairo support (default=yes)],,
+                 enable_cairo=yes)
+
+AM_CONDITIONAL(HAVE_CAIRO, test "x$enable_cairo" = "xyes")
+
+if [ test "x$enable_cairo" = "xyes"]; then
+  AC_MSG_RESULT(yes)
+  PKG_CHECK_MODULES(CAIRO, cairomm-1.0 >= 1.4.4)
+  dnl AC_DEFINE(HAVE_CAIRO, 1,"")
+else
+  AC_MSG_RESULT(no)
+fi
+
+
 AC_OUTPUT([
 Makefile
@@ -155 +172 @@
 plugins/input/raster/Makefile
 plugins/input/shape/Makefile
+plugins/input/osm/Makefile
 src/Makefile
 mapnik.pc