Changeset 3017

Show
Ignore:
Timestamp:
12/14/99 17:12:16 (15 years ago)
Author:
ucacoxh
Message:

- config.h -> ratconf.h
- changed configure.in to test for lib uclmmbase rather than lib common.

Location:
rat/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • rat/trunk/config_unix.h

    r3007 r3017  
    2121/* in it.                                                                   */ 
    2222 
    23 #include "config.h" 
     23#include "ratconf.h" 
    2424 
    2525#include <stdlib.h> 
  • rat/trunk/configure

    r3009 r3017  
    36873687fi 
    36883688 
    3689 echo $ac_n "checking for mbus_init in -lcommon""... $ac_c" 1>&6 
    3690 echo "configure:3691: checking for mbus_init in -lcommon" >&5 
    3691 ac_lib_var=`echo common'_'mbus_init | sed 'y%./+-%__p_%'` 
     3689echo $ac_n "checking for mbus_init in -luclmmbase""... $ac_c" 1>&6 
     3690echo "configure:3691: checking for mbus_init in -luclmmbase" >&5 
     3691ac_lib_var=`echo uclmmbase'_'mbus_init | sed 'y%./+-%__p_%'` 
    36923692if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 
    36933693  echo $ac_n "(cached) $ac_c" 1>&6 
    36943694else 
    36953695  ac_save_LIBS="$LIBS" 
    3696 LIBS="-lcommon -L${COMMON_LIB} $LIBS" 
     3696LIBS="-luclmmbase -L${COMMON_LIB} $LIBS" 
    36973697cat > conftest.$ac_ext <<EOF 
    36983698#line 3699 "configure" 
     
    37233723  echo "$ac_t""yes" 1>&6 
    37243724   
    3725                 EXTERNAL_DEP="${EXTERNAL_DEP} ${COMMON_LIB}/libcommon.a" 
    3726                 COMMON_LIB="-L${COMMON_LIB} -lcommon" 
     3725                EXTERNAL_DEP="${EXTERNAL_DEP} ${COMMON_LIB}/libuclmmbase.a" 
     3726                COMMON_LIB="-L${COMMON_LIB} -luclmmbase" 
    37273727         
    37283728else 
     
    39543954ac_given_srcdir=$srcdir 
    39553955 
    3956 trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 
     3956trap 'rm -fr `echo "Makefile ratconf.h:config.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 
    39573957EOF 
    39583958cat >> $CONFIG_STATUS <<EOF 
     
    41394139EOF 
    41404140cat >> $CONFIG_STATUS <<EOF 
    4141   CONFIG_HEADERS="config.h" 
     4141  CONFIG_HEADERS="ratconf.h:config.h.in" 
    41424142EOF 
    41434143cat >> $CONFIG_STATUS <<\EOF 
  • rat/trunk/configure.in

    r3009 r3017  
    404404 
    405405#----------------------------------------------------------------------------- 
    406 # Check for UCL common library 
     406# Check for UCL Multimedia Base (formerly common) library 
    407407#----------------------------------------------------------------------------- 
    408408COMMON_INC=${PARENT}/common 
     
    440440fi 
    441441 
    442 AC_CHECK_LIB(common, 
     442AC_CHECK_LIB(uclmmbase, 
    443443        mbus_init, 
    444444        [ 
    445                 EXTERNAL_DEP="${EXTERNAL_DEP} ${COMMON_LIB}/libcommon.a" 
    446                 COMMON_LIB="-L${COMMON_LIB} -lcommon" 
     445                EXTERNAL_DEP="${EXTERNAL_DEP} ${COMMON_LIB}/libuclmmbase.a" 
     446                COMMON_LIB="-L${COMMON_LIB} -luclmmbase" 
    447447        ], 
    448448        [ 
    449                 echo "Could not find UCL Common library.  One of the following halted progess:" 
    450                 echo "   (a) Common Library is not installed." 
     449                echo "Could not find libuclmmbase.a.  One of the following halted progess:" 
     450                echo "   (a) Library is not installed." 
    451451                echo "   (b) Library is not built or not in expected location (--with-common=DIR)." 
    452452                echo "   (c) this script failed to see it (please inform rat-trap@cs.ucl.ac.uk)." 
     
    518518        fi]) 
    519519 
    520 AC_CONFIG_HEADER(config.h) 
     520AC_CONFIG_HEADER(ratconf.h:config.h.in) 
    521521 
    522522AC_OUTPUT(Makefile)