Changeset 198

Timestamp:

04/27/06 21:51:08

Author:

pvanhoof

Message:

Making some build options optional

Files:

• trunk/Makefile.am (modified) (1 diff)
• trunk/configure.ac (modified) (4 diffs)

trunk/Makefile.am

@@ -1 @@
-
+
+
+
+
+
+
+

trunk/configure.ac

@@ -26 +26 @@
-AC_PROG_LIBTOOL
-
+
+AC_ARG_ENABLE(py-tinymail,
+[  --enable-py-tinymail    build python bindings [default=no]],
+[case "${enableval}" in
+  yes) build_pytinymail=true ;;
+  no)  build_pytinymail=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-py-tinymail) ;;
+esac],[build_pytinymail=false])
+AM_CONDITIONAL(BUILD_PYTINYMAIL, test x$build_pytinymail = xtrue)
+
+AC_ARG_ENABLE(unit-tests,
+[  --enable-unit-tests    build unit tests [default=no]],
+[case "${enableval}" in
+  yes) build_unittests=true ;;
+  no)  build_unittests=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-unit-tests) ;;
+esac],[build_unittests=false])
+AM_CONDITIONAL(BUILD_UNITTESTS, test x$build_unittests = xtrue)
+
-GTK_DOC_CHECK([1.0])
-
@@ -49 +68 @@
-AC_SUBST(LIBTINYMAILUI_GTK_LIBS)
-
+if test x$build_unittests = xtrue; then
-PKG_CHECK_MODULES(LIBTINYMAIL_TEST, gunit gtk+-2.0 glib-2.0 >= 2.8 gobject-2.0 camel-1.2 camel-provider-1.2 gnome-vfs-2.0)
+else
+LIBTINYMAIL_TEST_CFLAGS=
+LIBTINYMAIL_TEST_LIBS=
+fi
-AC_SUBST(LIBTINYMAIL_TEST_CFLAGS)
-AC_SUBST(LIBTINYMAIL_TEST_LIBS)
@@ -58 +82 @@
-AC_SUBST(TINYMAIL_LIBS)
-
+if test x$build_pytinymail = xtrue; then
-AM_PATH_PYTHON(2.3)
-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
@@ -70 +95 @@
-
-PKG_CHECK_MODULES(TINYMAIL_PYTHON, pygobject-2.0 pygtk-2.0 gnome-vfs-2.0)
+else
+TINYMAIL_PYTHON_CFLAGS=
+TINYMAIL_PYTHON_LIBS=
+fi
+
-AC_SUBST(TINYMAIL_PYTHON_CFLAGS)
-AC_SUBST(TINYMAIL_PYTHON_LIBS)
-                                                
-
-BINDIR=$prefix/bin