Changeset 10402 for trunk

Timestamp:

04/18/11 17:42:02 (14 years ago)

Author:

tbretz

Message:

Added QT4 support.

File:

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

trunk/FACT++/configure.ac

@@ -190 +190 @@
 #)
 
-#AC_DEFUN([QT4_TRY_LINK],
-#AC_DEFUN([QT4_CHECK_COMPILE],
-#AC_DEFUN([QT4_GET_VERSION],
-QT4_DO_IT_ALL
-#AC_DEFUN([QT4_DO_PKG_CONFIG],
-#AC_DEFUN([QT4_DO_MANUAL_CONFIG],
+######################################################################
+# QT4/GUI SUPPORT
+######################################################################
+
+AC_ARG_WITH([qt4], 
+   [AS_HELP_STRING([--without-qt4], [Disable qt4, i.e. disable gui support.])],
+   [], [QT4_DO_IT_ALL])
 
 #AC_CHECK_PROG(QT4_MOC, moc, moc, 
@@ -267 +268 @@
 AM_CONDITIONAL(HAS_DOT,       [test -n "$DX_DOT"])
 AM_CONDITIONAL(HAS_COLORGCC,  [test "$GCC" = colorgcc])
+AM_CONDITIONAL(HAS_QT4,       [test -n "$QT4_VERSION"])
 
 ##########################################################################
@@ -301 +303 @@
    AC_MSG_NOTICE([ doxagen graphs enabled / 'dot' (graphviz) found: no])
 )
-AC_MSG_NOTICE()
-AC_MSG_NOTICE(--------------------------------------------------------------------)
-AC_MSG_NOTICE()
-AC_MSG_NOTICE([ QT4_VERSION  = $QT4_VERSION])
-AC_MSG_NOTICE()
-AC_MSG_NOTICE([ QT4_LIB      = $QT4_LIB])
-AC_MSG_NOTICE([ QT4_LDFLAGS  = $QT4_LDFLAGS])
-AC_MSG_NOTICE([ QT4_INCLUDES = $QT4_INCLUDES])
-AC_MSG_NOTICE()
-AC_MSG_NOTICE([ MOC4 = $MOC4])
-AC_MSG_NOTICE([ UIC4 = $UIC4])
-AC_MSG_NOTICE([ RCC4 = $RCC4])
+AM_COND_IF(HAS_QT4,
+   AC_MSG_NOTICE([ GUI support enabled    / QT4 toolkit      found: yes]),
+   AC_MSG_NOTICE([ GUI support enabled    / QT4 toolkit      found: no])
+)
+AM_COND_IF(HAS_QT4, [
+   AC_MSG_NOTICE()
+   AC_MSG_NOTICE(--------------------------------------------------------------------)
+   AC_MSG_NOTICE()
+   AC_MSG_NOTICE([ QT4_VERSION  = $QT4_VERSION])
+   AC_MSG_NOTICE()
+   AC_MSG_NOTICE([ QT4_LIB      = $QT4_LIB])
+   AC_MSG_NOTICE([ QT4_LDFLAGS  = $QT4_LDFLAGS])
+   AC_MSG_NOTICE([ QT4_INCLUDES = $QT4_INCLUDES])
+   AC_MSG_NOTICE()
+   AC_MSG_NOTICE([ MOC4 = $MOC4])
+   AC_MSG_NOTICE([ UIC4 = $UIC4])
+   AC_MSG_NOTICE([ RCC4 = $RCC4])
+],[])
 AC_MSG_NOTICE()
 AC_MSG_NOTICE(--------------------------------------------------------------------)