[Sumover-dev] [svn commit] r4418 - rat/trunk
sumover-dev at cs.ucl.ac.uk
sumover-dev at cs.ucl.ac.uk
Mon Apr 13 06:12:33 BST 2009
Author: douglask
Date: Mon Apr 13 06:12:29 2009
New Revision: 4418
Modified:
rat/trunk/configure
Log:
Checked in configure with an older subversion which wasn't complaining about inconsitent line endings.
Modified: rat/trunk/configure
==============================================================================
--- rat/trunk/configure (original)
+++ rat/trunk/configure Mon Apr 13 06:12:29 2009
@@ -671,6 +671,9 @@
OBJEXT
CPP
RANLIB
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
GREP
EGREP
VERSION
@@ -3150,6 +3153,86 @@
RANLIB="$ac_cv_prog_RANLIB"
fi
+# Find a good install program. We prefer a C program (faster),
+# so one script is as good as another. But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+ ./ | .// | /cC/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
+ done
+ done
+ ;;
+esac
+done
+IFS=$as_save_IFS
+
+
+fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ INSTALL=$ac_install_sh
+ fi
+fi
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
@@ -7122,7 +7205,7 @@
FOUND_COMMON_H=no
-for h in ${COMMON_INC} ${COMMON_INC}/include ${COMMON_INC}/include/common-mml
+for h in ${COMMON_INC} ${COMMON_INC}/include ${COMMON_INC}/include/common-mml ${COMMON_INC}/include/uclmmbase /usr/include/uclmmbase
do
as_ac_Header=`echo "ac_cv_header_$h/mbus.h" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -7361,13 +7444,18 @@
# Convert paths into compiler arguments
-COMMON_INC="-I${COMMON_INC}"
+if test "${COMMON_INC}" = "/usr/include/uclmmbase"
+then
+ COMMON_LIB="-luclmmbase"
+else
+ COMMON_LIB="-L${COMMON_LIB} -luclmmbase"
+ EXTERNAL_DEP="${EXTERNAL_DEP} ${COMMON_DEP}"
+fi
+COMMON_INC="-I${COMMON_INC}"
-COMMON_LIB="-L${COMMON_LIB} -luclmmbase"
-EXTERNAL_DEP="${EXTERNAL_DEP} ${COMMON_DEP}"
# GSM flag checks
@@ -8071,6 +8159,7 @@
ac_pwd='$ac_pwd'
srcdir='$srcdir'
+INSTALL='$INSTALL'
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -8289,6 +8378,9 @@
OBJEXT!$OBJEXT$ac_delim
CPP!$CPP$ac_delim
RANLIB!$RANLIB$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
VERSION!$VERSION$ac_delim
@@ -8325,9 +8417,6 @@
COMMON_INC!$COMMON_INC$ac_delim
COMMON_LIB!$COMMON_LIB$ac_delim
EXTERNAL_DEP!$EXTERNAL_DEP$ac_delim
-G728_INC!$G728_INC$ac_delim
-G728_LIB!$G728_LIB$ac_delim
-G728_CODEC_OBJ!$G728_CODEC_OBJ$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -8369,11 +8458,14 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+G728_INC!$G728_INC$ac_delim
+G728_LIB!$G728_LIB$ac_delim
+G728_CODEC_OBJ!$G728_CODEC_OBJ$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -8596,6 +8688,10 @@
# CONFIG_FILE
#
+ case $INSTALL in
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+ esac
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -8648,6 +8744,7 @@
s&@builddir@&$ac_builddir&;t t
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
More information about the Sumover-dev
mailing list