Changeset 2173 for trunk/gsdl/packages/configure

Timestamp:

2001-03-14T04:15:23+13:00 (23 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.

File:

• trunk/gsdl/packages/configure (modified) (2 diffs)

trunk/gsdl/packages/configure

@@ -33 +33 @@
         USE_CORBA=true
         ;;
+    --with-micodir=*)
+        if test $1 = ""; then
+          $1 = "default"
+            fi
+        MICO_DIR=$1
+        ;;       
     --bindir=*)
         bindir=`echo $1 | sed s/--bindir=//`
@@ -60 +66 @@
 
 
-  echo ""
-  echo "Configuring MICO CORBA"
-if test x$USE_CORBA = xtrue ; then
-  # configure the MICO CORBA ORB
-  echo ""
+if test -n "$USE_CORBA"; then
+  if test $MICO_DIR = default; then
+    # configure the MICO CORBA ORB
+    echo ""
+    echo "Configuring MICO CORBA"
+    echo ""
 
-  cd "$PACKAGES/mico"
-  gzip -dc mico-2.3.5.tar.gz | tar -xf -
-  cd mico
-  ./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
-  sed 's/tools//'  $PACKAGES/mico/mico/Makefile | sed 's/ldconfig//' >$PACKAGES/mico/mico/Makefile.out
-  mv $PACKAGES/mico/mico/Makefile.out $PACKAGES/mico/mico/Makefile
+    cd "$PACKAGES/mico"
+    gzip -dc mico-2.3.5.tar.gz | tar -xf -
+    cd mico
+    ./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
+    sed 's/tools//'  $PACKAGES/mico/mico/Makefile | sed 's/ldconfig//' >$PACKAGES/mico/mico/Makefile.out
+    mv $PACKAGES/mico/mico/Makefile.out $PACKAGES/mico/mico/Makefile
+  else
+    #MICO is on the system path
+    echo ""
+    echo "Taking MICO from system paths"
+    echo ""
+  fi
 else
   echo "corba support disabled - mico compiler not required."