Changeset 18507 for trunk/FACT++/configure

Timestamp:

05/23/16 17:20:13 (9 years ago)

Author:

tbretz

Message:

Updated according to changes in configure.ac

File:

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

trunk/FACT++/configure

@@ -660 +660 @@
 HAS_DOXYGEN_FALSE
 HAS_DOXYGEN_TRUE
+HAS_CURL_FALSE
+HAS_CURL_TRUE
 HAS_MAILX_FALSE
 HAS_MAILX_TRUE
@@ -672 +674 @@
 HAS_COLORDIFF_FALSE
 HAS_COLORDIFF_TRUE
+CURL
 MAILX
 JSDOC
@@ -832 +835 @@
 RANLIB
 STRIP
-ac_ct_AR
-AR
 DLLTOOL
 OBJDUMP
@@ -852 +853 @@
 build
 LIBTOOL
+ac_ct_AR
+AR
 DBUS_LIBS
 DBUS_CFLAGS
@@ -2884 +2887 @@
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
-
+ # /usr/share/libtool/config /usr/share/automake-x.xx
 
 # Make sure none of the following will set -O2
@@ -4929 +4932 @@
 # Setup the libtool and the language
 ######################################################################
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar lib "link -lib"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar lib "link -lib"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
+$as_echo_n "checking the archiver ($AR) interface... " >&6; }
+if ${am_cv_ar_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  am_cv_ar_interface=ar
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int some_variable = 0;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+  (eval $am_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test "$ac_status" -eq 0; then
+        am_cv_ar_interface=ar
+      else
+        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
+        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+  (eval $am_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+        if test "$ac_status" -eq 0; then
+          am_cv_ar_interface=lib
+        else
+          am_cv_ar_interface=unknown
+        fi
+      fi
+      rm -f conftest.lib libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
+$as_echo "$am_cv_ar_interface" >&6; }
+
+case $am_cv_ar_interface in
+ar)
+  ;;
+lib)
+  # Microsoft lib, so override with the ar-lib wrapper script.
+  # FIXME: It is wrong to rewrite AR.
+  # But if we don't then we get into trouble of one sort or another.
+  # A longer-term fix would be to have automake use am__AR in this case,
+  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
+  # similar.
+  AR="$am_aux_dir/ar-lib $AR"
+  ;;
+unknown)
+  as_fn_error $? "could not determine $AR interface" "$LINENO" 5
+  ;;
+esac
 
 case `pwd` in
@@ -15502 +15668 @@
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
@@ -18480 +18643 @@
         case "${host_cpu}-${host_os}" in
             *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
-            *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+            *-osf* | *-hpux*) flag="-D_REENTRANT";;
+            *solaris*)
+            if test "$GCC" = "yes"; then
+                flag="-D_REENTRANT"
+            else
+                flag="-mt -D_REENTRANT"
+            fi
+            ;;
         esac
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5
@@ -19796 +19966 @@
 fi
 
+# Required in did.c
+LDFLAGS+=" -lXt -lX11 "
+
 # Check for zlib and exit with error if not found (defines HAVE_LIBZ)
 
@@ -23970 +24143 @@
 
                 cat > conftest.$ac_ext <<EOF
-#line 23972 "configure"
+#line 24145 "configure"
 #include "confdefs.h"
 #include <qglobal.h>
@@ -24135 +24308 @@
 # This allows to list the QT4 stuff independantly later
 CPPFLAGS+=" "${QT4_INCLUDES}" "
+LDFLAGS+=" -lQtCore "
 
 
@@ -24622 +24796 @@
 
    ROOTCPPFLAGS=$ROOTCFLAGS" "$ROOTAUXCFLAGS
-   ROOTLDFLAGS="-L"$ROOTLIBDIR" -lGQt"
+   ROOTLDFLAGS="-L"$ROOTLIBDIR
 
    #AC_CHECK_PROG(HAVE_ROOT_QT, libGQt.so.$ROOTSOVERSION, yes, no, $ROOTLIBDIR)
@@ -24876 +25050 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAILX" >&5
 $as_echo "$MAILX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "curl", so it can be a program name with args.
+set dummy curl; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CURL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CURL"; then
+  ac_cv_prog_CURL="$CURL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CURL="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_CURL" && ac_cv_prog_CURL="no"
+fi
+fi
+CURL=$ac_cv_prog_CURL
+if test -n "$CURL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL" >&5
+$as_echo "$CURL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -24956 +25168 @@
 fi
 
+ if test "$CURL" = yes; then
+  HAS_CURL_TRUE=
+  HAS_CURL_FALSE='#'
+else
+  HAS_CURL_TRUE='#'
+  HAS_CURL_FALSE=
+fi
+
  if test "$DX_DOXYGEN"; then
   HAS_DOXYGEN_TRUE=
@@ -25165 +25385 @@
 if test -z "$HAS_MAILX_TRUE"; then :
   $as_echo "#define HAVE_MAILX 1" >>confdefs.h
+
+fi
+if test -z "$HAS_CURL_TRUE"; then :
+  $as_echo "#define HAVE_CURL 1" >>confdefs.h
 
 fi
@@ -25411 +25635 @@
 if test -z "${HAS_MAILX_TRUE}" && test -z "${HAS_MAILX_FALSE}"; then
   as_fn_error $? "conditional \"HAS_MAILX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAS_CURL_TRUE}" && test -z "${HAS_CURL_FALSE}"; then
+  as_fn_error $? "conditional \"HAS_CURL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
@@ -28007 +28235 @@
 
 fi
-
-if test -z "$HAS_LIBXP_TRUE"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}:  Motif/lesstif          / 'Xm/Xm.h' 'libXp'  found: yes" >&5
-$as_echo "$as_me:  Motif/lesstif          / 'Xm/Xm.h' 'libXp'  found: yes" >&6;}
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}:  Motif/lesstif          / 'Xm/Xm.h' 'libXp'  found: no" >&5
-$as_echo "$as_me:  Motif/lesstif          / 'Xm/Xm.h' 'libXp'  found: no" >&6;}
-
-fi
 if test -z "$HAS_COLORDIFF_TRUE"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}:  colored svn diff       / 'colordiff'        found: yes" >&5
@@ -28040 +28259 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}:  Mail support           / 'mailx'            found: no" >&5
 $as_echo "$as_me:  Mail support           / 'mailx'            found: no" >&6;}
+
+fi
+   if test -z "$HAS_CURL_TRUE"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}:  Curl support           / 'curl'             found: yes" >&5
+$as_echo "$as_me:  Curl support           / 'curl'             found: yes" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}:  Curl support           / 'curl'             found: no" >&5
+$as_echo "$as_me:  Curl support           / 'curl'             found: no" >&6;}
 
 fi
@@ -28204 +28431 @@
 
 fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  root not found - ROOT support disabled." >&5
+$as_echo "$as_me: WARNING:  root not found - ROOT support disabled." >&2;}
 
 fi
@@ -28248 +28478 @@
 $as_echo "$as_me: WARNING:  JavaScript documentation disabled!" >&2;}
 fi
+if test -z "$HAS_MAILX_TRUE"; then :
+  else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Mail functionality in JavaScript disabled!" >&5
+$as_echo "$as_me: WARNING:  Mail functionality in JavaScript disabled!" >&2;}
+fi
+if test -z "$HAS_CURL_TRUE"; then :
+  else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Curl functionality in JavaScript disabled!" >&5
+$as_echo "$as_me: WARNING:  Curl functionality in JavaScript disabled!" >&2;}
+fi
 if test -z "$HAS_SQL_TRUE"; then :
   else