Changeset 13970


Ignore:
Timestamp:
05/30/12 10:52:49 (12 years ago)
Author:
tbretz
Message:
Updated.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/configure

    r13868 r13970  
    574574PACKAGE_STRING='FACT++ 1.0'
    575575PACKAGE_BUGREPORT='thomas.bretz@epfl.ch'
    576 PACKAGE_URL='http://fact.isdc.unige.ch/svn/trunk/FACT++/'
     576PACKAGE_URL='https://fact.isdc.unige.ch/svn/trunk/FACT++/'
    577577
    578578# Factoring default headers for most tests.
    … …  
    624624HAS_GUI_FALSE
    625625HAS_GUI_TRUE
     626HAS_DBUS_FALSE
     627HAS_DBUS_TRUE
    626628HAS_SOPRANO_FALSE
    627629HAS_SOPRANO_TRUE
    … …  
    697699QT4_CORE_LIBS
    698700QT4_CORE_CFLAGS
    699 PKG_CONFIG_LIBDIR
    700 PKG_CONFIG_PATH
    701 PKG_CONFIG
    702701QT4DIR
    703702BOOST_THREAD_LIB
    … …  
    842841build
    843842LIBTOOL
     843DBUS_LIBS
     844DBUS_CFLAGS
     845PKG_CONFIG_LIBDIR
     846PKG_CONFIG_PATH
     847PKG_CONFIG
    844848EGREP
    845849GREP
    … …  
    980984CCC
    981985CPP
     986PKG_CONFIG
     987PKG_CONFIG_PATH
     988PKG_CONFIG_LIBDIR
     989DBUS_CFLAGS
     990DBUS_LIBS
    982991CXXCPP
    983992DOXYGEN_PAPER_SIZE
    984993XMKMF
    985994QT4DIR
    986 PKG_CONFIG
    987 PKG_CONFIG_PATH
    988 PKG_CONFIG_LIBDIR
    989995QT4_CORE_CFLAGS
    990996QT4_CORE_LIBS
    … …  
    17501756  CXXFLAGS    C++ compiler flags
    17511757  CPP         C preprocessor
     1758  PKG_CONFIG  path to pkg-config utility
     1759  PKG_CONFIG_PATH
     1760              directories to add to pkg-config's search path
     1761  PKG_CONFIG_LIBDIR
     1762              path overriding pkg-config's built-in search path
     1763  DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
     1764  DBUS_LIBS   linker flags for DBUS, overriding pkg-config
    17521765  CXXCPP      C++ preprocessor
    17531766  DOXYGEN_PAPER_SIZE
    … …  
    17551768  XMKMF       Path to xmkmf, Makefile generator for X Window System
    17561769  QT4DIR      the place where the Qt 4 files are, e.g. /usr/lib/qt4
    1757   PKG_CONFIG  path to pkg-config utility
    1758   PKG_CONFIG_PATH
    1759               directories to add to pkg-config's search path
    1760   PKG_CONFIG_LIBDIR
    1761               path overriding pkg-config's built-in search path
    17621770  QT4_CORE_CFLAGS
    17631771              C compiler flags for QT4_CORE, overriding pkg-config
    … …  
    17731781
    17741782Report bugs to <thomas.bretz@epfl.ch>.
    1775 FACT++ home page: <http://fact.isdc.unige.ch/svn/trunk/FACT++/>.
     1783FACT++ home page: <https://fact.isdc.unige.ch/svn/trunk/FACT++/>.
    17761784_ACEOF
    17771785ac_status=$?
    … …  
    47044712# Postponed after the BOOST library tests otherwise the check for boost::thread fails
    47054713#CXXFLAGS+=" -std=c++0x"
     4714
     4715
     4716
     4717
     4718
     4719
     4720
     4721
     4722if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
     4723        if test -n "$ac_tool_prefix"; then
     4724  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
     4725set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
     4726{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     4727$as_echo_n "checking for $ac_word... " >&6; }
     4728if ${ac_cv_path_PKG_CONFIG+:} false; then :
     4729  $as_echo_n "(cached) " >&6
     4730else
     4731  case $PKG_CONFIG in
     4732  [\\/]* | ?:[\\/]*)
     4733  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
     4734  ;;
     4735  *)
     4736  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     4737for as_dir in $PATH
     4738do
     4739  IFS=$as_save_IFS
     4740  test -z "$as_dir" && as_dir=.
     4741    for ac_exec_ext in '' $ac_executable_extensions; do
     4742  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     4743    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     4744    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     4745    break 2
     4746  fi
     4747done
     4748  done
     4749IFS=$as_save_IFS
     4750
     4751  ;;
     4752esac
     4753fi
     4754PKG_CONFIG=$ac_cv_path_PKG_CONFIG
     4755if test -n "$PKG_CONFIG"; then
     4756  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
     4757$as_echo "$PKG_CONFIG" >&6; }
     4758else
     4759  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     4760$as_echo "no" >&6; }
     4761fi
     4762
     4763
     4764fi
     4765if test -z "$ac_cv_path_PKG_CONFIG"; then
     4766  ac_pt_PKG_CONFIG=$PKG_CONFIG
     4767  # Extract the first word of "pkg-config", so it can be a program name with args.
     4768set dummy pkg-config; ac_word=$2
     4769{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     4770$as_echo_n "checking for $ac_word... " >&6; }
     4771if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
     4772  $as_echo_n "(cached) " >&6
     4773else
     4774  case $ac_pt_PKG_CONFIG in
     4775  [\\/]* | ?:[\\/]*)
     4776  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
     4777  ;;
     4778  *)
     4779  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     4780for as_dir in $PATH
     4781do
     4782  IFS=$as_save_IFS
     4783  test -z "$as_dir" && as_dir=.
     4784    for ac_exec_ext in '' $ac_executable_extensions; do
     4785  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     4786    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     4787    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     4788    break 2
     4789  fi
     4790done
     4791  done
     4792IFS=$as_save_IFS
     4793
     4794  ;;
     4795esac
     4796fi
     4797ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
     4798if test -n "$ac_pt_PKG_CONFIG"; then
     4799  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
     4800$as_echo "$ac_pt_PKG_CONFIG" >&6; }
     4801else
     4802  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     4803$as_echo "no" >&6; }
     4804fi
     4805
     4806  if test "x$ac_pt_PKG_CONFIG" = x; then
     4807    PKG_CONFIG=""
     4808  else
     4809    case $cross_compiling:$ac_tool_warned in
     4810yes:)
     4811{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     4812$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     4813ac_tool_warned=yes ;;
     4814esac
     4815    PKG_CONFIG=$ac_pt_PKG_CONFIG
     4816  fi
     4817else
     4818  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
     4819fi
     4820
     4821fi
     4822if test -n "$PKG_CONFIG"; then
     4823        _pkg_min_version=0.9.0
     4824        { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
     4825$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
     4826        if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
     4827                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     4828$as_echo "yes" >&6; }
     4829        else
     4830                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     4831$as_echo "no" >&6; }
     4832                PKG_CONFIG=""
     4833        fi
     4834fi
     4835
     4836pkg_failed=no
     4837{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
     4838$as_echo_n "checking for DBUS... " >&6; }
     4839
     4840if test -n "$DBUS_CFLAGS"; then
     4841    pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
     4842 elif test -n "$PKG_CONFIG"; then
     4843    if test -n "$PKG_CONFIG" && \
     4844    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 dbus-glib-1\""; } >&5
     4845  ($PKG_CONFIG --exists --print-errors "dbus-1 dbus-glib-1") 2>&5
     4846  ac_status=$?
     4847  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     4848  test $ac_status = 0; }; then
     4849  pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 dbus-glib-1" 2>/dev/null`
     4850                      test "x$?" != "x0" && pkg_failed=yes
     4851else
     4852  pkg_failed=yes
     4853fi
     4854 else
     4855    pkg_failed=untried
     4856fi
     4857if test -n "$DBUS_LIBS"; then
     4858    pkg_cv_DBUS_LIBS="$DBUS_LIBS"
     4859 elif test -n "$PKG_CONFIG"; then
     4860    if test -n "$PKG_CONFIG" && \
     4861    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 dbus-glib-1\""; } >&5
     4862  ($PKG_CONFIG --exists --print-errors "dbus-1 dbus-glib-1") 2>&5
     4863  ac_status=$?
     4864  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     4865  test $ac_status = 0; }; then
     4866  pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 dbus-glib-1" 2>/dev/null`
     4867                      test "x$?" != "x0" && pkg_failed=yes
     4868else
     4869  pkg_failed=yes
     4870fi
     4871 else
     4872    pkg_failed=untried
     4873fi
     4874
     4875
     4876
     4877if test $pkg_failed = yes; then
     4878        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     4879$as_echo "no" >&6; }
     4880
     4881if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
     4882        _pkg_short_errors_supported=yes
     4883else
     4884        _pkg_short_errors_supported=no
     4885fi
     4886        if test $_pkg_short_errors_supported = yes; then
     4887                DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 dbus-glib-1" 2>&1`
     4888        else
     4889                DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 dbus-glib-1" 2>&1`
     4890        fi
     4891        # Put the nasty error message in config.log where it belongs
     4892        echo "$DBUS_PKG_ERRORS" >&5
     4893
     4894        HAVE_DBUS=no
     4895elif test $pkg_failed = untried; then
     4896        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     4897$as_echo "no" >&6; }
     4898        HAVE_DBUS=no
     4899else
     4900        DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
     4901        DBUS_LIBS=$pkg_cv_DBUS_LIBS
     4902        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     4903$as_echo "yes" >&6; }
     4904        HAVE_DBUS=yes
     4905fi
     4906
     4907CPPFLAGS+=" `pkg-config --cflags dbus-1 dbus-glib-1`"
     4908LDFLAGS+=" `pkg-config --libs dbus-1 dbus-glib-1`"
     4909
     4910# dbus-1
     4911# dbus-glib-1
     4912# QtOpenGL
     4913# gl
     4914# QtCore
     4915# soprano
     4916# cfitsio
    47064917
    47074918######################################################################
    … …  
    2364623857
    2364723858                cat > conftest.$ac_ext <<EOF
    23648 #line 23648 "configure"
     23859#line 23859 "configure"
    2364923860#include "confdefs.h"
    2365023861#include <qglobal.h>
    … …  
    2479925010fi
    2480025011
     25012 if test "$HAVE_DBUS" = yes; then
     25013  HAS_DBUS_TRUE=
     25014  HAS_DBUS_FALSE='#'
     25015else
     25016  HAS_DBUS_TRUE='#'
     25017  HAS_DBUS_FALSE=
     25018fi
     25019
    2480125020
    2480225021 if test "$QT4_VERSION" -a "$HAVE_GL" = yes -a "$HAVE_GLU" = yes -a "$HAVE_QGL" = yes -a "$HAVE_ROOT_QT" = yes ; then
    … …  
    2484825067if test "$HAVE_NOVA" = yes; then
    2484925068  $as_echo "#define HAVE_NOVA 1" >>confdefs.h
     25069
     25070fi
     25071if test "$HAVE_DBUS" = yes; then
     25072  $as_echo "#define HAVE_DBUS 1" >>confdefs.h
    2485025073
    2485125074fi
    … …  
    2520225425Usually this means the macro was only invoked conditionally." "$LINENO" 5
    2520325426fi
     25427if test -z "${HAS_DBUS_TRUE}" && test -z "${HAS_DBUS_FALSE}"; then
     25428  as_fn_error $? "conditional \"HAS_DBUS\" was never defined.
     25429Usually this means the macro was only invoked conditionally." "$LINENO" 5
     25430fi
    2520425431if test -z "${HAS_GUI_TRUE}" && test -z "${HAS_GUI_FALSE}"; then
    2520525432  as_fn_error $? "conditional \"HAS_GUI\" was never defined.
    … …  
    2568325910
    2568425911Report bugs to <thomas.bretz@epfl.ch>.
    25685 FACT++ home page: <http://fact.isdc.unige.ch/svn/trunk/FACT++/>."
     25912FACT++ home page: <https://fact.isdc.unige.ch/svn/trunk/FACT++/>."
    2568625913
    2568725914_ACEOF
    … …  
    2769427921{ $as_echo "$as_me:${as_lineno-$LINENO}:  CCfits                 / 'CCfits/CCfits'    found: $HAVE_CCFITS" >&5
    2769527922$as_echo "$as_me:  CCfits                 / 'CCfits/CCfits'    found: $HAVE_CCFITS" >&6;}
     27923{ $as_echo "$as_me:${as_lineno-$LINENO}:  DBus-1, DBus-glib-1    / pkg-config         found: $HAVE_DBUS" >&5
     27924$as_echo "$as_me:  DBus-1, DBus-glib-1    / pkg-config         found: $HAVE_DBUS" >&6;}
    2769627925if test "$lt_cv_libxp" = "yes"; then
    2769727926  { $as_echo "$as_me:${as_lineno-$LINENO}:  Motif/lesstif          / 'Xm/Xm.h' 'libXp'  found: yes" >&5
    … …  
    2792528154
    2792628155fi
     28156if test "$HAVE_NOVA" = yes; then
     28157  :
     28158else
     28159  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  libnova missing - smartfact will be compiles without astronomy support!" >&5
     28160$as_echo "$as_me: WARNING:  libnova missing - smartfact will be compiles without astronomy support!" >&2;}
     28161fi
     28162if test "$HAVE_DBUS" = yes; then
     28163  :
     28164else
     28165  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  DBus libraries missing - skypeclient will not be compiled!" >&5
     28166$as_echo "$as_me: WARNING:  DBus libraries missing - skypeclient will not be compiled!" >&2;}
     28167fi
     28168if test "$HAVE_SOPRANO" = yes; then
     28169  :
     28170else
     28171  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Soprano libraries missing - tngweather will not be compiled!" >&5
     28172$as_echo "$as_me: WARNING:  Soprano libraries missing - tngweather will not be compiled!" >&2;}
     28173fi
    2792728174{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
    2792828175$as_echo "$as_me: " >&6;}
Note: See TracChangeset for help on using the changeset viewer.