Changeset 18428 for trunk/FACT++

Timestamp:

01/29/16 13:19:49 (9 years ago)

Author:

tbretz

Message:

Added detection for curl.

File:

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

trunk/FACT++/configure.ac

@@ -13 +13 @@
 #AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([.macro_dir])
-AC_CONFIG_AUX_DIR([.aux_dir])
+AC_CONFIG_AUX_DIR([.aux_dir]) # /usr/share/libtool/config /usr/share/automake-x.xx
 
 # Make sure none of the following will set -O2
@@ -75 +75 @@
 ######################################################################
 
+AM_PROG_AR
 LT_INIT([disable-static])
 AC_LANG(C++)
@@ -151 +152 @@
    AC_MSG_WARN([ Motif/lesstif not found!])
 )
+
+# Required in did.c
+LDFLAGS+=" -lXt -lX11 "
 
 # Check for zlib and exit with error if not found (defines HAVE_LIBZ)
@@ -300 +304 @@
 # This allows to list the QT4 stuff independantly later
 CPPFLAGS+=" "${QT4_INCLUDES}" "
+LDFLAGS+=" -lQtCore "
 AC_CHECK_CLASS(QGL, [QGLWidget qgl], QtOpenGL, QtOpenGL/QGLWidget,
         HAVE_QGL=yes, HAVE_QGL=no)
@@ -342 +347 @@
 AC_CHECK_PROG(JSDOC,     jsdoc,        yes, no)
 AC_CHECK_PROG(MAILX,     mailx,        yes, no)
+AC_CHECK_PROG(CURL,      curl,         yes, no)
 
 ##########################################################################
@@ -374 +380 @@
 AM_CONDITIONAL(HAS_JSDOC,     [test "$JSDOC" = yes])
 AM_CONDITIONAL(HAS_MAILX,     [test "$MAILX" = yes])
+AM_CONDITIONAL(HAS_CURL,      [test "$CURL" = yes])
 AM_CONDITIONAL(HAS_DOXYGEN,   [test "$DX_DOXYGEN"])
 AM_CONDITIONAL(HAS_DOT,       [test "$DX_DOT"])
@@ -407 +414 @@
 AM_COND_IF(HAS_V8,    [AC_DEFINE(HAVE_V8)],   )
 AM_COND_IF(HAS_MAILX, [AC_DEFINE(HAVE_MAILX)],)
+AM_COND_IF(HAS_CURL,  [AC_DEFINE(HAVE_CURL)],)
 
 ##########################################################################
@@ -500 +508 @@
       AC_MSG_NOTICE([ Mail support           / 'mailx'            found: yes]),
       AC_MSG_NOTICE([ Mail support           / 'mailx'            found: no])
+   )
+   AM_COND_IF(HAS_CURL,
+      AC_MSG_NOTICE([ Curl support           / 'curl'             found: yes]),
+      AC_MSG_NOTICE([ Curl support           / 'curl'             found: no])
    )
 ])