Changeset 18506

Timestamp:

05/23/16 17:18:43 (9 years ago)

Author:

tbretz

Message:

Moved definition of -lGQt to Makefile.am, improved output in case of missing components.

File:

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

trunk/FACT++/configure.ac

@@ -323 +323 @@
 
    ROOTCPPFLAGS=$ROOTCFLAGS" "$ROOTAUXCFLAGS
-   ROOTLDFLAGS="-L"$ROOTLIBDIR" -lGQt"
+   ROOTLDFLAGS="-L"$ROOTLIBDIR
 
    #AC_CHECK_PROG(HAVE_ROOT_QT, libGQt.so.$ROOTSOVERSION, yes, no, $ROOTLIBDIR)
@@ -491 +491 @@
    AC_MSG_NOTICE([ Motif/lesstif          / 'Xm/Xm.h' 'libXp'  found: no])
 )
-
-AM_COND_IF(HAS_LIBXP,
-   AC_MSG_NOTICE([ Motif/lesstif          / 'Xm/Xm.h' 'libXp'  found: yes]),
-   AC_MSG_NOTICE([ Motif/lesstif          / 'Xm/Xm.h' 'libXp'  found: no])
-)
 AM_COND_IF(HAS_COLORDIFF,
    AC_MSG_NOTICE([ colored svn diff       / 'colordiff'        found: yes]),
@@ -596 +591 @@
    [AM_COND_IF(HAS_ROOT_QT,, 
       AC_MSG_WARN([ root found but it was built without the --with-qt option])
-   )]
+   )],
+   AC_MSG_WARN([ root not found - ROOT support disabled.])
 )
 AM_COND_IF(HAS_QT4,, AC_MSG_WARN([ QT4 missing - GUIs disabled!]))
@@ -610 +606 @@
 )
 AM_COND_IF(HAS_JSDOC,,   AC_MSG_WARN([ JavaScript documentation disabled!]))
+AM_COND_IF(HAS_MAILX,,   AC_MSG_WARN([ Mail functionality in JavaScript disabled!]))
+AM_COND_IF(HAS_CURL,,    AC_MSG_WARN([ Curl functionality in JavaScript disabled!]))
 AM_COND_IF(HAS_SQL,,     AC_MSG_WARN([ database support globally disabled!]))
 AM_COND_IF(HAS_NOVA,,    AC_MSG_WARN([ libnova missing - smartfact will be compiles without astronomy support!]))