Changeset 14035 for trunk/FACT++/configure

Timestamp:

06/02/12 14:01:24 (13 years ago)

Author:

tbretz

Message:

Added timecheck; added proper support for HAS_SQL in configure

File:

• trunk/FACT++/configure (modified) (16 diffs)

trunk/FACT++/configure

@@ -650 +650 @@
 HAS_ROOT_FALSE
 HAS_ROOT_TRUE
+HAS_SQL_FALSE
+HAS_SQL_TRUE
 HAS_QT4_FALSE
 HAS_QT4_TRUE
@@ -23857 +23859 @@
 
                 cat > conftest.$ac_ext <<EOF
-#line 23859 "configure"
+#line 23861 "configure"
 #include "confdefs.h"
 #include <qglobal.h>
@@ -24880 +24882 @@
 fi
 
- if test -n "$DX_DOXYGEN"; then
+ if test "$DX_DOXYGEN"; then
   HAS_DOXYGEN_TRUE=
   HAS_DOXYGEN_FALSE='#'
@@ -24888 +24890 @@
 fi
 
- if test -n "$DX_DOT"; then
+ if test "$DX_DOT"; then
   HAS_DOT_TRUE=
   HAS_DOT_FALSE='#'
@@ -24904 +24906 @@
 fi
 
- if test -n "$QT4_VERSION"; then
+ if test "$QT4_VERSION"; then
   HAS_QT4_TRUE=
   HAS_QT4_FALSE='#'
@@ -24910 +24912 @@
   HAS_QT4_TRUE='#'
   HAS_QT4_FALSE=
+fi
+
+ if test "$MYSQLPP_LIB_DIR" -a "$MYSQLPP_INC_DIR" ; then
+  HAS_SQL_TRUE=
+  HAS_SQL_FALSE='#'
+else
+  HAS_SQL_TRUE='#'
+  HAS_SQL_FALSE=
 fi
 
@@ -25071 +25081 @@
 if test "$HAVE_DBUS" = yes; then
   $as_echo "#define HAVE_DBUS 1" >>confdefs.h
+
+fi
+if test "$MYSQLPP_LIB_DIR" -a "$MYSQLPP_INC_DIR" ; then
+  $as_echo "#define HAVE_SQL 1" >>confdefs.h
 
 fi
@@ -25375 +25389 @@
 if test -z "${HAS_QT4_TRUE}" && test -z "${HAS_QT4_FALSE}"; then
   as_fn_error $? "conditional \"HAS_QT4\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAS_SQL_TRUE}" && test -z "${HAS_SQL_FALSE}"; then
+  as_fn_error $? "conditional \"HAS_SQL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
@@ -27845 +27863 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
 $as_echo "$as_me: " >&6;}
-if test -n "$QT4_VERSION"; then
+if test "$MYSQLPP_LIB_DIR" -a "$MYSQLPP_INC_DIR" ; then
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------------------------" >&5
+$as_echo "$as_me: --------------------------------------------------------------------" >&6;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+$as_echo "$as_me: " >&6;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}:  MYSQLPP_INC_DIR = $MYSQLPP_INC_DIR" >&5
+$as_echo "$as_me:  MYSQLPP_INC_DIR = $MYSQLPP_INC_DIR" >&6;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}:  MYSQLPP_LIB_DIR = $MYSQLPP_LIB_DIR" >&5
+$as_echo "$as_me:  MYSQLPP_LIB_DIR = $MYSQLPP_LIB_DIR" >&6;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+$as_echo "$as_me: " >&6;}
+
+fi
+if test "$QT4_VERSION"; then
 
    { $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------------------------------" >&5
@@ -27921 +27953 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}:  CCfits                 / 'CCfits/CCfits'    found: $HAVE_CCFITS" >&5
 $as_echo "$as_me:  CCfits                 / 'CCfits/CCfits'    found: $HAVE_CCFITS" >&6;}
+if test "$MYSQLPP_LIB_DIR" -a "$MYSQLPP_INC_DIR" ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}:  MySQL/MySQL++          / 'mysql++.h'        found: yes" >&5
+$as_echo "$as_me:  MySQL/MySQL++          / 'mysql++.h'        found: yes" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}:  MySQL/MySQL++          / 'mysql++.h'        found: no" >&5
+$as_echo "$as_me:  MySQL/MySQL++          / 'mysql++.h'        found: no" >&6;}
+
+fi
 { $as_echo "$as_me:${as_lineno-$LINENO}:  DBus-1, DBus-glib-1    / pkg-config         found: $HAVE_DBUS" >&5
 $as_echo "$as_me:  DBus-1, DBus-glib-1    / pkg-config         found: $HAVE_DBUS" >&6;}
@@ -27970 +28010 @@
 fi
 
-if test -n "$DX_DOXYGEN"; then
+if test "$DX_DOXYGEN"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}:  doxygen docu enabled   / 'doxygen'          found: $DX_DOXYGEN" >&5
 $as_echo "$as_me:  doxygen docu enabled   / 'doxygen'          found: $DX_DOXYGEN" >&6;}
@@ -27978 +28018 @@
 
 fi
-if test -n "$DX_DOT"; then
+if test "$DX_DOT"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}:  doxygen graphs enabled / 'dot' (graphviz)   found: $DX_DOT" >&5
 $as_echo "$as_me:  doxygen graphs enabled / 'dot' (graphviz)   found: $DX_DOT" >&6;}
@@ -27986 +28026 @@
 
 fi
-if test -n "$QT4_VERSION"; then
+if test "$QT4_VERSION"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}:  QT4 support enabled    /  QT4 toolkit       found: yes" >&5
 $as_echo "$as_me:  QT4 support enabled    /  QT4 toolkit       found: yes" >&6;}
@@ -28064 +28104 @@
 
 fi
-if test -n "$DX_DOXYGEN"; then
+if test "$DX_DOXYGEN"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}:  doxygen-run:   build html documentation with doxygen" >&5
 $as_echo "$as_me:  doxygen-run:   build html documentation with doxygen" >&6;}
@@ -28110 +28150 @@
 
 fi
-if test -n "$QT4_VERSION"; then
+if test "$QT4_VERSION"; then
   :
 else
@@ -28154 +28194 @@
 
 fi
+if test "$MYSQLPP_LIB_DIR" -a "$MYSQLPP_INC_DIR" ; then
+  :
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  database support globally disabled!" >&5
+$as_echo "$as_me: WARNING:  database support globally disabled!" >&2;}
+fi
 if test "$HAVE_NOVA" = yes; then
   :