- fixed library path of glib and ecore examples

- optional build --enable-tests --enable-examples
- print summary after configure run

6 files changed, 53 insertions, 7 deletions

diff --git a/configure.ac b/configure.ac
index e83c96a..9432255 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,20 @@ AC_ARG_ENABLE(doxygen-docs,
  	[enable_doxygen_docs=no]
 )
 
+AC_ARG_ENABLE(tests,
+	AS_HELP_STRING([--enable-tests],
+		[build tests]),
+	[enable_tests=$enableval],
+ 	[enable_tests=yes]
+)
+
+AC_ARG_ENABLE(examples,
+	AS_HELP_STRING([--enable-examples],
+		[build examples]),
+	[enable_examples=$enableval],
+ 	[enable_examples=yes]
+)
+
 AC_CHECK_FUNCS(clock_gettime, [], [
   AC_CHECK_LIB(rt, clock_gettime, [
     AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
@@ -123,6 +137,18 @@ else
 AM_CONDITIONAL(ENABLE_ECORE, test 0 = 1)
 fi
 
+if test "$enable_tests" = "yes" ; then
+AM_CONDITIONAL(ENABLE_TESTS, test 1 = 1)
+else
+AM_CONDITIONAL(ENABLE_TESTS, test 0 = 1)
+fi
+
+if test "$enable_examples" = "yes" ; then
+AM_CONDITIONAL(ENABLE_EXAMPLES, test 1 = 1)
+else
+AM_CONDITIONAL(ENABLE_EXAMPLES, test 0 = 1)
+fi
+
 AC_CHECK_LIB([expat], XML_ParserCreate_MM,
    	[AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false)],
 	have_expat=false)
@@ -215,3 +241,20 @@ AC_OUTPUT(
 	dbus-c++-glib-1-uninstalled.pc
 	libdbus-c++.spec
 )
+
+echo
+echo "Build configuration:"
+echo "--------------------"
+echo
+echo "Mainloop integration support:"
+echo "ecore ......................... $enable_ecore"
+echo "glib........................... $enable_glib"
+echo
+echo "Optional build items:"
+echo "build tests.................... $enable_tests"
+echo "build examples................. $enable_examples"
+echo "build doxygen documentation.... $enable_doxygen_docs"
+echo "Cross Compiling activated...... $cross_compiling"
+echo "PThread support found.......... $acx_pthread_ok"
+echo
+
diff --git a/examples/Makefile.am b/examples/Makefile.am
index beed442..10b7cbc 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,4 +1,6 @@
-DIST_SUBDIRS = properties echo hal glib ecore echo_ecore
+if ENABLE_EXAMPLES
+SUBDIRS = properties echo hal glib ecore echo_ecore
+endif
 
 MAINTAINERCLEANFILES = \
 	Makefile.in
diff --git a/examples/echo_ecore/Makefile.am b/examples/echo_ecore/Makefile.am
index b4e18f6..343547f 100644
--- a/examples/echo_ecore/Makefile.am
+++ b/examples/echo_ecore/Makefile.am
@@ -8,7 +8,7 @@ noinst_PROGRAMS = echo-server
 endif
 
 echo_server_SOURCES = echo-server-glue.h echo-server.h echo-server.cpp
-echo_server_LDADD = $(top_builddir)/src/libdbus-c++-ecore-1.la \
+echo_server_LDADD = $(top_builddir)/src/integration/ecore/libdbus-c++-ecore-1.la \
 	$(top_builddir)/src/libdbus-c++-1.la \
 	$(ecore_LIBS)
 
@@ -20,7 +20,7 @@ noinst_PROGRAMS += echo-client-mt
 endif
 
 echo_client_mt_SOURCES = echo-client-glue.h echo-client.h echo-client.cpp
-echo_client_mt_LDADD = $(top_builddir)/src/libdbus-c++-ecore-1.la \
+echo_client_mt_LDADD = $(top_builddir)/src/integration/ecore/libdbus-c++-ecore-1.la \
 	$(top_builddir)/src/libdbus-c++-1.la $(PTHREAD_LIBS) \
 	$(ecore_LIBS)
 echo_client_mt_CXXFLAGS = $(PTHREAD_CFLAGS)
diff --git a/examples/ecore/Makefile.am b/examples/ecore/Makefile.am
index 63c3c0c..ace915c 100644
--- a/examples/ecore/Makefile.am
+++ b/examples/ecore/Makefile.am
@@ -7,7 +7,7 @@ noinst_PROGRAMS = dbus_ecore
 endif
 
 dbus_ecore_SOURCES = dbus_ecore-glue.h dbus_ecore.h dbus_ecore.cpp 
-dbus_ecore_LDADD = $(top_builddir)/src/libdbus-c++-ecore-1.la \
+dbus_ecore_LDADD = $(top_builddir)/src/integration/ecore/libdbus-c++-ecore-1.la \
 	$(top_builddir)/src/libdbus-c++-1.la $(ecore_LIBS) $(xml_LIBS)
 
 dbus_ecore-glue.h: $(top_srcdir)/data/org.freedesktop.DBus.xml
diff --git a/examples/glib/Makefile.am b/examples/glib/Makefile.am
index c0400a8..8904690 100644
--- a/examples/glib/Makefile.am
+++ b/examples/glib/Makefile.am
@@ -7,8 +7,8 @@ noinst_PROGRAMS = dbus-browser
 endif
 
 dbus_browser_SOURCES = dbus-glue.h dbus-browser.h dbus-browser.cpp $(top_srcdir)/tools/xml.cpp
-dbus_browser_LDADD = $(top_builddir)/src/libdbus-c++-glib-1.la \
-	$(top_srcdir)/src/libdbus-c++-1.la $(gtkmm_LIBS)
+dbus_browser_LDADD = $(top_builddir)/src/integration/glib/libdbus-c++-glib-1.la \
+	$(top_builddir)/src/libdbus-c++-1.la $(gtkmm_LIBS)
 
 dbus-glue.h: $(top_srcdir)/data/org.freedesktop.DBus.xml
 	$(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@
diff --git a/test/Makefile.am b/test/Makefile.am
index 5fabcfe..2e286fc 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,8 @@
-
+if ENABLE_TESTS
 SUBDIRS = \
 	generator\
 	functional
+endif
 
 ## File created by the gnome-build tools