Ignore:
Timestamp:
08/06/11 16:04:54 (13 years ago)
Author:
tbretz
Message:
Updated to account for the new svn:externals which directly checks mcore out of Mars.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/configure

    r11721 r11808  
    761761HAS_GL_FALSE
    762762HAS_GL_TRUE
    763 HAS_FITS_H_FALSE
    764 HAS_FITS_H_TRUE
    765 HAS_IZSTREAM_H_FALSE
    766 HAS_IZSTREAM_H_TRUE
    767763HAS_ZLIB_FALSE
    768764HAS_ZLIB_TRUE
    … …  
    48464842  lt_cv_nm_interface="BSD nm"
    48474843  echo "int some_variable = 0;" > conftest.$ac_ext
    4848   (eval echo "\"\$as_me:4848: $ac_compile\"" >&5)
     4844  (eval echo "\"\$as_me:4844: $ac_compile\"" >&5)
    48494845  (eval "$ac_compile" 2>conftest.err)
    48504846  cat conftest.err >&5
    4851   (eval echo "\"\$as_me:4851: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
     4847  (eval echo "\"\$as_me:4847: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    48524848  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    48534849  cat conftest.err >&5
    4854   (eval echo "\"\$as_me:4854: output\"" >&5)
     4850  (eval echo "\"\$as_me:4850: output\"" >&5)
    48554851  cat conftest.out >&5
    48564852  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
    … …  
    60576053*-*-irix6*)
    60586054  # Find out which ABI we are using.
    6059   echo '#line 6059 "configure"' > conftest.$ac_ext
     6055  echo '#line 6055 "configure"' > conftest.$ac_ext
    60606056  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    60616057  (eval $ac_compile) 2>&5
    … …  
    77187714   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    77197715   -e 's:$: $lt_compiler_flag:'`
    7720    (eval echo "\"\$as_me:7720: $lt_compile\"" >&5)
     7716   (eval echo "\"\$as_me:7716: $lt_compile\"" >&5)
    77217717   (eval "$lt_compile" 2>conftest.err)
    77227718   ac_status=$?
    77237719   cat conftest.err >&5
    7724    echo "$as_me:7724: \$? = $ac_status" >&5
     7720   echo "$as_me:7720: \$? = $ac_status" >&5
    77257721   if (exit $ac_status) && test -s "$ac_outfile"; then
    77267722     # The compiler can only warn and ignore the option if not recognized
    … …  
    80578053   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80588054   -e 's:$: $lt_compiler_flag:'`
    8059    (eval echo "\"\$as_me:8059: $lt_compile\"" >&5)
     8055   (eval echo "\"\$as_me:8055: $lt_compile\"" >&5)
    80608056   (eval "$lt_compile" 2>conftest.err)
    80618057   ac_status=$?
    80628058   cat conftest.err >&5
    8063    echo "$as_me:8063: \$? = $ac_status" >&5
     8059   echo "$as_me:8059: \$? = $ac_status" >&5
    80648060   if (exit $ac_status) && test -s "$ac_outfile"; then
    80658061     # The compiler can only warn and ignore the option if not recognized
    … …  
    81628158   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81638159   -e 's:$: $lt_compiler_flag:'`
    8164    (eval echo "\"\$as_me:8164: $lt_compile\"" >&5)
     8160   (eval echo "\"\$as_me:8160: $lt_compile\"" >&5)
    81658161   (eval "$lt_compile" 2>out/conftest.err)
    81668162   ac_status=$?
    81678163   cat out/conftest.err >&5
    8168    echo "$as_me:8168: \$? = $ac_status" >&5
     8164   echo "$as_me:8164: \$? = $ac_status" >&5
    81698165   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    81708166   then
    … …  
    82178213   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82188214   -e 's:$: $lt_compiler_flag:'`
    8219    (eval echo "\"\$as_me:8219: $lt_compile\"" >&5)
     8215   (eval echo "\"\$as_me:8215: $lt_compile\"" >&5)
    82208216   (eval "$lt_compile" 2>out/conftest.err)
    82218217   ac_status=$?
    82228218   cat out/conftest.err >&5
    8223    echo "$as_me:8223: \$? = $ac_status" >&5
     8219   echo "$as_me:8219: \$? = $ac_status" >&5
    82248220   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    82258221   then
    … …  
    1060110597  lt_status=$lt_dlunknown
    1060210598  cat > conftest.$ac_ext <<_LT_EOF
    10603 #line 10603 "configure"
     10599#line 10599 "configure"
    1060410600#include "confdefs.h"
    1060510601
    … …  
    1069710693  lt_status=$lt_dlunknown
    1069810694  cat > conftest.$ac_ext <<_LT_EOF
    10699 #line 10699 "configure"
     10695#line 10695 "configure"
    1070010696#include "confdefs.h"
    1070110697
    … …  
    1265312649   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1265412650   -e 's:$: $lt_compiler_flag:'`
    12655    (eval echo "\"\$as_me:12655: $lt_compile\"" >&5)
     12651   (eval echo "\"\$as_me:12651: $lt_compile\"" >&5)
    1265612652   (eval "$lt_compile" 2>conftest.err)
    1265712653   ac_status=$?
    1265812654   cat conftest.err >&5
    12659    echo "$as_me:12659: \$? = $ac_status" >&5
     12655   echo "$as_me:12655: \$? = $ac_status" >&5
    1266012656   if (exit $ac_status) && test -s "$ac_outfile"; then
    1266112657     # The compiler can only warn and ignore the option if not recognized
    … …  
    1275212748   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1275312749   -e 's:$: $lt_compiler_flag:'`
    12754    (eval echo "\"\$as_me:12754: $lt_compile\"" >&5)
     12750   (eval echo "\"\$as_me:12750: $lt_compile\"" >&5)
    1275512751   (eval "$lt_compile" 2>out/conftest.err)
    1275612752   ac_status=$?
    1275712753   cat out/conftest.err >&5
    12758    echo "$as_me:12758: \$? = $ac_status" >&5
     12754   echo "$as_me:12754: \$? = $ac_status" >&5
    1275912755   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1276012756   then
    … …  
    1280412800   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1280512801   -e 's:$: $lt_compiler_flag:'`
    12806    (eval echo "\"\$as_me:12806: $lt_compile\"" >&5)
     12802   (eval echo "\"\$as_me:12802: $lt_compile\"" >&5)
    1280712803   (eval "$lt_compile" 2>out/conftest.err)
    1280812804   ac_status=$?
    1280912805   cat out/conftest.err >&5
    12810    echo "$as_me:12810: \$? = $ac_status" >&5
     12806   echo "$as_me:12806: \$? = $ac_status" >&5
    1281112807   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1281212808   then
    … …  
    1830818304        fi
    1830918305
    18310         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LANGUAGE}" >&5
    18311 $as_echo "$as_me: WARNING: ${LANGUAGE}" >&2;}
    18312 
    18313 
    1831418306        ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
    1831518307if test "x$ac_cv_header_zlib_h" = x""yes; then :
    … …  
    1842818420        fi
    1842918421
    18430         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LANGUAGE}" >&5
    18431 $as_echo "$as_me: WARNING: ${LANGUAGE}" >&2;}
    18432 
    18433 
    1843418422        ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
    1843518423if test "x$ac_cv_header_GL_gl_h" = x""yes; then :
    … …  
    1854618534        fi
    1854718535
    18548         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LANGUAGE}" >&5
    18549 $as_echo "$as_me: WARNING: ${LANGUAGE}" >&2;}
    18550 
    18551 
    1855218536        ac_fn_c_check_header_mongrel "$LINENO" "GL/glu.h" "ac_cv_header_GL_glu_h" "$ac_includes_default"
    1855318537if test "x$ac_cv_header_GL_glu_h" = x""yes; then :
    … …  
    1862918613
    1863018614# Check for the fits header and zstream support from MARS
    18631 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gui/RawEventsViewer/izstream.h" >&5
    18632 $as_echo_n "checking for gui/RawEventsViewer/izstream.h... " >&6; }
    18633 if test "${ac_cv_file_gui_RawEventsViewer_izstream_h+set}" = set; then :
    18634   $as_echo_n "(cached) " >&6
    18635 else
    18636   test "$cross_compiling" = yes &&
    18637   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
    18638 if test -r "gui/RawEventsViewer/izstream.h"; then
    18639   ac_cv_file_gui_RawEventsViewer_izstream_h=yes
    18640 else
    18641   ac_cv_file_gui_RawEventsViewer_izstream_h=no
    18642 fi
    18643 fi
    18644 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file_gui_RawEventsViewer_izstream_h" >&5
    18645 $as_echo "$ac_cv_file_gui_RawEventsViewer_izstream_h" >&6; }
    18646 if test "x$ac_cv_file_gui_RawEventsViewer_izstream_h" = x""yes; then :
    18647   HAVE_IZSTREAM_H=yes
    18648 else
    18649   HAVE_IZSTREAM_H=no
    18650 fi
    18651 
    18652 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gui/RawEventsViewer/fits.h" >&5
    18653 $as_echo_n "checking for gui/RawEventsViewer/fits.h... " >&6; }
    18654 if test "${ac_cv_file_gui_RawEventsViewer_fits_h+set}" = set; then :
    18655   $as_echo_n "(cached) " >&6
    18656 else
    18657   test "$cross_compiling" = yes &&
    18658   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
    18659 if test -r "gui/RawEventsViewer/fits.h"; then
    18660   ac_cv_file_gui_RawEventsViewer_fits_h=yes
    18661 else
    18662   ac_cv_file_gui_RawEventsViewer_fits_h=no
    18663 fi
    18664 fi
    18665 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file_gui_RawEventsViewer_fits_h" >&5
    18666 $as_echo "$ac_cv_file_gui_RawEventsViewer_fits_h" >&6; }
    18667 if test "x$ac_cv_file_gui_RawEventsViewer_fits_h" = x""yes; then :
    18668   HAVE_FITS_H=yes
    18669 else
    18670   HAVE_FITS_H=no
    18671 fi
    18672 
     18615#AC_CHECK_FILE(gui/RawEventsViewer/izstream.h,
     18616#               HAVE_IZSTREAM_H=yes, HAVE_IZSTREAM_H=no)
     18617#AC_CHECK_FILE(gui/RawEventsViewer/fits.h,
     18618#               HAVE_FITS_H=yes, HAVE_FITS_H=no)
    1867318619
    1867418620# Needed to compile FACT++
    … …  
    1871418660                CFLAGS="$CFLAGS -I${cfitsio_include}"
    1871518661        fi
    18716 
    18717         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LANGUAGE}" >&5
    18718 $as_echo "$as_me: WARNING: ${LANGUAGE}" >&2;}
    18719 
    1872018662
    1872118663        ac_fn_c_check_header_mongrel "$LINENO" "fitsio.h" "ac_cv_header_fitsio_h" "$ac_includes_default"
    … …  
    1884518787                CFLAGS="$CFLAGS -I${ccfits_include}"
    1884618788        fi
    18847 
    18848         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${LANGUAGE}" >&5
    18849 $as_echo "$as_me: WARNING: ${LANGUAGE}" >&2;}
    18850 
    1885118789
    1885218790        ac_fn_cxx_check_header_mongrel "$LINENO" "CCfits/CCfits" "ac_cv_header_CCfits_CCfits" "$ac_includes_default"
    … …  
    2215222090
    2215322091                cat > conftest.$ac_ext <<EOF
    22154 #line 22154 "configure"
     22092#line 22092 "configure"
    2215522093#include "confdefs.h"
    2215622094#include <qglobal.h>
    … …  
    2313023068fi
    2313123069
    23132  if test "$HAVE_IZSTREAM_H" = yes; then
    23133   HAS_IZSTREAM_H_TRUE=
    23134   HAS_IZSTREAM_H_FALSE='#'
    23135 else
    23136   HAS_IZSTREAM_H_TRUE='#'
    23137   HAS_IZSTREAM_H_FALSE=
    23138 fi
    23139 
    23140  if test "$HAVE_FITS_H" = yes; then
    23141   HAS_FITS_H_TRUE=
    23142   HAS_FITS_H_FALSE='#'
    23143 else
    23144   HAS_FITS_H_TRUE='#'
    23145   HAS_FITS_H_FALSE=
    23146 fi
    23147 
     23070#AM_CONDITIONAL(HAS_IZSTREAM_H,[test "$HAVE_IZSTREAM_H" = yes])
     23071#AM_CONDITIONAL(HAS_FITS_H,    [test "$HAVE_FITS_H" = yes])
    2314823072 if test "$HAVE_GL" = yes; then
    2314923073  HAS_GL_TRUE=
    … …  
    2317923103
    2318023104
    23181  if test "$QT4_VERSION" -a "$HAVE_FITS_H" = yes -a "$HAVE_GL" = yes -a "$HAVE_GLU" = yes -a "$HAVE_QGL" = yes -a "$HAVE_QWT" = yes; then
     23105 if test "$QT4_VERSION" -a "$HAVE_GL" = yes -a "$HAVE_GLU" = yes -a "$HAVE_QGL" = yes -a "$HAVE_QWT" = yes; then
    2318223106  HAS_VIEWER_TRUE=
    2318323107  HAS_VIEWER_FALSE='#'
    … …  
    2321323137
    2321423138fi
    23215 
    23216 if test "$HAVE_FITS_H" = yes; then
    23217 
    23218    if test "$HAVE_IZSTREAM_H" = yes; then
    23219 
    23220       if test "$HAVE_ZLIB" = yes; then
     23139if test "$HAVE_ZLIB" = yes; then
    2322123140  $as_echo "#define HAVE_ZLIB 1" >>confdefs.h
    2322223141
    2322323142fi
    2322423143
    23225 fi
    23226 
    23227 fi
     23144#AM_COND_IF(HAS_FITS_H, [
     23145#   AM_COND_IF(HAS_IZSTREAM_H, [
     23146#   ])
     23147#],)
    2322823148
    2322923149
    … …  
    2354023460if test -z "${HAS_ZLIB_TRUE}" && test -z "${HAS_ZLIB_FALSE}"; then
    2354123461  as_fn_error $? "conditional \"HAS_ZLIB\" was never defined.
    23542 Usually this means the macro was only invoked conditionally." "$LINENO" 5
    23543 fi
    23544 if test -z "${HAS_IZSTREAM_H_TRUE}" && test -z "${HAS_IZSTREAM_H_FALSE}"; then
    23545   as_fn_error $? "conditional \"HAS_IZSTREAM_H\" was never defined.
    23546 Usually this means the macro was only invoked conditionally." "$LINENO" 5
    23547 fi
    23548 if test -z "${HAS_FITS_H_TRUE}" && test -z "${HAS_FITS_H_FALSE}"; then
    23549   as_fn_error $? "conditional \"HAS_FITS_H\" was never defined.
    2355023462Usually this means the macro was only invoked conditionally." "$LINENO" 5
    2355123463fi
    … …  
    2596025872{ $as_echo "$as_me:${as_lineno-$LINENO}:  zlib                   / 'zlib.h'           found: $HAVE_ZLIB" >&5
    2596125873$as_echo "$as_me:  zlib                   / 'zlib.h'           found: $HAVE_ZLIB" >&6;}
    25962 { $as_echo "$as_me:${as_lineno-$LINENO}:  gui/RawEventsViewer/izstream.h              found: $HAVE_IZSTREAM_H" >&5
    25963 $as_echo "$as_me:  gui/RawEventsViewer/izstream.h              found: $HAVE_IZSTREAM_H" >&6;}
    25964 { $as_echo "$as_me:${as_lineno-$LINENO}:  gui/RawEventsViewer/fits.h                  found: $HAVE_FITS_H" >&5
    25965 $as_echo "$as_me:  gui/RawEventsViewer/fits.h                  found: $HAVE_FITS_H" >&6;}
     25874#AC_MSG_NOTICE([ gui/RawEventsViewer/izstream.h              found: $HAVE_IZSTREAM_H])
     25875#AC_MSG_NOTICE([ gui/RawEventsViewer/fits.h                  found: $HAVE_FITS_H])
    2596625876{ $as_echo "$as_me:${as_lineno-$LINENO}:  GL                     / GL/gl.h            found: $HAVE_GL" >&5
    2596725877$as_echo "$as_me:  GL                     / GL/gl.h            found: $HAVE_GL" >&6;}
    … …  
    2613226042{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
    2613326043$as_echo "$as_me: " >&6;}
    26134 if test "$HAVE_FITS_H" = yes; then
    26135 
     26044#AM_COND_IF(HAS_FITS_H, [
    2613626045   if test "$HAVE_ZLIB" = yes; then
    2613726046  :
    2613826047else
    26139   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  zlib not found. Support for .fits.gz in viewer disabled." >&5
    26140 $as_echo "$as_me: WARNING:  zlib not found. Support for .fits.gz in viewer disabled." >&2;}
    26141 
    26142 fi
    26143    if test "$HAVE_IZSTREAM_H" = yes; then
    26144   :
    26145 else
    26146   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Mars izstream.h not found in gui/RawEventsViewer. Support for .fits.gz disabled." >&5
    26147 $as_echo "$as_me: WARNING:  Mars izstream.h not found in gui/RawEventsViewer. Support for .fits.gz disabled." >&2;}
    26148 
    26149 fi
    26150 
    26151 else
    26152   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Mars fits.h not found in gui/RawEventsViewer. Target 'viewer' disabled." >&5
    26153 $as_echo "$as_me: WARNING:  Mars fits.h not found in gui/RawEventsViewer. Target 'viewer' disabled." >&2;}
    26154 
    26155 fi
     26048  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  zlib not found. Support for reading .fits.gz disabled." >&5
     26049$as_echo "$as_me: WARNING:  zlib not found. Support for reading .fits.gz disabled." >&2;}
     26050
     26051fi
     26052#   AM_COND_IF(HAS_IZSTREAM_H,,
     26053#      AC_MSG_WARN([ Mars izstream.h not found in gui/RawEventsViewer. Support for .fits.gz disabled.])
     26054#   )
     26055#],
     26056#   AC_MSG_WARN([ Mars fits.h not found in gui/RawEventsViewer. Target 'viewer' disabled.])
     26057#)
    2615626058if test "$lt_cv_libxp" = "yes"; then
    2615726059  :
    … …  
    2619026092$as_echo "$as_me: WARNING:  GLU not found - viewer will be disabled." >&2;}
    2619126093fi
     26094if test "$HAVE_QWT" = yes; then
     26095  :
     26096else
     26097  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:  Qwt not found - viewer will be disabled." >&5
     26098$as_echo "$as_me: WARNING:  Qwt not found - viewer will be disabled." >&2;}
     26099fi
    2619226100
    2619326101if test -n "$QT4_VERSION"; then
Note: See TracChangeset for help on using the changeset viewer.