Changeset 1089

Timestamp:

11/06/06 11:50:30

Author:

pvanhoof

Message:

Build env improvements

Files:

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

trunk/Makefile.am

@@ -8 +8 @@
-endif
-
+if BUILD_UIGTK
-SUBDIRS += libtinymailui-gtk 
+endif
-
-if BUILD_MOZEMBED

trunk/configure.ac

@@ -53 +53 @@
-dnl ### default values (will get overwritten)
-build_gnome=true
+build_uigtk=true
-build_demoui=true
-build_mozembed=false
@@ -62 +63 @@
-dnl ### Select the platform library ##
-AC_ARG_WITH(platform,
-
+
+
-[case "${with_platform}" in
-  gnome-desktop) 
-        PLATFORMDIR=libtinymail-gnome-desktop 
+        build_uigtk=true
-        build_demoui=true
-        PLATFORM=1
@@ -75 +78 @@
-        build_gnome=false
-        with_html_component=none
+        build_uigtk=true
-        build_demoui=true
-        PLATFORM=2
@@ -80 +84 @@
-  gpe) 
-        PLATFORMDIR=libtinymail-gpe 
+        build_uigtk=true
-        build_demoui=true
-        PLATFORM=3
@@ -89 +94 @@
-        build_gnome=false
-        with_html_component=none
+        build_uigtk=true
-        build_demoui=true
-        PLATFORM=4
@@ -94 +100 @@
-  *) 
-        PLATFORMDIR=${with_platform}
+        build_uigtk=false
-        build_demoui=false
-        PLATFORM=0
@@ -102 +109 @@
-AC_SUBST(PLATFORM)
-
+
+dnl ### Enable uigtk ##
+AC_ARG_ENABLE(uigtk, 
+AC_HELP_STRING([--enable-uigtk],
+  [Build the gtk+ implementation for the ui components (yes, no)]),
+[case "${enableval}" in
+  yes) build_uigtk=true ;;
+  no)  build_uigtk=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-uigtk) ;;
+esac],[build_uigtk=$build_uigtk])
+AM_CONDITIONAL(BUILD_UIGTK, test x$build_uigtk = xtrue)
+
-dnl ### Enable demoui ##
-AC_ARG_ENABLE(demoui,
-
+
+
-[case "${enableval}" in
-  yes) build_demoui=true ;;
@@ -114 +134 @@
-dnl ### Enable gnome features ##
-AC_ARG_ENABLE(gnome,
-
+
+
-[case "${enableval}" in
-  yes) build_gnome=true ;;
@@ -124 +145 @@
-dnl ### Select the html component ##
-AC_ARG_WITH(html-component,
-
+
+
-[case "$with_html_component" in
-  mozembed) 
-        build_mozembed=true
-        build_gtkhtml=false
+        build_demoui=true
-  ;;
-  gtkhtml)
-        build_mozembed=false
-        build_gtkhtml=false
+        build_demoui=true
-  ;;
-  none)
@@ -149 +173 @@
-dnl ### Enable the python language bindings ##
-AC_ARG_ENABLE(python-bindings,
-
+
+
-[case "${enableval}" in
-  yes) build_pytinymail=true ;;
@@ -159 +184 @@
-dnl ### Enable building the unit tests ##
-AC_ARG_ENABLE(unit-tests,
-
+
+
-[case "${enableval}" in
-  yes) build_unittests=true ;;
@@ -169 +195 @@
-dnl ### Enable building the tests ##
-AC_ARG_ENABLE(tests,
-
+
+
-[case "${enableval}" in
-  yes) build_tests=true ;;
@@ -179 +206 @@
-dnl ### doxygen
-AC_ARG_ENABLE(doxygen,
-
+
+
-[case "${enableval}" in
-  yes) build_doxygen=true ;;