Changeset 1732 in Sophya


Ignore:
Timestamp:
Nov 5, 2001, 2:30:33 PM (24 years ago)
Author:
aubourg
Message:

nettoyage pour portabilite

Location:
trunk/ArchTOIPipe
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/ArchTOIPipe/Kernel/Makefile.in

    r1731 r1732  
    1818
    1919ifeq ($(USE_SOPHYA),1)
    20  include $(DPCBASEREP)/Include/MakefileUser.h
    21 
    22  ifdef NOSHLIB
    23   LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a $(LIB)libFitsIOServer.a
    24   LIBS = -L$(LIB)  -lSysTools -lNTools -lBlitz  -lm
    25   ifeq ($(CXX),cxx)
    26    # librairie des instances de templates cxx
    27    LIBS := $(LIBS) -lrt
    28   endif
    29  else
    30   LIBF =  $(SLB)libsophya.so
    31   LIBS = -L$(SLB)  -lextsophya -lsophya -lm
    32   ifeq ($(MACHEROS),OSF1)
    33    LIBS := $(LIBS) -lfor
    34   endif
    35   ifeq ($(MACHEROS),Linux)
    36 #   LIBS := $(LIBS) -ldl -lf2c
    37   endif
    38  endif
    39  
     20  include $(DPCBASEREP)/Include/MakefileUser.h
    4021  CPPFLAGS := -DWITH_SOPHYA $(CPPFLAGS)
    41  ifeq ($(CXX), cxx)
    42    LIBS := $(LIBS) -pthread
    43  endif
    44  ifeq ($(MACHEROS),Linux)
    45    LIBS := $(LIBS) -lpthread
    46  endif
    4722else
    4823 ifeq ($(CXX), cxx)
    4924  CXXFLAGS := -O -g -D__USE_STD_IOSTREAM
    50   LIBS := $(LIBS) -pthread
    51  endif
    52  ifeq ($(MACHEROS),Linux)
    53    LIBS := $(LIBS) -lpthread
    5425 endif
    5526endif

  • trunk/ArchTOIPipe/Makefile.in

    r1730 r1732  
    77CXX=@CXX@
    88AR=@AR@
     9LIBS=@LIBS@
    910CXXFLAGS=-O -g
    1011CFLAGS=-O -g
    … …  
    2122 ifdef NOSHLIB
    2223  LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a $(LIB)libFitsIOServer.a
    23   LIBS := -L$(LIB)  -lSysTools -lNTools -lBlitz  -lm
     24  LIBS :=  -L$(LIB)  -lSysTools -lNTools -lBlitz  $(LIBS)
    2425  ifeq ($(CXX),cxx)
    2526   # librairie des instances de templates cxx
    … …  
    2829 else
    2930  LIBF =  $(SLB)libsophya.so
    30   LIBS := -L$(SLB)  -lextsophya -lsophya -lm
     31  LIBS := -L$(SLB)  -lextsophya -lsophya $(LIBS)
    3132  ifeq ($(MACHEROS),OSF1)
    3233   LIBS := $(LIBS) -lfor
    33   endif
    34   ifeq ($(MACHEROS),Linux)
    35 #   LIBS := $(LIBS) -ldl -lf2c
    3634  endif
    3735 endif

  • trunk/ArchTOIPipe/ProcWSophya/Makefile.in

    r1731 r1732  
    1919ifeq ($(USE_SOPHYA),1)
    2020 include $(DPCBASEREP)/Include/MakefileUser.h
    21 
    22  ifdef NOSHLIB
    23   LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a $(LIB)libFitsIOServer.a
    24   LIBS = -L$(LIB)  -lSysTools -lNTools -lBlitz  -lm
    25   ifeq ($(CXX),cxx)
    26    # librairie des instances de templates cxx
    27    LIBS := $(LIBS) -lrt
    28   endif
    29  else
    30   LIBF =  $(SLB)libsophya.so
    31   LIBS = -L$(SLB) -lextsophya -lsophya -lm
    32   ifeq ($(MACHEROS),OSF1)
    33    LIBS := $(LIBS) -lfor
    34   endif
    35   ifeq ($(MACHEROS),Linux)
    36 #   LIBS := $(LIBS) -ldl -lf2c
    37   endif
    38  endif
    39  
    4021 CPPFLAGS := -DWITH_SOPHYA $(CPPFLAGS)
    41  ifeq ($(CXX), cxx)
    42    LIBS := $(LIBS) -pthread
    43  endif
    44  ifeq ($(MACHEROS),Linux)
    45    LIBS := $(LIBS) -lpthread
    46  endif
    47 else
    48  ifeq ($(CXX), cxx)
    49   CXXFLAGS := -O -g -D__USE_STD_IOSTREAM
    50   LIBS := $(LIBS) -pthread
    51  endif
    52  ifeq ($(MACHEROS),Linux)
    53    LIBS := $(LIBS) -lpthread
    54  endif
    5522endif
    5623
    … …  
    5825CPPFLAGS    :=  $(CPPFLAGS) @cfitsincdir@ -I. -I$(srcdir)/../kernel -I$(srcdir)/.. -I.. -DANSI 
    5926
    60 LDLIBS=@cfitslibdir@ -lcfitsio $(LIBS)
    6127
    6228ifeq ($(MACHEROS),IRIX64)
    63  ifeq ($(CXX), g++)
    64    LDLIBS=@cfitslibdir@ -lcfitsio -L /usr/lib32/
    65  endif
    6629 ifeq ($(CXX), CC)
    6730   CXXFLAGS = -LANG:std -woff 1171,1174,1552 -O -OPT:Olimit=0

  • trunk/ArchTOIPipe/Processors/Makefile.in

    r1731 r1732  
    1818
    1919ifeq ($(USE_SOPHYA),1)
    20  include $(DPCBASEREP)/Include/MakefileUser.h
    21 
    22  ifdef NOSHLIB
    23   LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a $(LIB)libFitsIOServer.a
    24   LIBS = -L$(LIB)  -lSysTools -lNTools -lBlitz  -lm
    25   ifeq ($(CXX),cxx)
    26    # librairie des instances de templates cxx
    27    LIBS := $(LIBS) -lrt
    28   endif
    29  else
    30   LIBF =  $(SLB)libsophya.so
    31   LIBS = -L$(SLB) -lextsophya -lsophya -lm
    32   ifeq ($(MACHEROS),OSF1)
    33    LIBS := $(LIBS) -lfor
    34   endif
    35   ifeq ($(MACHEROS),Linux)
    36 #   LIBS := $(LIBS) -ldl -lf2c
    37   endif
    38  endif
    39  
     20 include $(DPCBASEREP)/Include/MakefileUser.h
    4021 CPPFLAGS := -DWITH_SOPHYA $(CPPFLAGS)
    41  ifeq ($(CXX), cxx)
    42    LIBS := $(LIBS) -pthread
    43  endif
    44  ifeq ($(MACHEROS),Linux)
    45    LIBS := $(LIBS) -lpthread
    46  endif
    4722else
    4823 ifeq ($(CXX), cxx)
    4924  CXXFLAGS := -O -g -D__USE_STD_IOSTREAM
    50   LIBS := $(LIBS) -pthread
    51  endif
    52  ifeq ($(MACHEROS),Linux)
    53    LIBS := $(LIBS) -lpthread
    5425 endif
    5526endif
    … …  
    5829CPPFLAGS    :=  $(CPPFLAGS) @cfitsincdir@ -I. -I$(srcdir)/../kernel -I$(srcdir)/.. -I.. -DANSI
    5930
    60 LDLIBS=@cfitslibdir@ -lcfitsio $(LIBS)
    61 
    6231ifeq ($(MACHEROS),IRIX64)
    63  ifeq ($(CXX), g++)
    64    LDLIBS=@cfitslibdir@ -lcfitsio -L /usr/lib32/
    65  endif
    6632 ifeq ($(CXX), CC)
    6733   CXXFLAGS = -LANG:std -woff 1171,1174,1552 -O -OPT:Olimit=0

  • trunk/ArchTOIPipe/Processors/nooppr.cc

    r1532 r1732  
     1#include <typeinfo>
    12#include "toimanager.h"
    23#include "nooppr.h"

  • trunk/ArchTOIPipe/TestPipes/Makefile.in

    r1730 r1732  
    88AR=@AR@
    99RANLIB=@RANLIB@
     10LIBS=@LIBS@
    1011CXXFLAGS=-O -g
    1112CFLAGS=-O -g
    … …  
    2223 ifdef NOSHLIB
    2324  LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a $(LIB)libFitsIOServer.a
    24   LIBS := -L$(LIB)  -lSysTools -lNTools -lBlitz  -lm
     25  LIBS := -L$(LIB)  -lSysTools -lNTools -lBlitz  $(LIBS)
    2526  ifeq ($(CXX),cxx)
    2627   # librairie des instances de templates cxx
    … …  
    2930 else
    3031  LIBF =  $(SLB)libsophya.so
    31   LIBS := -L$(SLB)  -lextsophya -lsophya -lm
     32  LIBS := -L$(SLB)  -lextsophya -lsophya $(LIBS)
    3233  ifeq ($(MACHEROS),OSF1)
    3334   LIBS := $(LIBS) -lfor
    34   endif
    35   ifeq ($(MACHEROS),Linux)
    36 #   LIBS := $(LIBS) -ldl -lf2c
    3735  endif
    3836 endif
    … …  
    4240   LIBS := $(LIBS) -pthread
    4341 endif
    44  ifeq ($(MACHEROS),Linux)
    45    LIBS := $(LIBS) -lpthread
    46  endif
    4742else
    4843 ifeq ($(CXX), cxx)
    4944  CXXFLAGS := -O -g -D__USE_STD_IOSTREAM
    5045  LIBS := $(LIBS) -pthread
    51  endif
    52  ifeq ($(MACHEROS),Linux)
    53    LIBS := $(LIBS) -lpthread
    5446 endif
    5547endif

  • trunk/ArchTOIPipe/configure

    r1730 r1732  
    545545fi
    546546
     547if test `uname` = Linux -a -f /usr/bin/g++; then
     548  CXX=/usr/bin/g++
     549fi
     550
    547551# Extract the first word of "gcc", so it can be a program name with args.
    548552set dummy gcc; ac_word=$2
    549553echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    550 echo "configure:551: checking for $ac_word" >&5
     554echo "configure:555: checking for $ac_word" >&5
    551555if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    552556  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    578582set dummy cc; ac_word=$2
    579583echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    580 echo "configure:581: checking for $ac_word" >&5
     584echo "configure:585: checking for $ac_word" >&5
    581585if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    582586  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    629633set dummy cl; ac_word=$2
    630634echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    631 echo "configure:632: checking for $ac_word" >&5
     635echo "configure:636: checking for $ac_word" >&5
    632636if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    633637  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    661665
    662666echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
    663 echo "configure:664: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
     667echo "configure:668: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
    664668
    665669ac_ext=c
    … …  
    672676cat > conftest.$ac_ext << EOF
    673677
    674 #line 675 "configure"
     678#line 679 "configure"
    675679#include "confdefs.h"
    676680
    677681main(){return(0);}
    678682EOF
    679 if { (eval echo configure:680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     683if { (eval echo configure:684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    680684  ac_cv_prog_cc_works=yes
    681685  # If we can't run a trivial program, we are probably using a cross compiler.
    … …  
    703707fi
    704708echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
    705 echo "configure:706: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
     709echo "configure:710: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
    706710echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
    707711cross_compiling=$ac_cv_prog_cc_cross
    708712
    709713echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
    710 echo "configure:711: checking whether we are using GNU C" >&5
     714echo "configure:715: checking whether we are using GNU C" >&5
    711715if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    712716  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    717721#endif
    718722EOF
    719 if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     723if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    720724  ac_cv_prog_gcc=yes
    721725else
    … …  
    736740CFLAGS=
    737741echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
    738 echo "configure:739: checking whether ${CC-cc} accepts -g" >&5
     742echo "configure:743: checking whether ${CC-cc} accepts -g" >&5
    739743if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    740744  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    772776set dummy $ac_prog; ac_word=$2
    773777echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    774 echo "configure:775: checking for $ac_word" >&5
     778echo "configure:779: checking for $ac_word" >&5
    775779if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
    776780  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    804808
    805809echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
    806 echo "configure:807: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
     810echo "configure:811: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
    807811
    808812ac_ext=C
    … …  
    815819cat > conftest.$ac_ext << EOF
    816820
    817 #line 818 "configure"
     821#line 822 "configure"
    818822#include "confdefs.h"
    819823
    820824int main(){return(0);}
    821825EOF
    822 if { (eval echo configure:823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     826if { (eval echo configure:827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    823827  ac_cv_prog_cxx_works=yes
    824828  # If we can't run a trivial program, we are probably using a cross compiler.
    … …  
    846850fi
    847851echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
    848 echo "configure:849: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
     852echo "configure:853: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
    849853echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
    850854cross_compiling=$ac_cv_prog_cxx_cross
    851855
    852856echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
    853 echo "configure:854: checking whether we are using GNU C++" >&5
     857echo "configure:858: checking whether we are using GNU C++" >&5
    854858if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
    855859  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    860864#endif
    861865EOF
    862 if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     866if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    863867  ac_cv_prog_gxx=yes
    864868else
    … …  
    879883CXXFLAGS=
    880884echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
    881 echo "configure:882: checking whether ${CXX-g++} accepts -g" >&5
     885echo "configure:886: checking whether ${CXX-g++} accepts -g" >&5
    882886if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
    883887  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    913917set dummy ar; ac_word=$2
    914918echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    915 echo "configure:916: checking for $ac_word" >&5
     919echo "configure:920: checking for $ac_word" >&5
    916920if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then
    917921  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    949953set dummy ranlib; ac_word=$2
    950954echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    951 echo "configure:952: checking for $ac_word" >&5
     955echo "configure:956: checking for $ac_word" >&5
    952956if eval "test \"`echo '$''{'ac_cv_path_RANLIB'+set}'`\" = set"; then
    953957  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    991995
    992996echo $ac_n "checking size of short""... $ac_c" 1>&6
    993 echo "configure:994: checking size of short" >&5
     997echo "configure:998: checking size of short" >&5
    994998if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
    995999  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    9991003else
    10001004  cat > conftest.$ac_ext <<EOF
    1001 #line 1002 "configure"
     1005#line 1006 "configure"
    10021006#include "confdefs.h"
    10031007#include <stdio.h>
    … …  
    10101014}
    10111015EOF
    1012 if { (eval echo configure:1013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1016if { (eval echo configure:1017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    10131017then
    10141018  ac_cv_sizeof_short=`cat conftestval`
    … …  
    10301034
    10311035echo $ac_n "checking size of int""... $ac_c" 1>&6
    1032 echo "configure:1033: checking size of int" >&5
     1036echo "configure:1037: checking size of int" >&5
    10331037if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
    10341038  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    10381042else
    10391043  cat > conftest.$ac_ext <<EOF
    1040 #line 1041 "configure"
     1044#line 1045 "configure"
    10411045#include "confdefs.h"
    10421046#include <stdio.h>
    … …  
    10491053}
    10501054EOF
    1051 if { (eval echo configure:1052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1055if { (eval echo configure:1056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    10521056then
    10531057  ac_cv_sizeof_int=`cat conftestval`
    … …  
    10691073
    10701074echo $ac_n "checking size of long""... $ac_c" 1>&6
    1071 echo "configure:1072: checking size of long" >&5
     1075echo "configure:1076: checking size of long" >&5
    10721076if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
    10731077  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    10771081else
    10781082  cat > conftest.$ac_ext <<EOF
    1079 #line 1080 "configure"
     1083#line 1084 "configure"
    10801084#include "confdefs.h"
    10811085#include <stdio.h>
    … …  
    10881092}
    10891093EOF
    1090 if { (eval echo configure:1091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1094if { (eval echo configure:1095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    10911095then
    10921096  ac_cv_sizeof_long=`cat conftestval`
    … …  
    11081112
    11091113echo $ac_n "checking size of long long""... $ac_c" 1>&6
    1110 echo "configure:1111: checking size of long long" >&5
     1114echo "configure:1115: checking size of long long" >&5
    11111115if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
    11121116  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    11161120else
    11171121  cat > conftest.$ac_ext <<EOF
    1118 #line 1119 "configure"
     1122#line 1123 "configure"
    11191123#include "confdefs.h"
    11201124#include <stdio.h>
    … …  
    11271131}
    11281132EOF
    1129 if { (eval echo configure:1130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1133if { (eval echo configure:1134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    11301134then
    11311135  ac_cv_sizeof_long_long=`cat conftestval`
    … …  
    11471151
    11481152echo $ac_n "checking size of float""... $ac_c" 1>&6
    1149 echo "configure:1150: checking size of float" >&5
     1153echo "configure:1154: checking size of float" >&5
    11501154if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then
    11511155  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    11551159else
    11561160  cat > conftest.$ac_ext <<EOF
    1157 #line 1158 "configure"
     1161#line 1162 "configure"
    11581162#include "confdefs.h"
    11591163#include <stdio.h>
    … …  
    11661170}
    11671171EOF
    1168 if { (eval echo configure:1169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1172if { (eval echo configure:1173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    11691173then
    11701174  ac_cv_sizeof_float=`cat conftestval`
    … …  
    11861190
    11871191echo $ac_n "checking size of double""... $ac_c" 1>&6
    1188 echo "configure:1189: checking size of double" >&5
     1192echo "configure:1193: checking size of double" >&5
    11891193if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
    11901194  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    11941198else
    11951199  cat > conftest.$ac_ext <<EOF
    1196 #line 1197 "configure"
     1200#line 1201 "configure"
    11971201#include "confdefs.h"
    11981202#include <stdio.h>
    … …  
    12051209}
    12061210EOF
    1207 if { (eval echo configure:1208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1211if { (eval echo configure:1212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    12081212then
    12091213  ac_cv_sizeof_double=`cat conftestval`
    … …  
    12251229
    12261230echo $ac_n "checking size of long double""... $ac_c" 1>&6
    1227 echo "configure:1228: checking size of long double" >&5
     1231echo "configure:1232: checking size of long double" >&5
    12281232if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then
    12291233  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    12331237else
    12341238  cat > conftest.$ac_ext <<EOF
    1235 #line 1236 "configure"
     1239#line 1240 "configure"
    12361240#include "confdefs.h"
    12371241#include <stdio.h>
    … …  
    12441248}
    12451249EOF
    1246 if { (eval echo configure:1247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1250if { (eval echo configure:1251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    12471251then
    12481252  ac_cv_sizeof_long_double=`cat conftestval`
    … …  
    12661270
    12671271echo $ac_n "checking "for cfitsio lib"""... $ac_c" 1>&6
    1268 echo "configure:1269: checking "for cfitsio lib"" >&5
     1272echo "configure:1273: checking "for cfitsio lib"" >&5
    12691273MACHDIR=`uname`-$CXX
    12701274if test -f $ARCHBASEREP/$MACHDIR/Libs/libcfitsio.a; then
    … …  
    12931297
    12941298echo $ac_n "checking "for cfitsio includes"""... $ac_c" 1>&6
    1295 echo "configure:1296: checking "for cfitsio includes"" >&5
     1299echo "configure:1300: checking "for cfitsio includes"" >&5
    12961300if test -f $CFITSIODIR/fitsio.h; then
    12971301  cfitsincdir='-I$(CFITSIODIR)'
    … …  
    13071311
    13081312echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
    1309 echo "configure:1310: checking for sin in -lm" >&5
     1313echo "configure:1314: checking for sin in -lm" >&5
    13101314ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
    13111315if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    13151319LIBS="-lm  $LIBS"
    13161320cat > conftest.$ac_ext <<EOF
    1317 #line 1318 "configure"
     1321#line 1322 "configure"
    13181322#include "confdefs.h"
    13191323/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    13261330; return 0; }
    13271331EOF
    1328 if { (eval echo configure:1329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1332if { (eval echo configure:1333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    13291333  rm -rf conftest*
    13301334  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    13531357fi
    13541358
     1359echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
     1360echo "configure:1361: checking for pthread_create in -lpthread" >&5
     1361ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
     1362if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     1363  echo $ac_n "(cached) $ac_c" 1>&6
     1364else
     1365  ac_save_LIBS="$LIBS"
     1366LIBS="-lpthread  $LIBS"
     1367cat > conftest.$ac_ext <<EOF
     1368#line 1369 "configure"
     1369#include "confdefs.h"
     1370/* Override any gcc2 internal prototype to avoid an error.  */
     1371/* We use char because int might match the return type of a gcc2
     1372    builtin and then its argument prototype would still apply.  */
     1373char pthread_create();
     1374
     1375int main() {
     1376pthread_create()
     1377; return 0; }
     1378EOF
     1379if { (eval echo configure:1380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1380  rm -rf conftest*
     1381  eval "ac_cv_lib_$ac_lib_var=yes"
     1382else
     1383  echo "configure: failed program was:" >&5
     1384  cat conftest.$ac_ext >&5
     1385  rm -rf conftest*
     1386  eval "ac_cv_lib_$ac_lib_var=no"
     1387fi
     1388rm -f conftest*
     1389LIBS="$ac_save_LIBS"
     1390
     1391fi
     1392if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
     1393  echo "$ac_t""yes" 1>&6
     1394    ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \
     1395    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
     1396  cat >> confdefs.h <<EOF
     1397#define $ac_tr_lib 1
     1398EOF
     1399
     1400  LIBS="-lpthread $LIBS"
     1401
     1402else
     1403  echo "$ac_t""no" 1>&6
     1404fi
     1405
     1406echo $ac_n "checking for scopy_ in -lblas""... $ac_c" 1>&6
     1407echo "configure:1408: checking for scopy_ in -lblas" >&5
     1408ac_lib_var=`echo blas'_'scopy_ | sed 'y%./+-%__p_%'`
     1409if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     1410  echo $ac_n "(cached) $ac_c" 1>&6
     1411else
     1412  ac_save_LIBS="$LIBS"
     1413LIBS="-lblas  $LIBS"
     1414cat > conftest.$ac_ext <<EOF
     1415#line 1416 "configure"
     1416#include "confdefs.h"
     1417/* Override any gcc2 internal prototype to avoid an error.  */
     1418/* We use char because int might match the return type of a gcc2
     1419    builtin and then its argument prototype would still apply.  */
     1420char scopy_();
     1421
     1422int main() {
     1423scopy_()
     1424; return 0; }
     1425EOF
     1426if { (eval echo configure:1427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1427  rm -rf conftest*
     1428  eval "ac_cv_lib_$ac_lib_var=yes"
     1429else
     1430  echo "configure: failed program was:" >&5
     1431  cat conftest.$ac_ext >&5
     1432  rm -rf conftest*
     1433  eval "ac_cv_lib_$ac_lib_var=no"
     1434fi
     1435rm -f conftest*
     1436LIBS="$ac_save_LIBS"
     1437
     1438fi
     1439if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
     1440  echo "$ac_t""yes" 1>&6
     1441    ac_tr_lib=HAVE_LIB`echo blas | sed -e 's/[^a-zA-Z0-9_]/_/g' \
     1442    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
     1443  cat >> confdefs.h <<EOF
     1444#define $ac_tr_lib 1
     1445EOF
     1446
     1447  LIBS="-lblas $LIBS"
     1448
     1449else
     1450  echo "$ac_t""no" 1>&6
     1451fi
     1452
     1453echo $ac_n "checking for s_copy in -lg2c""... $ac_c" 1>&6
     1454echo "configure:1455: checking for s_copy in -lg2c" >&5
     1455ac_lib_var=`echo g2c'_'s_copy | sed 'y%./+-%__p_%'`
     1456if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     1457  echo $ac_n "(cached) $ac_c" 1>&6
     1458else
     1459  ac_save_LIBS="$LIBS"
     1460LIBS="-lg2c  $LIBS"
     1461cat > conftest.$ac_ext <<EOF
     1462#line 1463 "configure"
     1463#include "confdefs.h"
     1464/* Override any gcc2 internal prototype to avoid an error.  */
     1465/* We use char because int might match the return type of a gcc2
     1466    builtin and then its argument prototype would still apply.  */
     1467char s_copy();
     1468
     1469int main() {
     1470s_copy()
     1471; return 0; }
     1472EOF
     1473if { (eval echo configure:1474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1474  rm -rf conftest*
     1475  eval "ac_cv_lib_$ac_lib_var=yes"
     1476else
     1477  echo "configure: failed program was:" >&5
     1478  cat conftest.$ac_ext >&5
     1479  rm -rf conftest*
     1480  eval "ac_cv_lib_$ac_lib_var=no"
     1481fi
     1482rm -f conftest*
     1483LIBS="$ac_save_LIBS"
     1484
     1485fi
     1486if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
     1487  echo "$ac_t""yes" 1>&6
     1488    ac_tr_lib=HAVE_LIB`echo g2c | sed -e 's/[^a-zA-Z0-9_]/_/g' \
     1489    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
     1490  cat >> confdefs.h <<EOF
     1491#define $ac_tr_lib 1
     1492EOF
     1493
     1494  LIBS="-lg2c $LIBS"
     1495
     1496else
     1497  echo "$ac_t""no" 1>&6
     1498fi
     1499
    13551500
    13561501echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
    1357 echo "configure:1358: checking how to run the C preprocessor" >&5
     1502echo "configure:1503: checking how to run the C preprocessor" >&5
    13581503# On Suns, sometimes $CPP names a directory.
    13591504if test -n "$CPP" && test -d "$CPP"; then
    … …  
    13701515  # not just through cpp.
    13711516  cat > conftest.$ac_ext <<EOF
    1372 #line 1373 "configure"
     1517#line 1518 "configure"
    13731518#include "confdefs.h"
    13741519#include <assert.h>
    … …  
    13761521EOF
    13771522ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1378 { (eval echo configure:1379: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1523{ (eval echo configure:1524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    13791524ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    13801525if test -z "$ac_err"; then
    … …  
    13871532  CPP="${CC-cc} -E -traditional-cpp"
    13881533  cat > conftest.$ac_ext <<EOF
    1389 #line 1390 "configure"
     1534#line 1535 "configure"
    13901535#include "confdefs.h"
    13911536#include <assert.h>
    … …  
    13931538EOF
    13941539ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1395 { (eval echo configure:1396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1540{ (eval echo configure:1541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    13961541ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    13971542if test -z "$ac_err"; then
    … …  
    14041549  CPP="${CC-cc} -nologo -E"
    14051550  cat > conftest.$ac_ext <<EOF
    1406 #line 1407 "configure"
     1551#line 1552 "configure"
    14071552#include "confdefs.h"
    14081553#include <assert.h>
    … …  
    14101555EOF
    14111556ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1412 { (eval echo configure:1413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1557{ (eval echo configure:1558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    14131558ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    14141559if test -z "$ac_err"; then
    … …  
    14351580
    14361581echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
    1437 echo "configure:1438: checking for ANSI C header files" >&5
     1582echo "configure:1583: checking for ANSI C header files" >&5
    14381583if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    14391584  echo $ac_n "(cached) $ac_c" 1>&6
    14401585else
    14411586  cat > conftest.$ac_ext <<EOF
    1442 #line 1443 "configure"
     1587#line 1588 "configure"
    14431588#include "confdefs.h"
    14441589#include <stdlib.h>
    … …  
    14481593EOF
    14491594ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1450 { (eval echo configure:1451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1595{ (eval echo configure:1596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    14511596ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    14521597if test -z "$ac_err"; then
    … …  
    14651610  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    14661611cat > conftest.$ac_ext <<EOF
    1467 #line 1468 "configure"
     1612#line 1613 "configure"
    14681613#include "confdefs.h"
    14691614#include <string.h>
    … …  
    14831628  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    14841629cat > conftest.$ac_ext <<EOF
    1485 #line 1486 "configure"
     1630#line 1631 "configure"
    14861631#include "confdefs.h"
    14871632#include <stdlib.h>
    … …  
    15041649else
    15051650  cat > conftest.$ac_ext <<EOF
    1506 #line 1507 "configure"
     1651#line 1652 "configure"
    15071652#include "confdefs.h"
    15081653#include <ctype.h>
    … …  
    15151660
    15161661EOF
    1517 if { (eval echo configure:1518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1662if { (eval echo configure:1663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    15181663then
    15191664  :
    … …  
    15421687ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    15431688echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    1544 echo "configure:1545: checking for $ac_hdr" >&5
     1689echo "configure:1690: checking for $ac_hdr" >&5
    15451690if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    15461691  echo $ac_n "(cached) $ac_c" 1>&6
    15471692else
    15481693  cat > conftest.$ac_ext <<EOF
    1549 #line 1550 "configure"
     1694#line 1695 "configure"
    15501695#include "confdefs.h"
    15511696#include <$ac_hdr>
    15521697EOF
    15531698ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1554 { (eval echo configure:1555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1699{ (eval echo configure:1700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    15551700ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    15561701if test -z "$ac_err"; then

  • trunk/ArchTOIPipe/configure.in

    r1730 r1732  
    1414    export CXX
    1515  fi
     16fi
     17
     18dnl on donne priorite a g++ sur c++ sur Linux
     19if test `uname` = Linux -a -f /usr/bin/g++; then
     20  CXX=/usr/bin/g++
    1621fi
    1722
    … …  
    8186dnl AC_CHECK_LIB(cfitsio, ffread,,AC_MSG_ERROR("Cannot find cfitsio library"))
    8287AC_CHECK_LIB(m, sin)
     88AC_CHECK_LIB(pthread, pthread_create)
     89AC_CHECK_LIB(blas, scopy_)
     90AC_CHECK_LIB(g2c, s_copy)
    8391
    8492dnl Checks for header files.
Note: See TracChangeset for help on using the changeset viewer.