Changeset 2173


Ignore:
Timestamp:
03/14/01 04:15:23 (20 years ago)
Author:
cs025
Message:

Improvements to configure scripts in their support of various MICO
environment considerations, particularly when MICO is on the system
paths.

Fixed CORBA version of ping to correspond with parameters etc. of the
native form.

Finally, improved PING action to be more than a simple call to
the HASCOLLECTION action in the null protocol.

Location:
trunk/gsdl
Files:
1 added
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/acconfig.h

    r1860 r2173  
    4444#undef MICO_DIR
    4545
     46/* Define MICO_VERSION if required */
     47#undef MICO_VERSION
    4648
    4749
    4850
    49 
  • trunk/gsdl/config.h.in

    r1860 r2173  
    105105#undef MICO_DIR
    106106
     107/* Define MICO_VERSION if required */
     108#undef MICO_VERSION
     109
    107110/* Define if you have the ftime function.  */
    108111#undef HAVE_FTIME
  • trunk/gsdl/configure

    r2051 r2173  
    990990fi
    991991
    992 for ac_prog in mawk gawk nawk awk
     992for ac_prog in gawk mawk nawk awk
    993993do
    994994# Extract the first word of "$ac_prog", so it can be a program name with args.
     
    12221222
    12231223
     1224#moved CORBA MICO directory test to get version of MICO
     1225if test $USE_CORBA = 1; then
     1226
     1227if test $MICO_DIR = default; then
     1228#do something
     1229MICO_INC="-I packages/mico/mico/include"
     1230else
     1231#build the micotest program
     1232MICO_INC= ""
     1233if test $MICO_DIR != yes; then
     1234MICO_INC="-I $MICO_DIR"
     1235fi
     1236fi
     1237
     1238#get MICO_VER value
     1239sh -c "$CC -c micotest.cpp -o micotest.o $MICO_INC 2>&1" > /dev/null
     1240sh -c "$CC -o micotest micotest.o -lstdc++ 2>&1" > /dev/null
     1241MICO_VER=`./micotest` || MICO_VER=0
     1242sh -c "rm micotest"
     1243sh -c "rm micotest.o"
     1244
     1245#do test of MICO_VER
     1246if test MICO_VER != 0; then
     1247cat >> confdefs.h <<\EOF
     1248#define MICO_VER 1
     1249EOF
     1250
     1251
     1252fi
     1253#end USE_CORBA test
     1254fi
     1255
    12241256echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
    1225 echo "configure:1226: checking how to run the C preprocessor" >&5
     1257echo "configure:1258: checking how to run the C preprocessor" >&5
    12261258# On Suns, sometimes $CPP names a directory.
    12271259if test -n "$CPP" && test -d "$CPP"; then
     
    12381270  # not just through cpp.
    12391271  cat > conftest.$ac_ext <<EOF
    1240 #line 1241 "configure"
     1272#line 1273 "configure"
    12411273#include "confdefs.h"
    12421274#include <assert.h>
     
    12441276EOF
    12451277ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1246 { (eval echo configure:1247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1278{ (eval echo configure:1279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    12471279ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    12481280if test -z "$ac_err"; then
     
    12551287  CPP="${CC-cc} -E -traditional-cpp"
    12561288  cat > conftest.$ac_ext <<EOF
    1257 #line 1258 "configure"
     1289#line 1290 "configure"
    12581290#include "confdefs.h"
    12591291#include <assert.h>
     
    12611293EOF
    12621294ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1263 { (eval echo configure:1264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1295{ (eval echo configure:1296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    12641296ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    12651297if test -z "$ac_err"; then
     
    12721304  CPP="${CC-cc} -nologo -E"
    12731305  cat > conftest.$ac_ext <<EOF
    1274 #line 1275 "configure"
     1306#line 1307 "configure"
    12751307#include "confdefs.h"
    12761308#include <assert.h>
     
    12781310EOF
    12791311ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1280 { (eval echo configure:1281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1312{ (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    12811313ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    12821314if test -z "$ac_err"; then
     
    13031335
    13041336echo $ac_n "checking for AIX""... $ac_c" 1>&6
    1305 echo "configure:1306: checking for AIX" >&5
     1337echo "configure:1338: checking for AIX" >&5
    13061338cat > conftest.$ac_ext <<EOF
    1307 #line 1308 "configure"
     1339#line 1340 "configure"
    13081340#include "confdefs.h"
    13091341#ifdef _AIX
     
    13271359
    13281360echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
    1329 echo "configure:1330: checking for POSIXized ISC" >&5
     1361echo "configure:1362: checking for POSIXized ISC" >&5
    13301362if test -d /etc/conf/kconfig.d &&
    13311363  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
     
    13491381ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
    13501382echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
    1351 echo "configure:1352: checking for minix/config.h" >&5
     1383echo "configure:1384: checking for minix/config.h" >&5
    13521384if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    13531385  echo $ac_n "(cached) $ac_c" 1>&6
    13541386else
    13551387  cat > conftest.$ac_ext <<EOF
    1356 #line 1357 "configure"
     1388#line 1389 "configure"
    13571389#include "confdefs.h"
    13581390#include <minix/config.h>
    13591391EOF
    13601392ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1361 { (eval echo configure:1362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1393{ (eval echo configure:1394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    13621394ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    13631395if test -z "$ac_err"; then
     
    13971429
    13981430echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
    1399 echo "configure:1400: checking for ${CC-cc} option to accept ANSI C" >&5
     1431echo "configure:1432: checking for ${CC-cc} option to accept ANSI C" >&5
    14001432if eval "test \"`echo '$''{'ac_cv_prog_cc_stdc'+set}'`\" = set"; then
    14011433  echo $ac_n "(cached) $ac_c" 1>&6
     
    14131445  CFLAGS="$ac_save_CFLAGS $ac_arg"
    14141446  cat > conftest.$ac_ext <<EOF
    1415 #line 1416 "configure"
     1447#line 1448 "configure"
    14161448#include "confdefs.h"
    14171449#if !defined(__STDC__) || __STDC__ != 1
     
    14251457; return 0; }
    14261458EOF
    1427 if { (eval echo configure:1428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1459if { (eval echo configure:1460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    14281460  rm -rf conftest*
    14291461  ac_cv_prog_cc_stdc="$ac_arg"; break
     
    14461478
    14471479echo $ac_n "checking for function prototypes""... $ac_c" 1>&6
    1448 echo "configure:1449: checking for function prototypes" >&5
     1480echo "configure:1481: checking for function prototypes" >&5
    14491481if test "$ac_cv_prog_cc_stdc" != no; then
    14501482  echo "$ac_t""yes" 1>&6
     
    14601492
    14611493echo $ac_n "checking for working const""... $ac_c" 1>&6
    1462 echo "configure:1463: checking for working const" >&5
     1494echo "configure:1495: checking for working const" >&5
    14631495if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    14641496  echo $ac_n "(cached) $ac_c" 1>&6
    14651497else
    14661498  cat > conftest.$ac_ext <<EOF
    1467 #line 1468 "configure"
     1499#line 1500 "configure"
    14681500#include "confdefs.h"
    14691501
     
    15141546; return 0; }
    15151547EOF
    1516 if { (eval echo configure:1517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1548if { (eval echo configure:1549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    15171549  rm -rf conftest*
    15181550  ac_cv_c_const=yes
     
    15351567
    15361568echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
    1537 echo "configure:1538: checking for ANSI C header files" >&5
     1569echo "configure:1570: checking for ANSI C header files" >&5
    15381570if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    15391571  echo $ac_n "(cached) $ac_c" 1>&6
    15401572else
    15411573  cat > conftest.$ac_ext <<EOF
    1542 #line 1543 "configure"
     1574#line 1575 "configure"
    15431575#include "confdefs.h"
    15441576#include <stdlib.h>
     
    15481580EOF
    15491581ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1550 { (eval echo configure:1551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1582{ (eval echo configure:1583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    15511583ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    15521584if test -z "$ac_err"; then
     
    15651597  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    15661598cat > conftest.$ac_ext <<EOF
    1567 #line 1568 "configure"
     1599#line 1600 "configure"
    15681600#include "confdefs.h"
    15691601#include <string.h>
     
    15831615  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    15841616cat > conftest.$ac_ext <<EOF
    1585 #line 1586 "configure"
     1617#line 1618 "configure"
    15861618#include "confdefs.h"
    15871619#include <stdlib.h>
     
    16041636else
    16051637  cat > conftest.$ac_ext <<EOF
    1606 #line 1607 "configure"
     1638#line 1639 "configure"
    16071639#include "confdefs.h"
    16081640#include <ctype.h>
     
    16151647
    16161648EOF
    1617 if { (eval echo configure:1618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1649if { (eval echo configure:1650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    16181650then
    16191651  :
     
    16391671
    16401672echo $ac_n "checking for off_t""... $ac_c" 1>&6
    1641 echo "configure:1642: checking for off_t" >&5
     1673echo "configure:1674: checking for off_t" >&5
    16421674if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
    16431675  echo $ac_n "(cached) $ac_c" 1>&6
    16441676else
    16451677  cat > conftest.$ac_ext <<EOF
    1646 #line 1647 "configure"
     1678#line 1679 "configure"
    16471679#include "confdefs.h"
    16481680#include <sys/types.h>
     
    16721704
    16731705echo $ac_n "checking for size_t""... $ac_c" 1>&6
    1674 echo "configure:1675: checking for size_t" >&5
     1706echo "configure:1707: checking for size_t" >&5
    16751707if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
    16761708  echo $ac_n "(cached) $ac_c" 1>&6
    16771709else
    16781710  cat > conftest.$ac_ext <<EOF
    1679 #line 1680 "configure"
     1711#line 1712 "configure"
    16801712#include "confdefs.h"
    16811713#include <sys/types.h>
     
    17051737
    17061738echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
    1707 echo "configure:1708: checking whether time.h and sys/time.h may both be included" >&5
     1739echo "configure:1740: checking whether time.h and sys/time.h may both be included" >&5
    17081740if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
    17091741  echo $ac_n "(cached) $ac_c" 1>&6
    17101742else
    17111743  cat > conftest.$ac_ext <<EOF
    1712 #line 1713 "configure"
     1744#line 1745 "configure"
    17131745#include "confdefs.h"
    17141746#include <sys/types.h>
     
    17191751; return 0; }
    17201752EOF
    1721 if { (eval echo configure:1722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1753if { (eval echo configure:1754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    17221754  rm -rf conftest*
    17231755  ac_cv_header_time=yes
     
    17401772
    17411773echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
    1742 echo "configure:1743: checking whether struct tm is in sys/time.h or time.h" >&5
     1774echo "configure:1775: checking whether struct tm is in sys/time.h or time.h" >&5
    17431775if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
    17441776  echo $ac_n "(cached) $ac_c" 1>&6
    17451777else
    17461778  cat > conftest.$ac_ext <<EOF
    1747 #line 1748 "configure"
     1779#line 1780 "configure"
    17481780#include "confdefs.h"
    17491781#include <sys/types.h>
     
    17531785; return 0; }
    17541786EOF
    1755 if { (eval echo configure:1756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1787if { (eval echo configure:1788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    17561788  rm -rf conftest*
    17571789  ac_cv_struct_tm=time.h
     
    17761808if test "$ac_cv_prog_cc_stdc" = '-Xc'; then
    17771809cat > conftest.$ac_ext <<EOF
    1778 #line 1779 "configure"
     1810#line 1811 "configure"
    17791811#include "confdefs.h"
    17801812#include <stdio.h>
     
    17841816; return 0; }
    17851817EOF
    1786 if { (eval echo configure:1787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1818if { (eval echo configure:1819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    17871819  :
    17881820else
     
    17971829
    17981830echo $ac_n "checking for main in -lg""... $ac_c" 1>&6
    1799 echo "configure:1800: checking for main in -lg" >&5
     1831echo "configure:1832: checking for main in -lg" >&5
    18001832ac_lib_var=`echo g'_'main | sed 'y%./+-%__p_%'`
    18011833if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    18051837LIBS="-lg  $LIBS"
    18061838cat > conftest.$ac_ext <<EOF
    1807 #line 1808 "configure"
     1839#line 1840 "configure"
    18081840#include "confdefs.h"
    18091841
     
    18121844; return 0; }
    18131845EOF
    1814 if { (eval echo configure:1815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1846if { (eval echo configure:1847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    18151847  rm -rf conftest*
    18161848  eval "ac_cv_lib_$ac_lib_var=yes"
     
    18401872
    18411873echo $ac_n "checking for main in -lgdbm""... $ac_c" 1>&6
    1842 echo "configure:1843: checking for main in -lgdbm" >&5
     1874echo "configure:1875: checking for main in -lgdbm" >&5
    18431875ac_lib_var=`echo gdbm'_'main | sed 'y%./+-%__p_%'`
    18441876if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    18481880LIBS="-lgdbm  $LIBS"
    18491881cat > conftest.$ac_ext <<EOF
    1850 #line 1851 "configure"
     1882#line 1883 "configure"
    18511883#include "confdefs.h"
    18521884
     
    18551887; return 0; }
    18561888EOF
    1857 if { (eval echo configure:1858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1889if { (eval echo configure:1890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    18581890  rm -rf conftest*
    18591891  eval "ac_cv_lib_$ac_lib_var=yes"
     
    18831915
    18841916echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
    1885 echo "configure:1886: checking for main in -lm" >&5
     1917echo "configure:1918: checking for main in -lm" >&5
    18861918ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
    18871919if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    18911923LIBS="-lm  $LIBS"
    18921924cat > conftest.$ac_ext <<EOF
    1893 #line 1894 "configure"
     1925#line 1926 "configure"
    18941926#include "confdefs.h"
    18951927
     
    18981930; return 0; }
    18991931EOF
    1900 if { (eval echo configure:1901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1932if { (eval echo configure:1933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    19011933  rm -rf conftest*
    19021934  eval "ac_cv_lib_$ac_lib_var=yes"
     
    19261958
    19271959echo $ac_n "checking for main in -lstdc++""... $ac_c" 1>&6
    1928 echo "configure:1929: checking for main in -lstdc++" >&5
     1960echo "configure:1961: checking for main in -lstdc++" >&5
    19291961ac_lib_var=`echo stdc++'_'main | sed 'y%./+-%__p_%'`
    19301962if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    19341966LIBS="-lstdc++  $LIBS"
    19351967cat > conftest.$ac_ext <<EOF
    1936 #line 1937 "configure"
     1968#line 1969 "configure"
    19371969#include "confdefs.h"
    19381970
     
    19411973; return 0; }
    19421974EOF
    1943 if { (eval echo configure:1944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1975if { (eval echo configure:1976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    19441976  rm -rf conftest*
    19451977  eval "ac_cv_lib_$ac_lib_var=yes"
     
    19692001
    19702002echo $ac_n "checking for main in -lcrypt""... $ac_c" 1>&6
    1971 echo "configure:1972: checking for main in -lcrypt" >&5
     2003echo "configure:2004: checking for main in -lcrypt" >&5
    19722004ac_lib_var=`echo crypt'_'main | sed 'y%./+-%__p_%'`
    19732005if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    19772009LIBS="-lcrypt  $LIBS"
    19782010cat > conftest.$ac_ext <<EOF
    1979 #line 1980 "configure"
     2011#line 2012 "configure"
    19802012#include "confdefs.h"
    19812013
     
    19842016; return 0; }
    19852017EOF
    1986 if { (eval echo configure:1987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2018if { (eval echo configure:2019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    19872019  rm -rf conftest*
    19882020  eval "ac_cv_lib_$ac_lib_var=yes"
     
    20182050ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    20192051echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
    2020 echo "configure:2021: checking for $ac_hdr that defines DIR" >&5
     2052echo "configure:2053: checking for $ac_hdr that defines DIR" >&5
    20212053if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
    20222054  echo $ac_n "(cached) $ac_c" 1>&6
    20232055else
    20242056  cat > conftest.$ac_ext <<EOF
    2025 #line 2026 "configure"
     2057#line 2058 "configure"
    20262058#include "confdefs.h"
    20272059#include <sys/types.h>
     
    20312063; return 0; }
    20322064EOF
    2033 if { (eval echo configure:2034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2065if { (eval echo configure:2066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    20342066  rm -rf conftest*
    20352067  eval "ac_cv_header_dirent_$ac_safe=yes"
     
    20562088if test $ac_header_dirent = dirent.h; then
    20572089echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
    2058 echo "configure:2059: checking for opendir in -ldir" >&5
     2090echo "configure:2091: checking for opendir in -ldir" >&5
    20592091ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
    20602092if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    20642096LIBS="-ldir  $LIBS"
    20652097cat > conftest.$ac_ext <<EOF
    2066 #line 2067 "configure"
     2098#line 2099 "configure"
    20672099#include "confdefs.h"
    20682100/* Override any gcc2 internal prototype to avoid an error.  */
     
    20752107; return 0; }
    20762108EOF
    2077 if { (eval echo configure:2078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2109if { (eval echo configure:2110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    20782110  rm -rf conftest*
    20792111  eval "ac_cv_lib_$ac_lib_var=yes"
     
    20972129else
    20982130echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
    2099 echo "configure:2100: checking for opendir in -lx" >&5
     2131echo "configure:2132: checking for opendir in -lx" >&5
    21002132ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
    21012133if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    21052137LIBS="-lx  $LIBS"
    21062138cat > conftest.$ac_ext <<EOF
    2107 #line 2108 "configure"
     2139#line 2140 "configure"
    21082140#include "confdefs.h"
    21092141/* Override any gcc2 internal prototype to avoid an error.  */
     
    21162148; return 0; }
    21172149EOF
    2118 if { (eval echo configure:2119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2150if { (eval echo configure:2151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    21192151  rm -rf conftest*
    21202152  eval "ac_cv_lib_$ac_lib_var=yes"
     
    21392171
    21402172echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
    2141 echo "configure:2142: checking for ANSI C header files" >&5
     2173echo "configure:2174: checking for ANSI C header files" >&5
    21422174if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    21432175  echo $ac_n "(cached) $ac_c" 1>&6
    21442176else
    21452177  cat > conftest.$ac_ext <<EOF
    2146 #line 2147 "configure"
     2178#line 2179 "configure"
    21472179#include "confdefs.h"
    21482180#include <stdlib.h>
     
    21522184EOF
    21532185ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2154 { (eval echo configure:2155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2186{ (eval echo configure:2187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    21552187ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    21562188if test -z "$ac_err"; then
     
    21692201  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    21702202cat > conftest.$ac_ext <<EOF
    2171 #line 2172 "configure"
     2203#line 2204 "configure"
    21722204#include "confdefs.h"
    21732205#include <string.h>
     
    21872219  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    21882220cat > conftest.$ac_ext <<EOF
    2189 #line 2190 "configure"
     2221#line 2222 "configure"
    21902222#include "confdefs.h"
    21912223#include <stdlib.h>
     
    22082240else
    22092241  cat > conftest.$ac_ext <<EOF
    2210 #line 2211 "configure"
     2242#line 2243 "configure"
    22112243#include "confdefs.h"
    22122244#include <ctype.h>
     
    22192251
    22202252EOF
    2221 if { (eval echo configure:2222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     2253if { (eval echo configure:2254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    22222254then
    22232255  :
     
    22462278ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    22472279echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    2248 echo "configure:2249: checking for $ac_hdr" >&5
     2280echo "configure:2281: checking for $ac_hdr" >&5
    22492281if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    22502282  echo $ac_n "(cached) $ac_c" 1>&6
    22512283else
    22522284  cat > conftest.$ac_ext <<EOF
    2253 #line 2254 "configure"
     2285#line 2286 "configure"
    22542286#include "confdefs.h"
    22552287#include <$ac_hdr>
    22562288EOF
    22572289ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2258 { (eval echo configure:2259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2290{ (eval echo configure:2291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    22592291ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    22602292if test -z "$ac_err"; then
     
    22832315
    22842316cat > conftest.$ac_ext <<EOF
    2285 #line 2286 "configure"
     2317#line 2318 "configure"
    22862318#include "confdefs.h"
    22872319#include <stdio.h>
     
    22982330
    22992331cat > conftest.$ac_ext <<EOF
    2300 #line 2301 "configure"
     2332#line 2333 "configure"
    23012333#include "confdefs.h"
    23022334#include <stdio.h>
     
    23132345
    23142346cat > conftest.$ac_ext <<EOF
    2315 #line 2316 "configure"
     2347#line 2348 "configure"
    23162348#include "confdefs.h"
    23172349#include <sys/procfs.h>
     
    23312363# for constant arguments.  Useless!
    23322364echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
    2333 echo "configure:2334: checking for working alloca.h" >&5
     2365echo "configure:2366: checking for working alloca.h" >&5
    23342366if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    23352367  echo $ac_n "(cached) $ac_c" 1>&6
    23362368else
    23372369  cat > conftest.$ac_ext <<EOF
    2338 #line 2339 "configure"
     2370#line 2371 "configure"
    23392371#include "confdefs.h"
    23402372#include <alloca.h>
     
    23432375; return 0; }
    23442376EOF
    2345 if { (eval echo configure:2346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2377if { (eval echo configure:2378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    23462378  rm -rf conftest*
    23472379  ac_cv_header_alloca_h=yes
     
    23642396
    23652397echo $ac_n "checking for alloca""... $ac_c" 1>&6
    2366 echo "configure:2367: checking for alloca" >&5
     2398echo "configure:2399: checking for alloca" >&5
    23672399if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    23682400  echo $ac_n "(cached) $ac_c" 1>&6
    23692401else
    23702402  cat > conftest.$ac_ext <<EOF
    2371 #line 2372 "configure"
     2403#line 2404 "configure"
    23722404#include "confdefs.h"
    23732405
     
    23972429; return 0; }
    23982430EOF
    2399 if { (eval echo configure:2400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2431if { (eval echo configure:2432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    24002432  rm -rf conftest*
    24012433  ac_cv_func_alloca_works=yes
     
    24292461
    24302462echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
    2431 echo "configure:2432: checking whether alloca needs Cray hooks" >&5
     2463echo "configure:2464: checking whether alloca needs Cray hooks" >&5
    24322464if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    24332465  echo $ac_n "(cached) $ac_c" 1>&6
    24342466else
    24352467  cat > conftest.$ac_ext <<EOF
    2436 #line 2437 "configure"
     2468#line 2469 "configure"
    24372469#include "confdefs.h"
    24382470#if defined(CRAY) && ! defined(CRAY2)
     
    24592491for ac_func in _getb67 GETB67 getb67; do
    24602492  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    2461 echo "configure:2462: checking for $ac_func" >&5
     2493echo "configure:2494: checking for $ac_func" >&5
    24622494if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    24632495  echo $ac_n "(cached) $ac_c" 1>&6
    24642496else
    24652497  cat > conftest.$ac_ext <<EOF
    2466 #line 2467 "configure"
     2498#line 2499 "configure"
    24672499#include "confdefs.h"
    24682500/* System header to define __stub macros and hopefully few prototypes,
     
    24872519; return 0; }
    24882520EOF
    2489 if { (eval echo configure:2490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2521if { (eval echo configure:2522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    24902522  rm -rf conftest*
    24912523  eval "ac_cv_func_$ac_func=yes"
     
    25142546
    25152547echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
    2516 echo "configure:2517: checking stack direction for C alloca" >&5
     2548echo "configure:2549: checking stack direction for C alloca" >&5
    25172549if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    25182550  echo $ac_n "(cached) $ac_c" 1>&6
     
    25222554else
    25232555  cat > conftest.$ac_ext <<EOF
    2524 #line 2525 "configure"
     2556#line 2557 "configure"
    25252557#include "confdefs.h"
    25262558find_stack_direction ()
     
    25412573}
    25422574EOF
    2543 if { (eval echo configure:2544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     2575if { (eval echo configure:2576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    25442576then
    25452577  ac_cv_c_stack_direction=1
     
    25642596if test $ac_cv_prog_gcc = yes; then
    25652597    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
    2566 echo "configure:2567: checking whether ${CC-cc} needs -traditional" >&5
     2598echo "configure:2599: checking whether ${CC-cc} needs -traditional" >&5
    25672599if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
    25682600  echo $ac_n "(cached) $ac_c" 1>&6
     
    25702602    ac_pattern="Autoconf.*'x'"
    25712603  cat > conftest.$ac_ext <<EOF
    2572 #line 2573 "configure"
     2604#line 2605 "configure"
    25732605#include "confdefs.h"
    25742606#include <sgtty.h>
     
    25882620  if test $ac_cv_prog_gcc_traditional = no; then
    25892621    cat > conftest.$ac_ext <<EOF
    2590 #line 2591 "configure"
     2622#line 2623 "configure"
    25912623#include "confdefs.h"
    25922624#include <termio.h>
     
    26102642
    26112643echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
    2612 echo "configure:2613: checking return type of signal handlers" >&5
     2644echo "configure:2645: checking return type of signal handlers" >&5
    26132645if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    26142646  echo $ac_n "(cached) $ac_c" 1>&6
    26152647else
    26162648  cat > conftest.$ac_ext <<EOF
    2617 #line 2618 "configure"
     2649#line 2650 "configure"
    26182650#include "confdefs.h"
    26192651#include <sys/types.h>
     
    26322664; return 0; }
    26332665EOF
    2634 if { (eval echo configure:2635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2666if { (eval echo configure:2667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    26352667  rm -rf conftest*
    26362668  ac_cv_type_signal=void
     
    26512683
    26522684echo $ac_n "checking for vprintf""... $ac_c" 1>&6
    2653 echo "configure:2654: checking for vprintf" >&5
     2685echo "configure:2686: checking for vprintf" >&5
    26542686if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
    26552687  echo $ac_n "(cached) $ac_c" 1>&6
    26562688else
    26572689  cat > conftest.$ac_ext <<EOF
    2658 #line 2659 "configure"
     2690#line 2691 "configure"
    26592691#include "confdefs.h"
    26602692/* System header to define __stub macros and hopefully few prototypes,
     
    26792711; return 0; }
    26802712EOF
    2681 if { (eval echo configure:2682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2713if { (eval echo configure:2714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    26822714  rm -rf conftest*
    26832715  eval "ac_cv_func_vprintf=yes"
     
    27032735if test "$ac_cv_func_vprintf" != yes; then
    27042736echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
    2705 echo "configure:2706: checking for _doprnt" >&5
     2737echo "configure:2738: checking for _doprnt" >&5
    27062738if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
    27072739  echo $ac_n "(cached) $ac_c" 1>&6
    27082740else
    27092741  cat > conftest.$ac_ext <<EOF
    2710 #line 2711 "configure"
     2742#line 2743 "configure"
    27112743#include "confdefs.h"
    27122744/* System header to define __stub macros and hopefully few prototypes,
     
    27312763; return 0; }
    27322764EOF
    2733 if { (eval echo configure:2734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2765if { (eval echo configure:2766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    27342766  rm -rf conftest*
    27352767  eval "ac_cv_func__doprnt=yes"
     
    27582790do
    27592791echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    2760 echo "configure:2761: checking for $ac_func" >&5
     2792echo "configure:2793: checking for $ac_func" >&5
    27612793if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    27622794  echo $ac_n "(cached) $ac_c" 1>&6
    27632795else
    27642796  cat > conftest.$ac_ext <<EOF
    2765 #line 2766 "configure"
     2797#line 2798 "configure"
    27662798#include "confdefs.h"
    27672799/* System header to define __stub macros and hopefully few prototypes,
     
    27862818; return 0; }
    27872819EOF
    2788 if { (eval echo configure:2789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2820if { (eval echo configure:2821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    27892821  rm -rf conftest*
    27902822  eval "ac_cv_func_$ac_func=yes"
     
    28132845do
    28142846echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    2815 echo "configure:2816: checking for $ac_func" >&5
     2847echo "configure:2848: checking for $ac_func" >&5
    28162848if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    28172849  echo $ac_n "(cached) $ac_c" 1>&6
    28182850else
    28192851  cat > conftest.$ac_ext <<EOF
    2820 #line 2821 "configure"
     2852#line 2853 "configure"
    28212853#include "confdefs.h"
    28222854/* System header to define __stub macros and hopefully few prototypes,
     
    28412873; return 0; }
    28422874EOF
    2843 if { (eval echo configure:2844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2875if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    28442876  rm -rf conftest*
    28452877  eval "ac_cv_func_$ac_func=yes"
     
    28722904# ---------------------------------------------------------------------------
    28732905echo $ac_n "checking for HP-UX needing gmalloc""... $ac_c" 1>&6
    2874 echo "configure:2875: checking for HP-UX needing gmalloc" >&5
     2906echo "configure:2907: checking for HP-UX needing gmalloc" >&5
    28752907if test "`(uname -s) 2> /dev/null`" = 'HP-UX'; then
    28762908  echo "$ac_t""yes" 1>&6
     
    28852917do
    28862918echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    2887 echo "configure:2888: checking for $ac_func" >&5
     2919echo "configure:2920: checking for $ac_func" >&5
    28882920if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    28892921  echo $ac_n "(cached) $ac_c" 1>&6
    28902922else
    28912923  cat > conftest.$ac_ext <<EOF
    2892 #line 2893 "configure"
     2924#line 2925 "configure"
    28932925#include "confdefs.h"
    28942926/* System header to define __stub macros and hopefully few prototypes,
     
    29132945; return 0; }
    29142946EOF
    2915 if { (eval echo configure:2916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2947if { (eval echo configure:2948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    29162948  rm -rf conftest*
    29172949  eval "ac_cv_func_$ac_func=yes"
     
    29402972
    29412973echo $ac_n "checking if malloc debugging is wanted""... $ac_c" 1>&6
    2942 echo "configure:2943: checking if malloc debugging is wanted" >&5
     2974echo "configure:2975: checking if malloc debugging is wanted" >&5
    29432975# Check whether --with-dmalloc or --without-dmalloc was given.
    29442976if test "${with_dmalloc+set}" = set; then
     
    29612993
    29622994echo $ac_n "checking which of rx or regex is wanted""... $ac_c" 1>&6
    2963 echo "configure:2964: checking which of rx or regex is wanted" >&5
     2995echo "configure:2996: checking which of rx or regex is wanted" >&5
    29642996# Check whether --with-regex or --without-regex was given.
    29652997if test "${with_regex+set}" = set; then
     
    29793011  echo "$ac_t""rx" 1>&6
    29803012  echo $ac_n "checking for re_rx_search""... $ac_c" 1>&6
    2981 echo "configure:2982: checking for re_rx_search" >&5
     3013echo "configure:3014: checking for re_rx_search" >&5
    29823014if eval "test \"`echo '$''{'ac_cv_func_re_rx_search'+set}'`\" = set"; then
    29833015  echo $ac_n "(cached) $ac_c" 1>&6
    29843016else
    29853017  cat > conftest.$ac_ext <<EOF
    2986 #line 2987 "configure"
     3018#line 3019 "configure"
    29873019#include "confdefs.h"
    29883020/* System header to define __stub macros and hopefully few prototypes,
     
    30073039; return 0; }
    30083040EOF
    3009 if { (eval echo configure:3010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     3041if { (eval echo configure:3042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    30103042  rm -rf conftest*
    30113043  eval "ac_cv_func_re_rx_search=yes"
     
    30473079
    30483080echo $ac_n "checking "that the GDBM library is available"""... $ac_c" 1>&6
    3049 echo "configure:3050: checking "that the GDBM library is available"" >&5
     3081echo "configure:3082: checking "that the GDBM library is available"" >&5
    30503082cat > conftest.$ac_ext <<EOF
    3051 #line 3052 "configure"
     3083#line 3084 "configure"
    30523084#include "confdefs.h"
    30533085#include <gdbm.h>
     
    30573089; return 0; }
    30583090EOF
    3059 if { (eval echo configure:3060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     3091if { (eval echo configure:3092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    30603092  rm -rf conftest*
    30613093  success=yes
     
    30743106
    30753107echo $ac_n "checking "that Perl 5 is available"""... $ac_c" 1>&6
    3076 echo "configure:3077: checking "that Perl 5 is available"" >&5
     3108echo "configure:3109: checking "that Perl 5 is available"" >&5
    30773109success="no"
    30783110pl_path="$PATH"
     
    31043136success=no
    31053137echo $ac_n "checking "whether STL library has known faults"""... $ac_c" 1>&6
    3106 echo "configure:3107: checking "whether STL library has known faults"" >&5
     3138echo "configure:3139: checking "whether STL library has known faults"" >&5
    31073139
    31083140cat > conftest.$ac_ext <<EOF
    3109 #line 3110 "configure"
     3141#line 3142 "configure"
    31103142#include "confdefs.h"
    31113143#include <vector>
     
    31153147; return 0; }
    31163148EOF
    3117 if { (eval echo configure:3118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     3149if { (eval echo configure:3150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    31183150  rm -rf conftest*
    31193151  success=yes
     
    31263158if test $success = "no"; then
    31273159cat > conftest.$ac_ext <<EOF
    3128 #line 3129 "configure"
     3160#line 3161 "configure"
    31293161#include "confdefs.h"
    31303162#include <vector.h>
     
    31343166; return 0; }
    31353167EOF
    3136 if { (eval echo configure:3137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     3168if { (eval echo configure:3169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    31373169  rm -rf conftest*
    31383170  success="yes"
     
    31463178if test $success = "no"; then
    31473179cat > conftest.$ac_ext <<EOF
    3148 #line 3149 "configure"
     3180#line 3181 "configure"
    31493181#include "confdefs.h"
    31503182#include <ospace\\std\\vector>
     
    31543186; return 0; }
    31553187EOF
    3156 if { (eval echo configure:3157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     3188if { (eval echo configure:3189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    31573189  rm -rf conftest*
    31583190  success="yes"
     
    33393371s%@SET_MAKE@%$SET_MAKE%g
    33403372s%@RANLIB@%$RANLIB%g
     3373s%@MICO_VER@%$MICO_VER%g
    33413374s%@CPP@%$CPP%g
    33423375s%@U@%$U%g
  • trunk/gsdl/configure.in

    r2051 r2173  
    5656AC_PROG_RANLIB
    5757
     58
     59#moved CORBA MICO directory test to get version of MICO
     60if test $USE_CORBA = 1; then
     61
     62if test $MICO_DIR = default; then
     63#do something
     64MICO_INC="-I packages/mico/mico/include"
     65else
     66#build the micotest program
     67MICO_INC= ""
     68if test $MICO_DIR != yes; then
     69MICO_INC="-I $MICO_DIR"
     70fi
     71fi
     72
     73#get MICO_VER value
     74sh -c "$CC -c micotest.cpp -o micotest.o $MICO_INC 2>&1" > /dev/null
     75sh -c "$CC -o micotest micotest.o -lstdc++ 2>&1" > /dev/null
     76MICO_VER=`./micotest` || MICO_VER=0
     77sh -c "rm micotest"
     78sh -c "rm micotest.o"
     79
     80#do test of MICO_VER
     81if test MICO_VER != 0; then
     82AC_DEFINE(MICO_VER)
     83AC_SUBST(MICO_VER)
     84fi
     85#end USE_CORBA test
     86fi
    5887
    5988dnl Checks for typedefs, structures, and compiler characteristics.
  • trunk/gsdl/lib/Makefile.in

    r2126 r2173  
    3636MICO_DIR = @MICO_DIR@
    3737ifeq ($(MICO_DIR), default)
    38 MICO_INC = -I../packages/mico/include
     38MICO_INC = -I../packages/mico/mico/include
     39MICO_PATH = ../bin/linux/
    3940else
    4041ifeq ($(MICO_DIR), yes)
     
    4344MICO_INC = -I$(MICO_DIR)
    4445endif
     46MICO_PATH =
    4547endif
    46 MINCLUDES = -I/usr/include/g++-2/ -I/usr/lib/gcc-lib/i386-slackware-linux/egcs-2.91.66/include/ -I/usr/include -I.  -I../packages/mico/mico/include -I../packages/mg/lib $(MICO_INC) -I..
     48MINCLUDES = -I/usr/include/g++-2/ -I/usr/lib/gcc-lib/i386-slackware-linux/egcs-2.91.66/include/ -I/usr/include -I.  -I../packages/mg/lib $(MICO_INC) -I..
    4749RANLIB = @RANLIB@
    4850USE_CORBA = @USE_CORBA@
     
    5254
    5355ifneq ($(USE_CORBA), 0)
    54 MCOMPILE = mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
     56MCOMPILE = $(MICO_PATH)mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
    5557else
    5658MCOMPILE = $(COMPILE)
     
    7577  corbaconv_text_t.h corbatext_t.h
    7678CORBASOURCES = \
    77   corbaiface.mpp    corbatext_t.mpp  corbaconv_text_t.mpp
     79  corbaiface.mpp    corbatext_t.mpp  corbaconv_text_t.mpp corbaiface_skel.mpp
    7880CORBAOBJECTS = \
    7981  corbaiface.o      corbatext_t.o    corbaconv_text_t.o  corbaiface_skel.o
     
    114116
    115117clean:
    116     rm -f $(OBJECTS) gsdllib.a
     118    rm -f $(OBJECTS) gsdllib.a corbaiface_skel.mpp corbaiface.h corbaiface.mpp
    117119
    118120distclean: clean
  • trunk/gsdl/lib/corbaiface.idl

    r2113 r2173  
    208208  void      hasCollection(in corbatext_t corbaCollection, inout boolean has,
    209209               inout corbaComError error);
    210   boolean   ping(in corbatext_t collection, inout corbaComError error);
     210  void      ping(in corbatext_t collection, inout boolean wasSuccess, inout corbaComError error);
    211211  void      getDocument(in corbatext_t collection,
    212212            inout corbaDocRequest request, inout corbaDocResponse response,
  • trunk/gsdl/packages/Makefile.in

    r2129 r2173  
    3737
    3838USE_CORBA=@USE_CORBA@
     39MICO_DIR=@MICO_DIR@
    3940ifeq ($(USE_CORBA), 1)
     41ifeq ($(MICO_DIR), "default")
    4042CORBA=mico/mico
     43else
     44CORBA=
     45endif
    4146else
    4247CORBA=
     
    5055          (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
    5156        done
    52 ifeq ($(USE_CORBA), 1)
     57ifeq ($(CORBA), "mico/mico")
    5358    cd mico/mico; $(MAKE)  $(MDEFINES) install
    5459    mkdir -p ../bin/linux
  • trunk/gsdl/packages/configure

    r2169 r2173  
    3333        USE_CORBA=true
    3434        ;;
     35    --with-micodir=*)
     36        if test $1 = ""; then
     37          $1 = "default"
     38            fi
     39        MICO_DIR=$1
     40        ;;       
    3541    --bindir=*)
    3642        bindir=`echo $1 | sed s/--bindir=//`
     
    6066
    6167
    62   echo ""
    63   echo "Configuring MICO CORBA"
    64 if test x$USE_CORBA = xtrue ; then
    65   # configure the MICO CORBA ORB
    66   echo ""
     68if test -n "$USE_CORBA"; then
     69  if test $MICO_DIR = default; then
     70    # configure the MICO CORBA ORB
     71    echo ""
     72    echo "Configuring MICO CORBA"
     73    echo ""
    6774
    68   cd "$PACKAGES/mico"
    69   gzip -dc mico-2.3.5.tar.gz | tar -xf -
    70   cd mico
    71   ./configure $CACHE_FILE    --prefix=$PACKAGES/mico/  --disable-coss --disable-naming --disable-relship --disable-events --disable-streams --disable-property --disable-trader --disable-time --disable-debug --enable-optimize --enable-final --enable-speed-tune
    72   sed 's/tools//'  $PACKAGES/mico/mico/Makefile | sed 's/ldconfig//' >$PACKAGES/mico/mico/Makefile.out
    73   mv $PACKAGES/mico/mico/Makefile.out $PACKAGES/mico/mico/Makefile
     75    cd "$PACKAGES/mico"
     76    gzip -dc mico-2.3.5.tar.gz | tar -xf -
     77    cd mico
     78    ./configure $CACHE_FILE    --prefix=$PACKAGES/mico/  --disable-coss --disable-naming --disable-relship --disable-events --disable-streams --disable-property --disable-trader --disable-time --disable-debug --enable-optimize --enable-final --enable-speed-tune
     79    sed 's/tools//'  $PACKAGES/mico/mico/Makefile | sed 's/ldconfig//' >$PACKAGES/mico/mico/Makefile.out
     80    mv $PACKAGES/mico/mico/Makefile.out $PACKAGES/mico/mico/Makefile
     81  else
     82    #MICO is on the system path
     83    echo ""
     84    echo "Taking MICO from system paths"
     85    echo ""
     86  fi
    7487else
    7588  echo "corba support disabled - mico compiler not required."
  • trunk/gsdl/src/colservr/Makefile.in

    r2170 r2173  
    7272ifeq ($(MICO_DIR), default)
    7373MICO_INC = -I../../packages/mico/include
     74MICO_PATH = ../../bin/linux/
    7475else
    7576ifeq ($(MICO_DIR), yes)
    7677MICO_INC =
     78MICO_PATH =
    7779else
    7880MICO_INC = -I$(MICO_DIR)
     81MICO_PATH =
    7982endif
    8083endif
     
    9699CPPLINK = $(CPP) $(LDFLAGS) -o $@
    97100
    98 MCOMPILE = ../../bin/linux/mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
    99 MLINK = ../../bin/linux/mico-ld $(LDFLAGS) -lmico2.2.7 -o $@
     101MCOMPILE = $(MICO_PATH)mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
     102MLINK = $(MICO_PATH)mico-ld $(LDFLAGS) -lmico2.2.7 -o $@
    100103
    101104.SUFFIXES:
  • trunk/gsdl/src/colservr/collectserver.cpp

    r1860 r2173  
    126126}
    127127
     128void collectserver::ping (bool &wasSuccess, comerror_t &error, ostream &logout) {
     129  // if we've not been properly configured, then it is a foregone
     130  // conclusion that we cannot be active
     131  if (this->configinfo.collection == "null")
     132    {
     133      wasSuccess = false;
     134    }
     135  // if no build date exists, then the collection was probably not built;
     136  // ditto if the number of documents is zero, then something is pretty
     137  // wrong
     138  else if (this->collectinfo.buildDate == 0 ||
     139      this->collectinfo.numDocs == 0)
     140    {
     141      wasSuccess =  false;
     142    }
     143  // it is probably okay
     144  else
     145    wasSuccess = true;
     146}
     147
    128148
    129149bool collectserver::init (ostream &logout) {
  • trunk/gsdl/src/colservr/collectserver.h

    r1860 r2173  
    9898  text_t get_collection_name () {return configinfo.collection;}
    9999
     100  // ping indicates whether the collection has appropriate data structures
     101  // to be active or not
     102  void ping(bool &wasSuccess, comerror_t &err, ostream &logout);
     103
    100104  // init should be called after the collection name has been set and
    101105  // all initialisation is done. init returns true if the initialisation
  • trunk/gsdl/src/colservr/corbaServer.mpp

    r2126 r2173  
    187187  }
    188188
    189   CORBA::Boolean ping(const struct corbatext_t &corbaCollect, corbaComError &corbaError)
     189  void ping(const struct corbatext_t &corbaCollect, CORBA::Boolean &wasSuccess, corbaComError &corbaError)
    190190  {
    191191    text_t collection;
     
    200200
    201201    corbaError = (corbaComError) error;
    202     logout.close();
    203 
    204     return success;
     202    wasSuccess = (CORBA::Boolean) success;
     203    logout.close();
    205204  }
    206205
  • trunk/gsdl/src/recpt/Makefile.in

    r2171 r2173  
    6565endif
    6666MICO_DIR = @MICO_DIR@
     67MICO_VER = @MICO_VER@
    6768ifeq ($(MICO_DIR), yes)
    6869MICO_INC =
    6970MICO_LIB =
     71MICO_PATH =
    7072else
    7173ifeq ($(MICO_DIR), default)
    7274MICO_DIR = ../../packages/mico/include
     75MICO_PATH = ../../bin/linux/
    7376endif
    7477MICO_INC = -I$(MICO_DIR)
    7578MICO_LIB = -L$(MICO_DIR)
     79MICO_PATH =
    7680endif
    7781MINCLUDES = -I. -I../../lib -I../colservr $(MICO_INC)
     
    8993CPPLINK = $(CPP) $(LDFLAGS) -o $@
    9094
    91 MCOMPILE = ../../bin/linux/mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
    92 MLINK = ../../bin/linux/mico-ld -static $(LDFLAGS) $(MICO_LIB) -o  $@
    93 MLIBS = $(LIBS) -L../../lib/ -lmico2.3.5 -lmicoaux2.3.5         
     95MCOMPILE = $(MICO_PATH)mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
     96MLINK = $(MICO_PATH)mico-ld -static $(LDFLAGS) $(MICO_LIB) -o  $@
     97MLIBS = $(LIBS) -L../../lib/ -lmico$(MICO_VER) -lmicoaux$(MICO_VER)
    9498
    9599.SUFFIXES:
  • trunk/gsdl/src/recpt/corbaproto.mpp

    r2122 r2173  
    389389
    390390  // execute the corba transaction
    391   lclient->configure(corbaKey, corbaCfgline, error); 
    392 
    393  
     391  lclient->configure(corbaKey, corbaCfgline, error);   
    394392
    395393  if (key=="gsdlhome")
     
    541539void corbaproto::ping (const text_t &collection, bool &wassuccess,
    542540              comerror_t &err, ostream &/*logout*/) {
    543   //  cout << "Corbaproto::Ping" << endl;
     541  // cout << "Corbaproto::Ping" << endl;
    544542
    545543  corbatext_t corbaCollect;
    546544  corbaComError corbaError;
    547   bool success;
     545  CORBA::Boolean success;
    548546
    549547  // get the corba client reference
     
    555553
    556554  // execute the corba transaction
    557   success = lclient->ping(corbaCollect, corbaError);
     555  lclient->ping(corbaCollect, success, corbaError);
    558556 
    559557  // convert the response back to normal form
  • trunk/gsdl/src/recpt/nullproto.cpp

    r2113 r2173  
    105105
    106106void nullproto::ping (const text_t &collection, bool &wassuccess,
    107               comerror_t &err, ostream &/*logout*/) {
    108   wassuccess = (cset->getCollectServer(collection) != NULL);
    109   err = noError;
     107              comerror_t &err, ostream &logout) {
     108  collectserver *cserver = cset->getCollectServer(collection);
     109  if (cserver != NULL) cserver->ping(wassuccess, err, logout);
     110  else err = protocolError;
    110111}
    111112
Note: See TracChangeset for help on using the changeset viewer.