Changeset 13969

Timestamp:

05/30/12 10:52:36 (13 years ago)

Author:

tbretz

Message:

Added DBus packages and a few more info at the end.

File:

• trunk/FACT++/configure.ac (modified) (6 diffs)

trunk/FACT++/configure.ac

@@ -8 +8 @@
 #[AC_]PACKAGE_STRING
 #[AC_]PACKAGE_BUGREPORT
-AC_INIT([FACT++],[1.0],[thomas.bretz@epfl.ch],[FACTpp],[http://fact.isdc.unige.ch/svn/trunk/FACT++/])
+AC_INIT([FACT++],[1.0],[thomas.bretz@epfl.ch],[FACTpp],[https://fact.isdc.unige.ch/svn/trunk/FACT++/])
 AC_PREREQ([2.65])
 AC_CONFIG_FILES([Makefile])   # causes x/Makefile.in to be created if x/Makefile.am exists
@@ -58 +58 @@
 # Postponed after the BOOST library tests otherwise the check for boost::thread fails
 #CXXFLAGS+=" -std=c++0x"
+
+PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1, HAVE_DBUS=yes, HAVE_DBUS=no)
+
+CPPFLAGS+=" `pkg-config --cflags dbus-1 dbus-glib-1`"
+LDFLAGS+=" `pkg-config --libs dbus-1 dbus-glib-1`"
+
+# dbus-1
+# dbus-glib-1
+# QtOpenGL
+# gl
+# QtCore
+# soprano
+# cfitsio
 
 ######################################################################
@@ -377 +390 @@
 AM_CONDITIONAL(HAS_NOVA,      [test "$HAVE_NOVA" = yes])
 AM_CONDITIONAL(HAS_SOPRANO,   [test "$HAVE_SOPRANO" = yes])
+AM_CONDITIONAL(HAS_DBUS,      [test "$HAVE_DBUS" = yes])
 
 AM_CONDITIONAL(HAS_GUI,       [test "$QT4_VERSION" -a "$HAVE_GL" = yes -a "$HAVE_GLU" = yes -a "$HAVE_QGL" = yes -a "$HAVE_ROOT_QT" = yes ])
@@ -388 +402 @@
 AM_COND_IF(HAS_ZLIB, [AC_DEFINE(HAVE_ZLIB)], )
 AM_COND_IF(HAS_NOVA, [AC_DEFINE(HAVE_NOVA)], )
+AM_COND_IF(HAS_DBUS, [AC_DEFINE(HAVE_DBUS)], )
 
 #AM_COND_IF(HAS_FITS_H, [
@@ -456 +471 @@
 AC_MSG_NOTICE([ cfitsio                / 'fitsio.h'         found: $HAVE_CFITSIO])
 AC_MSG_NOTICE([ CCfits                 / 'CCfits/CCfits'    found: $HAVE_CCFITS])
+AC_MSG_NOTICE([ DBus-1, DBus-glib-1    / pkg-config         found: $HAVE_DBUS])
 AM_COND_IF(HAS_LIBXP,
    AC_MSG_NOTICE([ Motif/lesstif          / 'Xm/Xm.h' 'libXp'  found: yes]),
@@ -560 +576 @@
       AC_MSG_WARN([ Either of the necessary packages not found - viewer GUI disabled!])
 )
-AC_MSG_NOTICE()
+AM_COND_IF(HAS_NOVA,,    AC_MSG_WARN([ libnova missing - smartfact will be compiles without astronomy support!]))
+AM_COND_IF(HAS_DBUS,,    AC_MSG_WARN([ DBus libraries missing - skypeclient will not be compiled!]))
+AM_COND_IF(HAS_SOPRANO,, AC_MSG_WARN([ Soprano libraries missing - tngweather will not be compiled!]))
+AC_MSG_NOTICE()