Date: Sat, 21 Jun 2003 13:10:20 -0700 (PDT) From: "The Anarcat" <anarcat@anarcat.ath.cx> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/50858: compile of ecasound-2.2.2 fails with undeclared functions Message-ID: <200306212010.h5LKAKET095259@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/50858; it has been noted by GNATS. From: "The Anarcat" <anarcat@anarcat.ath.cx> To: freebsd-gnats-submit@FreeBSD.org Cc: jimd@siu.edu, kris@obsecurity.org Subject: Re: ports/50858: compile of ecasound-2.2.2 fails with undeclared functions Date: Sat, 21 Jun 2003 16:05:03 -0400 --/04w6evG8XlLl3ft Content-Type: text/plain; charset=us-ascii Content-Disposition: inline [Kris, I cc this to you so you don't kill ecasound yet.. :) ] Yet another attempt at trying to fix this... Sorry again for the delay.. This does a few things: 1- upgrade to 2.2.3 (again) 2- import patches to disable python dependencies (while ecasound should technically use python, it can live without it and I'd rather cut down on dependencies while fixing the port) 3- fix the build errors and use the readline code packaged with ecasound so we don't get out of sync I hope this is the last one of those attempts :( Please note the removed and added (attached) files. diff -ur ./Makefile /usr/ecasound.private/Makefile --- ./Makefile Tue May 6 03:02:47 2003 +++ /usr/ecasound.private/Makefile Sat Jun 21 15:14:05 2003 @@ -6,21 +6,18 @@ # PORTNAME= ecasound -PORTVERSION= 2.2.2 +PORTVERSION= 2.2.3 CATEGORIES= audio MASTER_SITES= http://ecasound.seul.org/download/ MAINTAINER= anarcat@anarcat.ath.cx COMMENT= Multitrack audio processing software -BROKEN= "Does not compile" - USE_GMAKE= yes USE_AUTOMAKE_VER=14 USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS+= --enable-sys-readline MAKE_ENV+= ${CONFIGURE_ENV} .if defined(WITH_MPG123) diff -ur ./distinfo /usr/ecasound.private/distinfo --- ./distinfo Sat Apr 5 19:04:59 2003 +++ /usr/ecasound.private/distinfo Sat Jun 21 15:14:20 2003 @@ -1 +1 @@ -MD5 (ecasound-2.2.2.tar.gz) = f40a2ea2cabf8b0cbd3663d522f74918 +MD5 (ecasound-2.2.3.tar.gz) = 40a3f0213c30b18e1b4e7879faa6b454 Only in /usr/ecasound.private/files: patch-configure Only in /usr/ecasound.private/files: patch-configure.in Only in ./files: patch-ecasound::eca-curses.cpp Only in /usr/ecasound.private/files: patch-pyecasound::Makefile.am thanks for your patience everyone A. -- Advertisers, not governments, are the primary censors of media content in the United States today. - C. Edwin Baker http://www.ad-mad.co.uk/quotes/freespeech.htm --/04w6evG8XlLl3ft Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-configure --- configure.orig Sat Jun 21 15:14:56 2003 +++ configure Sat Jun 21 15:15:22 2003 @@ -30,7 +30,7 @@ ac_help="$ac_help --disable-libsamplerate Disable libsamplerate support (default = no)" ac_help="$ac_help - --enable-pyecasound Enable compilation of pyecasound (default = no)" + --enable-pyecasound Enable compilation of pyecasound (default = python)" ac_help="$ac_help --with-python-includes=DIR Python include files are in DIR" ac_help="$ac_help @@ -239,6 +239,7 @@ program_transform_name=s,x,x, silent= site= +sitefile= srcdir= target=NONE verbose= @@ -353,6 +354,7 @@ --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages + --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -523,6 +525,11 @@ -site=* | --site=* | --sit=*) site="$ac_optarg" ;; + -site-file | --site-file | --site-fil | --site-fi | --site-f) + ac_prev=sitefile ;; + -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) + sitefile="$ac_optarg" ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -688,12 +695,16 @@ srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +if test -z "$sitefile"; then + if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi fi +else + CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -769,7 +780,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:773: checking for a BSD compatible install" >&5 +echo "configure:784: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -822,7 +833,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:826: checking whether build environment is sane" >&5 +echo "configure:837: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -879,7 +890,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:883: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:894: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -908,7 +919,7 @@ PACKAGE=ecasound -VERSION=2.2.3 +VERSION=2.2.4 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -925,7 +936,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:929: checking for working aclocal" >&5 +echo "configure:940: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -938,7 +949,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:942: checking for working autoconf" >&5 +echo "configure:953: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -951,7 +962,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:955: checking for working automake" >&5 +echo "configure:966: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -964,7 +975,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:968: checking for working autoheader" >&5 +echo "configure:979: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -977,7 +988,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:981: checking for working makeinfo" >&5 +echo "configure:992: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -995,11 +1006,13 @@ -LIBECASOUND_VERSION=10 -LIBECASOUND_VERSION_AGE=1 +LIBECASOUND_VERSION=11 +LIBECASOUND_VERSION_AGE=2 LIBECASOUNDC_VERSION=1 -LIBKVUTILS_VERSION=5 -LIBKVUTILS_VERSION_AGE=1 +LIBECASOUNDC_VERSION_AGE=0 +LIBKVUTILS_VERSION=6 +LIBKVUTILS_VERSION_AGE=2 + @@ -1032,7 +1045,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1036: checking for $ac_word" >&5 +echo "configure:1049: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1062,7 +1075,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1066: checking for $ac_word" >&5 +echo "configure:1079: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1113,7 +1126,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1117: checking for $ac_word" >&5 +echo "configure:1130: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1145,7 +1158,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1149: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1162: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1156,12 +1169,12 @@ cat > conftest.$ac_ext << EOF -#line 1160 "configure" +#line 1173 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1187,12 +1200,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1191: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1204: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1196: checking whether we are using GNU C" >&5 +echo "configure:1209: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1201,7 +1214,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1220,7 +1233,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1224: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1237: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1256,7 +1269,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1260: checking for $ac_word" >&5 +echo "configure:1273: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1288,7 +1301,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1292: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1305: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1299,12 +1312,12 @@ cat > conftest.$ac_ext << EOF -#line 1303 "configure" +#line 1316 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1330,12 +1343,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1334: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1347: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1339: checking whether we are using GNU C++" >&5 +echo "configure:1352: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1344,7 +1357,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1363,7 +1376,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1367: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1380: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1394,59 +1407,8 @@ fi fi -for ac_declaration in \ - ''\ - '#include <stdlib.h>' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat > conftest.$ac_ext <<EOF -#line 1408 "configure" -#include "confdefs.h" -#include <stdlib.h> -$ac_declaration -int main() { -exit (42); -; return 0; } -EOF -if { (eval echo configure:1416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - continue -fi -rm -f conftest* - cat > conftest.$ac_ext <<EOF -#line 1426 "configure" -#include "confdefs.h" -$ac_declaration -int main() { -exit (42); -; return 0; } -EOF -if { (eval echo configure:1433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* -done -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1450: checking how to run the C preprocessor" >&5 +echo "configure:1412: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1461,13 +1423,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1465 "configure" +#line 1427 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1478,13 +1440,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1482 "configure" +#line 1444 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1495,13 +1457,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1499 "configure" +#line 1461 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1539,7 +1501,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1543: checking host system type" >&5 +echo "configure:1505: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1561,7 +1523,7 @@ EXTRAFLAGS="-D_REENTRANT" -EXTRAGCCFLAGS="$EXTRAFLAGS -ffast-math -fstrict-aliasing -funroll-loops" +EXTRAGCCFLAGS="$EXTRAFLAGS" if test x${GXX} = xyes; then CXXFLAGS="$CXXFLAGS $EXTRAFLAGS $EXTRAGCCFLAGS" fi @@ -1614,14 +1576,14 @@ echo $ac_n "checking for library containing pthread_create""... $ac_c" 1>&6 -echo "configure:1618: checking for library containing pthread_create" >&5 +echo "configure:1580: checking for library containing pthread_create" >&5 if eval "test \"`echo '$''{'ac_cv_search_pthread_create'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_pthread_create="no" cat > conftest.$ac_ext <<EOF -#line 1625 "configure" +#line 1587 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1632,7 +1594,7 @@ pthread_create() ; return 0; } EOF -if { (eval echo configure:1636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_pthread_create="none required" else @@ -1643,7 +1605,7 @@ test "$ac_cv_search_pthread_create" = "no" && for i in pthread c_r; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 1647 "configure" +#line 1609 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1654,7 +1616,7 @@ pthread_create() ; return 0; } EOF -if { (eval echo configure:1658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_pthread_create="-l$i" break @@ -1689,7 +1651,7 @@ echo $ac_n "checking whether to enable debugging""... $ac_c" 1>&6 -echo "configure:1693: checking whether to enable debugging" >&5 +echo "configure:1655: checking whether to enable debugging" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" @@ -1788,7 +1750,7 @@ echo $ac_n "checking whether to check design-by-contract assertions""... $ac_c" 1>&6 -echo "configure:1792: checking whether to check design-by-contract assertions" >&5 +echo "configure:1754: checking whether to check design-by-contract assertions" >&5 enable_dbc_d=yes # Check whether --enable-dbc or --disable-dbc was given. if test "${enable_dbc+set}" = set; then @@ -1825,7 +1787,7 @@ echo $ac_n "checking for largefile support (>2GB files)""... $ac_c" 1>&6 -echo "configure:1829: checking for largefile support (>2GB files)" >&5 +echo "configure:1791: checking for largefile support (>2GB files)" >&5 # Check whether --with-largefile or --without-largefile was given. if test "${with_largefile+set}" = set; then withval="$with_largefile" @@ -1853,7 +1815,7 @@ echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1857: checking how to run the C++ preprocessor" >&5 +echo "configure:1819: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1866,12 +1828,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext <<EOF -#line 1870 "configure" +#line 1832 "configure" #include "confdefs.h" #include <stdlib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1897,17 +1859,17 @@ ac_safe=`echo "sys/soundcard.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/soundcard.h""... $ac_c" 1>&6 -echo "configure:1901: checking for sys/soundcard.h" >&5 +echo "configure:1863: checking for sys/soundcard.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1906 "configure" +#line 1868 "configure" #include "confdefs.h" #include <sys/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2000,7 +1962,7 @@ # Extract the first word of "artsc-config", so it can be a program name with args. set dummy artsc-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2004: checking for $ac_word" >&5 +echo "configure:1966: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ARTSC_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2089,17 +2051,17 @@ ac_safe=`echo "samplerate.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for samplerate.h""... $ac_c" 1>&6 -echo "configure:2093: checking for samplerate.h" >&5 +echo "configure:2055: checking for samplerate.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2098 "configure" +#line 2060 "configure" #include "confdefs.h" #include <samplerate.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2176,7 +2138,7 @@ -compile_pyecasound=no +pyecasound_support=python # Check whether --enable-pyecasound or --disable-pyecasound was given. if test "${enable_pyecasound+set}" = set; then @@ -2184,17 +2146,23 @@ case "$enableval" in y | yes) - echo "$ac_t""yes" 1>&6 - compile_pyecasound=yes + pyecasound_support=c ;; - n | no) - echo "$ac_t""no" 1>&6 - compile_pyecasound=no + n | no | none) + pyecasound_support=none + ;; + + python) + pyecasound_support=python + ;; + + c) + pyecasound_support=c ;; *) - { echo "configure: error: Invalid parameter value for --enable-pyecasound: $enableval" 1>&2; exit 1; } + pyecasound_support=python ;; esac @@ -2205,7 +2173,7 @@ # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2209: checking for $ac_word" >&5 +echo "configure:2177: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHONPATH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2239,15 +2207,16 @@ fi if test x$PYTHONPATH = xnone; then - python_support=no + pyecasound_support=none + python_install_prefix="" else - python_support=yes + python_install_prefix=`python -c "import sys; print (sys.prefix)"` fi ECA_S_PYTHON_INCLUDES= echo $ac_n "checking for Python include files""... $ac_c" 1>&6 -echo "configure:2251: checking for Python include files" >&5 +echo "configure:2220: checking for Python include files" >&5 # Check whether --with-python-includes or --without-python-includes was given. if test "${with_python_includes+set}" = set; then @@ -2277,14 +2246,16 @@ if test "X$ECA_S_PYTHON_INCLUDES" = "X" then echo "configure: warning: Python.h not found" 1>&2 - compile_pyecasound=no + if test x${pyecasound_support} = xc; then + pyecasound_support=python + fi else echo "$ac_t""$ECA_S_PYTHON_INCLUDES" 1>&6 fi echo $ac_n "checking for Python libraries""... $ac_c" 1>&6 -echo "configure:2288: checking for Python libraries" >&5 +echo "configure:2259: checking for Python libraries" >&5 # Check whether --with-python-modules or --without-python-modules was given. if test "${with_python_modules+set}" = set; then withval="$with_python_modules" @@ -2294,13 +2265,34 @@ if test "X$with_python_modules" = "X" then - pymoddirs="/usr/local/lib /usr/lib" - pymoddirsmore=`python -c "import sys; print (sys.prefix + '/lib/python' + sys.version[:3])"` - pymoddirs="$pymoddirs $pymoddirsmore" + if test x${python_install_prefix} != x${ecaprefix} -a \ + x${ecaprefix} != x/usr -a \ + x${ecaprefix} != x/usr/local ; then + pyecasound_support=none + echo "$ac_t""none" 1>&6 + if test x$PYTHONPATH != xnone; then + python_prefix_tmp=`python -c "import sys; print (sys.prefix + '/lib/python' + sys.version[:3])"` + else + python_prefix_tmp="DIR" + fi + echo "configure: warning: + *** + *** Python modules won't be installed as the module install prefix does + *** not match ecasound's build prefix! To override, set python + *** module directory explicitly (for example + *** "--with-python-modules=${python_prefix_tmp}"). + *** + " 1>&2 + else + pymoddirs="/usr/local/lib /usr/lib" + pymoddirsmore=`python -c "import sys; print (sys.prefix + '/lib/python' + sys.version[:3])"` + pymoddirs="$pymoddirs $pymoddirsmore" + echo "$ac_t""$pymoddirs" 1>&6 + fi else pymoddirs=$with_python_modules + echo "$ac_t""$pymoddirs" 1>&6 fi -echo "$ac_t""$pymoddirs" 1>&6 # Check whether --enable-python-force-site-packages or --disable-python-force-site-packages was given. @@ -2351,21 +2343,21 @@ -if test x$compile_pyecasound = xyes; then - ECA_AM_COMPILE_PYECASOUND_TRUE= - ECA_AM_COMPILE_PYECASOUND_FALSE='#' +if test x$pyecasound_support = xc; then + ECA_AM_PYECASOUND_CEXT_TRUE= + ECA_AM_PYECASOUND_CEXT_FALSE='#' else - ECA_AM_COMPILE_PYECASOUND_TRUE='#' - ECA_AM_COMPILE_PYECASOUND_FALSE= + ECA_AM_PYECASOUND_CEXT_TRUE='#' + ECA_AM_PYECASOUND_CEXT_FALSE= fi -if test x$python_support = xyes; then - ECA_AM_HAVE_PYTHON_TRUE= - ECA_AM_HAVE_PYTHON_FALSE='#' +if test x$pyecasound_support != xnone; then + ECA_AM_PYECASOUND_INSTALL_TRUE= + ECA_AM_PYECASOUND_INSTALL_FALSE='#' else - ECA_AM_HAVE_PYTHON_TRUE='#' - ECA_AM_HAVE_PYTHON_FALSE= + ECA_AM_PYECASOUND_INSTALL_TRUE='#' + ECA_AM_PYECASOUND_INSTALL_FALSE= fi @@ -2376,7 +2368,7 @@ echo $ac_n "checking if C++ compiler supports namespaces""... $ac_c" 1>&6 -echo "configure:2380: checking if C++ compiler supports namespaces" >&5 +echo "configure:2372: checking if C++ compiler supports namespaces" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -2393,8 +2385,11 @@ else cat > conftest.$ac_ext <<EOF -#line 2397 "configure" +#line 2389 "configure" #include "confdefs.h" +#ifdef __cplusplus +extern "C" void exit(int); +#endif #include <string> #include <vector> @@ -2409,7 +2404,7 @@ } EOF -if { (eval echo configure:2413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes." 1>&6 @@ -2454,12 +2449,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:2458: checking for Cygwin environment" >&5 +echo "configure:2453: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2463 "configure" +#line 2458 "configure" #include "confdefs.h" int main() { @@ -2470,7 +2465,7 @@ return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:2474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -2487,19 +2482,19 @@ CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:2491: checking for mingw32 environment" >&5 +echo "configure:2486: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2496 "configure" +#line 2491 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:2503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -2585,7 +2580,7 @@ fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:2589: checking build system type" >&5 +echo "configure:2584: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -2614,7 +2609,7 @@ if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:2618: checking for ld used by GCC" >&5 +echo "configure:2613: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -2644,10 +2639,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:2648: checking for GNU ld" >&5 +echo "configure:2643: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:2651: checking for non-GNU ld" >&5 +echo "configure:2646: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2682,7 +2677,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:2686: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:2681: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2699,7 +2694,7 @@ echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:2703: checking for $LD option to reload object files" >&5 +echo "configure:2698: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2711,7 +2706,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:2715: checking for BSD-compatible nm" >&5 +echo "configure:2710: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2749,7 +2744,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2753: checking whether ln -s works" >&5 +echo "configure:2748: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2770,7 +2765,7 @@ fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2774: checking how to recognise dependant libraries" >&5 +echo "configure:2769: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2953,13 +2948,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2957: checking for object suffix" >&5 +echo "configure:2952: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2979,7 +2974,7 @@ echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:2983: checking for executable suffix" >&5 +echo "configure:2978: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2989,10 +2984,10 @@ rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:2993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:2988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.o | *.obj) ;; + *.c | *.C | *.o | *.obj | *.ilk | *.pdb) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -3020,7 +3015,7 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6 -echo "configure:3024: checking command to parse $NM output" >&5 +echo "configure:3019: checking command to parse $NM output" >&5 if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3100,10 +3095,10 @@ int main(){nm_test_var='a';nm_test_func();return(0);} EOF - if { (eval echo configure:3104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:3099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo configure:3107: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then + if { (eval echo configure:3102: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -3154,7 +3149,7 @@ save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo configure:3158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo configure:3153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then pipe_works=yes fi LIBS="$save_LIBS" @@ -3203,17 +3198,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3207: checking for $ac_hdr" >&5 +echo "configure:3202: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3212 "configure" +#line 3207 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3248,7 +3243,7 @@ file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:3252: checking for ${ac_tool_prefix}file" >&5 +echo "configure:3247: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3310,7 +3305,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:3314: checking for file" >&5 +echo "configure:3309: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3381,7 +3376,7 @@ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3385: checking for $ac_word" >&5 +echo "configure:3380: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3413,7 +3408,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3417: checking for $ac_word" >&5 +echo "configure:3412: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3448,7 +3443,7 @@ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3452: checking for $ac_word" >&5 +echo "configure:3447: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3480,7 +3475,7 @@ # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3484: checking for $ac_word" >&5 +echo "configure:3479: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3529,8 +3524,8 @@ case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3533 "configure"' > conftest.$ac_ext - if { (eval echo configure:3534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 3528 "configure"' > conftest.$ac_ext + if { (eval echo configure:3529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -3551,7 +3546,7 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:3555: checking whether the C compiler needs -belf" >&5 +echo "configure:3550: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3564,14 +3559,14 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 3568 "configure" +#line 3563 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:3575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -3691,7 +3686,7 @@ compiler="$2" echo $ac_n "checking for objdir""... $ac_c" 1>&6 -echo "configure:3695: checking for objdir" >&5 +echo "configure:3690: checking for objdir" >&5 rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then @@ -3718,7 +3713,7 @@ # in isolation, and that seeing it set (from the cache) indicates that # the associated values are set (in the cache) correctly too. echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 -echo "configure:3722: checking for $compiler option to produce PIC" >&5 +echo "configure:3717: checking for $compiler option to produce PIC" >&5 if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3870,21 +3865,21 @@ # Check to make sure the pic_flag actually works. echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6 -echo "configure:3874: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 +echo "configure:3869: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat > conftest.$ac_ext <<EOF -#line 3881 "configure" +#line 3876 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:3888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* case $host_os in hpux9* | hpux10* | hpux11*) @@ -3936,7 +3931,7 @@ fi echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6 -echo "configure:3940: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 +echo "configure:3935: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3944,14 +3939,14 @@ save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat > conftest.$ac_ext <<EOF -#line 3948 "configure" +#line 3943 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:3955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_prog_cc_static_works=yes else @@ -3978,7 +3973,7 @@ # Check to see if options -o and -c are simultaneously supported by compiler echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 -echo "configure:3982: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo "configure:3977: checking if $compiler supports -c -o file.$ac_objext" >&5 if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3997,7 +3992,7 @@ save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:4001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:3996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -4026,7 +4021,7 @@ if test x"$compiler_c_o" = x"yes"; then # Check to see if we can write to a .lo echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6 -echo "configure:4030: checking if $compiler supports -c -o file.lo" >&5 +echo "configure:4025: checking if $compiler supports -c -o file.lo" >&5 if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4037,14 +4032,14 @@ save_objext="$ac_objext" ac_objext=lo cat > conftest.$ac_ext <<EOF -#line 4041 "configure" +#line 4036 "configure" #include "confdefs.h" int main() { int some_variable = 0; ; return 0; } EOF -if { (eval echo configure:4048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -4075,7 +4070,7 @@ if test "$compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 -echo "configure:4079: checking if we can lock with hard links" >&5 +echo "configure:4074: checking if we can lock with hard links" >&5 hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no @@ -4094,20 +4089,20 @@ if test "$GCC" = yes; then # Check to see if options -fno-rtti -fno-exceptions are supported by compiler echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6 -echo "configure:4098: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo "configure:4093: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo "int some_variable = 0;" > conftest.$ac_ext save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" compiler_rtti_exceptions=no cat > conftest.$ac_ext <<EOF -#line 4104 "configure" +#line 4099 "configure" #include "confdefs.h" int main() { int some_variable = 0; ; return 0; } EOF -if { (eval echo configure:4111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -4134,7 +4129,7 @@ # See if the linker supports building shared libraries. echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6 -echo "configure:4138: checking whether the linker ($LD) supports shared libraries" >&5 +echo "configure:4133: checking whether the linker ($LD) supports shared libraries" >&5 allow_undefined_flag= no_undefined_flag= @@ -4818,7 +4813,7 @@ # Check hardcoding attributes. echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 -echo "configure:4822: checking how to hardcode library paths into programs" >&5 +echo "configure:4817: checking how to hardcode library paths into programs" >&5 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var"; then @@ -4846,7 +4841,7 @@ striplib= old_striplib= echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6 -echo "configure:4850: checking whether stripping libraries is possible" >&5 +echo "configure:4845: checking whether stripping libraries is possible" >&5 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" @@ -4860,7 +4855,7 @@ # PORTME Fill in your ld.so characteristics echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 -echo "configure:4864: checking dynamic linker characteristics" >&5 +echo "configure:4859: checking dynamic linker characteristics" >&5 library_names_spec= libname_spec='lib$name' soname_spec= @@ -5257,11 +5252,11 @@ # Report the final consequences. echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 -echo "configure:5261: checking if libtool supports shared libraries" >&5 +echo "configure:5256: checking if libtool supports shared libraries" >&5 echo "$ac_t""$can_build_shared" 1>&6 echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6 -echo "configure:5265: checking whether to build shared libraries" >&5 +echo "configure:5260: checking whether to build shared libraries" >&5 test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -5284,7 +5279,7 @@ echo "$ac_t""$enable_shared" 1>&6 echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 -echo "configure:5288: checking whether to build static libraries" >&5 +echo "configure:5283: checking whether to build static libraries" >&5 # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes echo "$ac_t""$enable_static" 1>&6 @@ -5325,12 +5320,12 @@ *) echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:5329: checking for shl_load" >&5 +echo "configure:5324: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5334 "configure" +#line 5329 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load(); below. */ @@ -5353,7 +5348,7 @@ ; return 0; } EOF -if { (eval echo configure:5357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -5371,7 +5366,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:5375: checking for shl_load in -ldld" >&5 +echo "configure:5370: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5379,7 +5374,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <<EOF -#line 5383 "configure" +#line 5378 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5390,7 +5385,7 @@ shl_load() ; return 0; } EOF -if { (eval echo configure:5394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5409,12 +5404,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:5413: checking for dlopen" >&5 +echo "configure:5408: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5418 "configure" +#line 5413 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen(); below. */ @@ -5437,7 +5432,7 @@ ; return 0; } EOF -if { (eval echo configure:5441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -5455,7 +5450,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:5459: checking for dlopen in -ldl" >&5 +echo "configure:5454: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5463,7 +5458,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 5467 "configure" +#line 5462 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5474,7 +5469,7 @@ dlopen() ; return 0; } EOF -if { (eval echo configure:5478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5493,7 +5488,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 -echo "configure:5497: checking for dlopen in -lsvld" >&5 +echo "configure:5492: checking for dlopen in -lsvld" >&5 ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5501,7 +5496,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsvld $LIBS" cat > conftest.$ac_ext <<EOF -#line 5505 "configure" +#line 5500 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5512,7 +5507,7 @@ dlopen() ; return 0; } EOF -if { (eval echo configure:5516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5531,7 +5526,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 -echo "configure:5535: checking for dld_link in -ldld" >&5 +echo "configure:5530: checking for dld_link in -ldld" >&5 ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5539,7 +5534,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <<EOF -#line 5543 "configure" +#line 5538 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5550,7 +5545,7 @@ dld_link() ; return 0; } EOF -if { (eval echo configure:5554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5606,7 +5601,7 @@ LIBS="$lt_cv_dlopen_libs $LIBS" echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 -echo "configure:5610: checking whether a program can dlopen itself" >&5 +echo "configure:5605: checking whether a program can dlopen itself" >&5 if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5616,7 +5611,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 5620 "configure" +#line 5615 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -5677,7 +5672,7 @@ exit (status); } EOF - if { (eval echo configure:5681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + if { (eval echo configure:5676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in @@ -5700,7 +5695,7 @@ if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 -echo "configure:5704: checking whether a statically linked program can dlopen itself" >&5 +echo "configure:5699: checking whether a statically linked program can dlopen itself" >&5 if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5710,7 +5705,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 5714 "configure" +#line 5709 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -5771,7 +5766,7 @@ exit (status); } EOF - if { (eval echo configure:5775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + if { (eval echo configure:5770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in @@ -5820,14 +5815,14 @@ # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 -echo "configure:5824: checking whether -lc should be explicitly linked in" >&5 +echo "configure:5819: checking whether -lc should be explicitly linked in" >&5 if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else $rm conftest* echo 'static int dummy;' > conftest.$ac_ext - if { (eval echo configure:5831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:5826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then soname=conftest lib=conftest libobjs=conftest.$ac_objext @@ -5840,7 +5835,7 @@ libname=conftest save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo configure:5844: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } + if { (eval echo configure:5839: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } then lt_cv_archive_cmds_need_lc=no else @@ -6444,14 +6439,14 @@ echo $ac_n "checking for library containing inet_ntoa""... $ac_c" 1>&6 -echo "configure:6448: checking for library containing inet_ntoa" >&5 +echo "configure:6443: checking for library containing inet_ntoa" >&5 if eval "test \"`echo '$''{'ac_cv_search_inet_ntoa'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_inet_ntoa="no" cat > conftest.$ac_ext <<EOF -#line 6455 "configure" +#line 6450 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6462,7 +6457,7 @@ inet_ntoa() ; return 0; } EOF -if { (eval echo configure:6466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_inet_ntoa="none required" else @@ -6473,7 +6468,7 @@ test "$ac_cv_search_inet_ntoa" = "no" && for i in socket nsl; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 6477 "configure" +#line 6472 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6484,7 +6479,7 @@ inet_ntoa() ; return 0; } EOF -if { (eval echo configure:6488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_inet_ntoa="-l$i" break @@ -6506,14 +6501,14 @@ fi echo $ac_n "checking for library containing nanosleep""... $ac_c" 1>&6 -echo "configure:6510: checking for library containing nanosleep" >&5 +echo "configure:6505: checking for library containing nanosleep" >&5 if eval "test \"`echo '$''{'ac_cv_search_nanosleep'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_nanosleep="no" cat > conftest.$ac_ext <<EOF -#line 6517 "configure" +#line 6512 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6524,7 +6519,7 @@ nanosleep() ; return 0; } EOF -if { (eval echo configure:6528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_nanosleep="none required" else @@ -6535,7 +6530,7 @@ test "$ac_cv_search_nanosleep" = "no" && for i in rt posix4; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 6539 "configure" +#line 6534 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6546,7 +6541,7 @@ nanosleep() ; return 0; } EOF -if { (eval echo configure:6550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_nanosleep="-l$i" break @@ -6568,14 +6563,14 @@ fi echo $ac_n "checking for library containing sched_setscheduler""... $ac_c" 1>&6 -echo "configure:6572: checking for library containing sched_setscheduler" >&5 +echo "configure:6567: checking for library containing sched_setscheduler" >&5 if eval "test \"`echo '$''{'ac_cv_search_sched_setscheduler'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_sched_setscheduler="no" cat > conftest.$ac_ext <<EOF -#line 6579 "configure" +#line 6574 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6586,7 +6581,7 @@ sched_setscheduler() ; return 0; } EOF -if { (eval echo configure:6590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_sched_setscheduler="none required" else @@ -6597,7 +6592,7 @@ test "$ac_cv_search_sched_setscheduler" = "no" && for i in rt posix4; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 6601 "configure" +#line 6596 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6608,7 +6603,7 @@ sched_setscheduler() ; return 0; } EOF -if { (eval echo configure:6612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_sched_setscheduler="-l$i" break @@ -6630,14 +6625,14 @@ fi echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 -echo "configure:6634: checking for library containing socket" >&5 +echo "configure:6629: checking for library containing socket" >&5 if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_socket="no" cat > conftest.$ac_ext <<EOF -#line 6641 "configure" +#line 6636 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6648,7 +6643,7 @@ socket() ; return 0; } EOF -if { (eval echo configure:6652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_socket="none required" else @@ -6659,7 +6654,7 @@ test "$ac_cv_search_socket" = "no" && for i in socket nsl; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 6663 "configure" +#line 6658 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6670,7 +6665,7 @@ socket() ; return 0; } EOF -if { (eval echo configure:6674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_socket="-l$i" break @@ -6692,14 +6687,14 @@ fi echo $ac_n "checking for library containing sin""... $ac_c" 1>&6 -echo "configure:6696: checking for library containing sin" >&5 +echo "configure:6691: checking for library containing sin" >&5 if eval "test \"`echo '$''{'ac_cv_search_sin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_sin="no" cat > conftest.$ac_ext <<EOF -#line 6703 "configure" +#line 6698 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6710,7 +6705,7 @@ sin() ; return 0; } EOF -if { (eval echo configure:6714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_sin="none required" else @@ -6721,7 +6716,7 @@ test "$ac_cv_search_sin" = "no" && for i in m; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 6725 "configure" +#line 6720 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6732,7 +6727,7 @@ sin() ; return 0; } EOF -if { (eval echo configure:6736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_sin="-l$i" break @@ -6754,14 +6749,14 @@ fi echo $ac_n "checking for library containing dlopen""... $ac_c" 1>&6 -echo "configure:6758: checking for library containing dlopen" >&5 +echo "configure:6753: checking for library containing dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_search_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_dlopen="no" cat > conftest.$ac_ext <<EOF -#line 6765 "configure" +#line 6760 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6772,7 +6767,7 @@ dlopen() ; return 0; } EOF -if { (eval echo configure:6776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_dlopen="none required" else @@ -6783,7 +6778,7 @@ test "$ac_cv_search_dlopen" = "no" && for i in dl; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 6787 "configure" +#line 6782 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6794,7 +6789,7 @@ dlopen() ; return 0; } EOF -if { (eval echo configure:6798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_dlopen="-l$i" break @@ -6833,7 +6828,7 @@ echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6 -echo "configure:6837: checking for main in -lncurses" >&5 +echo "configure:6832: checking for main in -lncurses" >&5 ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6841,14 +6836,14 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 6845 "configure" +#line 6840 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6867,7 +6862,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6 -echo "configure:6871: checking for main in -ltermcap" >&5 +echo "configure:6866: checking for main in -ltermcap" >&5 ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6875,14 +6870,14 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 6879 "configure" +#line 6874 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6912,12 +6907,12 @@ case "$enableval" in y | yes) echo "$ac_t""yes" 1>&6 - termcap_library=yes + termcap_library=ncurses ;; n | no) echo "$ac_t""no" 1>&6 - termcap_library=no + termcap_library=none ;; *) @@ -6948,17 +6943,17 @@ if test x$termcap_library = xtermcap; then ac_safe=`echo "curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for curses.h""... $ac_c" 1>&6 -echo "configure:6952: checking for curses.h" >&5 +echo "configure:6947: checking for curses.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6957 "configure" +#line 6952 "configure" #include "confdefs.h" #include <curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6987,17 +6982,17 @@ if test x$termcap_library = xncurses; then ac_safe=`echo "ncurses/ncurses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/ncurses.h""... $ac_c" 1>&6 -echo "configure:6991: checking for ncurses/ncurses.h" >&5 +echo "configure:6986: checking for ncurses/ncurses.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6996 "configure" +#line 6991 "configure" #include "confdefs.h" #include <ncurses/ncurses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7022,17 +7017,17 @@ ac_safe=`echo "ncurses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses.h""... $ac_c" 1>&6 -echo "configure:7026: checking for ncurses.h" >&5 +echo "configure:7021: checking for ncurses.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7031 "configure" +#line 7026 "configure" #include "confdefs.h" #include <ncurses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7072,7 +7067,7 @@ echo $ac_n "checking for main in -laudiofile""... $ac_c" 1>&6 -echo "configure:7076: checking for main in -laudiofile" >&5 +echo "configure:7071: checking for main in -laudiofile" >&5 ac_lib_var=`echo audiofile'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7080,14 +7075,14 @@ ac_save_LIBS="$LIBS" LIBS="-laudiofile $LIBS" cat > conftest.$ac_ext <<EOF -#line 7084 "configure" +#line 7079 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7174,7 +7169,7 @@ if test x$alsa_support = x; then echo $ac_n "checking for snd_pcm_delay in -lasound""... $ac_c" 1>&6 -echo "configure:7178: checking for snd_pcm_delay in -lasound" >&5 +echo "configure:7173: checking for snd_pcm_delay in -lasound" >&5 ac_lib_var=`echo asound'_'snd_pcm_delay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7182,7 +7177,7 @@ ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <<EOF -#line 7186 "configure" +#line 7181 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -7196,7 +7191,7 @@ snd_pcm_delay() ; return 0; } EOF -if { (eval echo configure:7200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7215,7 +7210,7 @@ else echo "$ac_t""no" 1>&6 alsa_support=no echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6 -echo "configure:7219: checking for main in -lasound" >&5 +echo "configure:7214: checking for main in -lasound" >&5 ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7223,14 +7218,14 @@ ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <<EOF -#line 7227 "configure" +#line 7222 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7275,17 +7270,17 @@ ac_safe=`echo "jack/jack.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jack/jack.h""... $ac_c" 1>&6 -echo "configure:7279: checking for jack/jack.h" >&5 +echo "configure:7274: checking for jack/jack.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7284 "configure" +#line 7279 "configure" #include "confdefs.h" #include <jack/jack.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7355,7 +7350,7 @@ LDFLAGS="$LDFLAGS $ECA_S_JACK_LIBS" INCLUDES="--host=a.out-i386-linux" cat > conftest.$ac_ext <<EOF -#line 7359 "configure" +#line 7354 "configure" #include "confdefs.h" #include <jack/transport.h> int main() { @@ -7366,7 +7361,7 @@ ; return 0; } EOF -if { (eval echo configure:7370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ECA_JACK_TRANSPORT_API="2" else @@ -7393,7 +7388,7 @@ echo $ac_n "checking for main in -lkvutils""... $ac_c" 1>&6 -echo "configure:7397: checking for main in -lkvutils" >&5 +echo "configure:7392: checking for main in -lkvutils" >&5 ac_lib_var=`echo kvutils'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7401,14 +7396,14 @@ ac_save_LIBS="$LIBS" LIBS="-lkvutils $LIBS" cat > conftest.$ac_ext <<EOF -#line 7405 "configure" +#line 7400 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7442,7 +7437,7 @@ echo $ac_n "checking whether to build with system readline""... $ac_c" 1>&6 -echo "configure:7446: checking whether to build with system readline" >&5 +echo "configure:7441: checking whether to build with system readline" >&5 # Check whether --enable-sys_readline or --disable-sys_readline was given. if test "${enable_sys_readline+set}" = set; then enableval="$enable_sys_readline" @@ -7485,17 +7480,17 @@ if test x$enable_sysreadline = xyes; then ac_safe=`echo "readline.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for readline.h""... $ac_c" 1>&6 -echo "configure:7489: checking for readline.h" >&5 +echo "configure:7484: checking for readline.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7494 "configure" +#line 7489 "configure" #include "confdefs.h" #include <readline.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7516,17 +7511,17 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "readline/readline.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for readline/readline.h""... $ac_c" 1>&6 -echo "configure:7520: checking for readline/readline.h" >&5 +echo "configure:7515: checking for readline/readline.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7525 "configure" +#line 7520 "configure" #include "confdefs.h" #include <readline/readline.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7552,17 +7547,17 @@ ac_safe=`echo "history.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for history.h""... $ac_c" 1>&6 -echo "configure:7556: checking for history.h" >&5 +echo "configure:7551: checking for history.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7561 "configure" +#line 7556 "configure" #include "confdefs.h" #include <history.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7561: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7583,17 +7578,17 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "readline/history.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for readline/history.h""... $ac_c" 1>&6 -echo "configure:7587: checking for readline/history.h" >&5 +echo "configure:7582: checking for readline/history.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7592 "configure" +#line 7587 "configure" #include "confdefs.h" #include <readline/history.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7618,23 +7613,29 @@ fi + if test x${termcap_library} = xnone; then + readline_extra_libs=""; + else + readline_extra_libs="-l${termcap_library}" + fi + echo $ac_n "checking for main in -lreadline""... $ac_c" 1>&6 -echo "configure:7623: checking for main in -lreadline" >&5 +echo "configure:7624: checking for main in -lreadline" >&5 ac_lib_var=`echo readline'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lreadline $LIBS" +LIBS="-lreadline ${readline_extra_libs} $LIBS" cat > conftest.$ac_ext <<EOF -#line 7631 "configure" +#line 7632 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7649,36 +7650,29 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-lreadline $LIBS" - + readline_library="-lreadline" else echo "$ac_t""no" 1>&6 { echo "configure: error: *** readline support not installed ***" 1>&2; exit 1; } fi echo $ac_n "checking for main in -lhistory""... $ac_c" 1>&6 -echo "configure:7667: checking for main in -lhistory" >&5 +echo "configure:7661: checking for main in -lhistory" >&5 ac_lib_var=`echo history'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lhistory $LIBS" +LIBS="-lhistory ${readline_extra_libs} $LIBS" cat > conftest.$ac_ext <<EOF -#line 7675 "configure" +#line 7669 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7693,14 +7687,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo history | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-lhistory $LIBS" - + readline_library="${readline_library} -lhistory" else echo "$ac_t""no" 1>&6 { echo "configure: error: *** readline history support not installed ***" 1>&2; exit 1; } @@ -7719,12 +7706,12 @@ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:7723: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:7710: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7728 "configure" +#line 7715 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -7733,7 +7720,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:7737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -7757,17 +7744,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7761: checking for $ac_hdr" >&5 +echo "configure:7748: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7766 "configure" +#line 7753 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7798,17 +7785,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7802: checking for $ac_hdr" >&5 +echo "configure:7789: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7807 "configure" +#line 7794 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7837,12 +7824,12 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:7841: checking for ANSI C header files" >&5 +echo "configure:7828: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7846 "configure" +#line 7833 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -7850,7 +7837,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7867,7 +7854,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 7871 "configure" +#line 7858 "configure" #include "confdefs.h" #include <string.h> EOF @@ -7885,7 +7872,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 7889 "configure" +#line 7876 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -7906,7 +7893,7 @@ : else cat > conftest.$ac_ext <<EOF -#line 7910 "configure" +#line 7897 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -7917,7 +7904,7 @@ exit (0); } EOF -if { (eval echo configure:7921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -7949,17 +7936,17 @@ ac_safe=`echo "map" | sed 'y%./+-%__p_%'` echo $ac_n "checking for map""... $ac_c" 1>&6 -echo "configure:7953: checking for map" >&5 +echo "configure:7940: checking for map" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7958 "configure" +#line 7945 "configure" #include "confdefs.h" #include <map> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7999,14 +7986,14 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:8003: checking whether byte ordering is bigendian" >&5 +echo "configure:7990: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 8010 "configure" +#line 7997 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -8017,11 +8004,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:8021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 8025 "configure" +#line 8012 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -8032,7 +8019,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:8036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -8052,7 +8039,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 8056 "configure" +#line 8043 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -8065,7 +8052,7 @@ exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:8069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -8089,12 +8076,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:8093: checking for size_t" >&5 +echo "configure:8080: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8098 "configure" +#line 8085 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -8134,21 +8121,21 @@ echo "7. Section: Functions" echo "------------------------------------------------------------------" -for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h +for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8142: checking for $ac_hdr" >&5 +echo "configure:8129: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8147 "configure" +#line 8134 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8177,12 +8164,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8181: checking for $ac_func" >&5 +echo "configure:8168: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8186 "configure" +#line 8173 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8208,7 +8195,7 @@ ; return 0; } EOF -if { (eval echo configure:8212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8233,7 +8220,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:8237: checking for working mmap" >&5 +echo "configure:8224: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8241,8 +8228,11 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 8245 "configure" +#line 8232 "configure" #include "confdefs.h" +#ifdef __cplusplus +extern "C" void exit(int); +#endif /* Thanks to Mike Haertel and Jim Avera for this test. Here is a matrix of mmap possibilities: @@ -8269,24 +8259,11 @@ #include <fcntl.h> #include <sys/mman.h> -#if HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - -#if HAVE_STDLIB_H -# include <stdlib.h> -#endif - -#if HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif - -#if HAVE_UNISTD_H -# include <unistd.h> -#endif - /* This mess was copied from the GNU getpagesize.h. */ #ifndef HAVE_GETPAGESIZE +# ifdef HAVE_UNISTD_H +# include <unistd.h> +# endif /* Assume that all systems that can run configure have sys/param.h. */ # ifndef HAVE_SYS_PARAM_H @@ -8394,7 +8371,7 @@ } EOF -if { (eval echo configure:8398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -8419,12 +8396,12 @@ for ac_func in atexit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8423: checking for $ac_func" >&5 +echo "configure:8400: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8428 "configure" +#line 8405 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8450,7 +8427,7 @@ ; return 0; } EOF -if { (eval echo configure:8454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8477,12 +8454,12 @@ for ac_func in atoll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8481: checking for $ac_func" >&5 +echo "configure:8458: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8486 "configure" +#line 8463 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8508,7 +8485,7 @@ ; return 0; } EOF -if { (eval echo configure:8512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8535,12 +8512,12 @@ for ac_func in gettimeofday do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8539: checking for $ac_func" >&5 +echo "configure:8516: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8544 "configure" +#line 8521 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8566,7 +8543,7 @@ ; return 0; } EOF -if { (eval echo configure:8570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8593,12 +8570,12 @@ for ac_func in mlockall do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8597: checking for $ac_func" >&5 +echo "configure:8574: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8602 "configure" +#line 8579 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8624,7 +8601,7 @@ ; return 0; } EOF -if { (eval echo configure:8628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8651,12 +8628,12 @@ for ac_func in munlockall do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8655: checking for $ac_func" >&5 +echo "configure:8632: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8660 "configure" +#line 8637 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8682,7 +8659,7 @@ ; return 0; } EOF -if { (eval echo configure:8686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8709,12 +8686,12 @@ for ac_func in nanosleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8713: checking for $ac_func" >&5 +echo "configure:8690: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8718 "configure" +#line 8695 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8740,7 +8717,7 @@ ; return 0; } EOF -if { (eval echo configure:8744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8767,12 +8744,12 @@ for ac_func in pause do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8771: checking for $ac_func" >&5 +echo "configure:8748: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8776 "configure" +#line 8753 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8798,7 +8775,7 @@ ; return 0; } EOF -if { (eval echo configure:8802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8825,12 +8802,12 @@ for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8829: checking for $ac_func" >&5 +echo "configure:8806: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8834 "configure" +#line 8811 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8856,7 +8833,7 @@ ; return 0; } EOF -if { (eval echo configure:8860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8883,12 +8860,12 @@ for ac_func in sched_get_priority_max do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8887: checking for $ac_func" >&5 +echo "configure:8864: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8892 "configure" +#line 8869 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8914,7 +8891,7 @@ ; return 0; } EOF -if { (eval echo configure:8918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8941,12 +8918,12 @@ for ac_func in sched_getparam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8945: checking for $ac_func" >&5 +echo "configure:8922: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8950 "configure" +#line 8927 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8972,7 +8949,7 @@ ; return 0; } EOF -if { (eval echo configure:8976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8999,12 +8976,12 @@ for ac_func in sched_getscheduler do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9003: checking for $ac_func" >&5 +echo "configure:8980: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9008 "configure" +#line 8985 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9030,7 +9007,7 @@ ; return 0; } EOF -if { (eval echo configure:9034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9057,12 +9034,12 @@ for ac_func in sched_setscheduler do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9061: checking for $ac_func" >&5 +echo "configure:9038: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9066 "configure" +#line 9043 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9088,7 +9065,181 @@ ; return 0; } EOF -if { (eval echo configure:9092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <<EOF +#define $ac_tr_func 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi +done + +for ac_func in pthread_self +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:9096: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 9101 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:9127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <<EOF +#define $ac_tr_func 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi +done + +for ac_func in pthread_getschedparam +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:9154: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 9159 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:9185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <<EOF +#define $ac_tr_func 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi +done + +for ac_func in pthread_setschedparam +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:9212: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 9217 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:9243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9115,12 +9266,12 @@ for ac_func in sigprocmask do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9119: checking for $ac_func" >&5 +echo "configure:9270: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9124 "configure" +#line 9275 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9146,7 +9297,7 @@ ; return 0; } EOF -if { (eval echo configure:9150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9173,12 +9324,12 @@ for ac_func in sigwait do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9177: checking for $ac_func" >&5 +echo "configure:9328: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9182 "configure" +#line 9333 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9204,7 +9355,7 @@ ; return 0; } EOF -if { (eval echo configure:9208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9441,6 +9592,7 @@ s%@LIBECASOUND_VERSION@%$LIBECASOUND_VERSION%g s%@LIBECASOUND_VERSION_AGE@%$LIBECASOUND_VERSION_AGE%g s%@LIBECASOUNDC_VERSION@%$LIBECASOUNDC_VERSION%g +s%@LIBECASOUNDC_VERSION_AGE@%$LIBECASOUNDC_VERSION_AGE%g s%@LIBKVUTILS_VERSION@%$LIBKVUTILS_VERSION%g s%@LIBKVUTILS_VERSION_AGE@%$LIBKVUTILS_VERSION_AGE%g s%@CC@%$CC%g @@ -9472,10 +9624,10 @@ s%@ECA_S_PYTHON_INCLUDES@%$ECA_S_PYTHON_INCLUDES%g s%@ECA_S_PYTHON_MODULES@%$ECA_S_PYTHON_MODULES%g s%@ECA_S_PYTHON_DLMODULES@%$ECA_S_PYTHON_DLMODULES%g -s%@ECA_AM_COMPILE_PYECASOUND_TRUE@%$ECA_AM_COMPILE_PYECASOUND_TRUE%g -s%@ECA_AM_COMPILE_PYECASOUND_FALSE@%$ECA_AM_COMPILE_PYECASOUND_FALSE%g -s%@ECA_AM_HAVE_PYTHON_TRUE@%$ECA_AM_HAVE_PYTHON_TRUE%g -s%@ECA_AM_HAVE_PYTHON_FALSE@%$ECA_AM_HAVE_PYTHON_FALSE%g +s%@ECA_AM_PYECASOUND_CEXT_TRUE@%$ECA_AM_PYECASOUND_CEXT_TRUE%g +s%@ECA_AM_PYECASOUND_CEXT_FALSE@%$ECA_AM_PYECASOUND_CEXT_FALSE%g +s%@ECA_AM_PYECASOUND_INSTALL_TRUE@%$ECA_AM_PYECASOUND_INSTALL_TRUE%g +s%@ECA_AM_PYECASOUND_INSTALL_FALSE@%$ECA_AM_PYECASOUND_INSTALL_FALSE%g s%@build@%$build%g s%@build_alias@%$build_alias%g s%@build_cpu@%$build_cpu%g @@ -9848,8 +10000,12 @@ echo "Following packages are now configured:" echo "ecasound: yes (ecasound,libecasound,libecasoundc)" echo "ecatools: yes" -if test x$compile_pyecasound = xyes ; then - echo "pyecasound: yes" +if test x$pyecasound_support != xnone ; then + if test x$pyecasound_support = xc ; then + echo "pyecasound: yes (as Python C extension module)" + else + echo "pyecasound: yes (as native Python module)" + fi else echo "pyecasound: no" fi @@ -9916,7 +10072,7 @@ echo "-----------------------------------------------------------------" echo "Following directories are used:" echo "Directory prefix: "$ECA_S_PREFIX -if test x$compile_pyecasound = xyes ; then +if test x$pyecasound_support != xnone ; then echo "Python include dir: "$ECA_S_PYTHON_INCLUDES echo "Python module dir: "$ECA_S_PYTHON_MODULES fi --/04w6evG8XlLl3ft Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-configure.in" =================================================================== RCS file: /home/cvspsrv/cvsroot/sound/ecasound/configure.in,v retrieving revision 1.152 retrieving revision 1.158 diff -u -r1.152 -r1.158 --- configure.in 2003/04/02 20:14:10 1.152 +++ configure.in 2003/05/30 19:28:47 1.158 @@ -1,6 +1,6 @@ dnl --- dnl configure.in for ecasound -dnl last modified: 20030402-14 +dnl last modified: 20030530-20 dnl dnl Many of the tests and macros in this file have been borrowed from dnl other GPL-lisenced packages (Alsaplayer, ALSA, SIP, PyQt, @@ -23,7 +23,7 @@ dnl --- dnl Init automake dnl --- -AM_INIT_AUTOMAKE(ecasound, 2.2.3) +AM_INIT_AUTOMAKE(ecasound, 2.2.4) AM_CONFIG_HEADER(config.h) dnl --- @@ -32,15 +32,17 @@ dnl defines: LIBECASOUND_VERSION, LIBECASOUNDC_VERSION, LIBKVUTILS_VERSION dnl --- -LIBECASOUND_VERSION=10 -LIBECASOUND_VERSION_AGE=1 +LIBECASOUND_VERSION=11 +LIBECASOUND_VERSION_AGE=2 LIBECASOUNDC_VERSION=1 -LIBKVUTILS_VERSION=5 -LIBKVUTILS_VERSION_AGE=1 +LIBECASOUNDC_VERSION_AGE=0 +LIBKVUTILS_VERSION=6 +LIBKVUTILS_VERSION_AGE=2 AC_SUBST(LIBECASOUND_VERSION) AC_SUBST(LIBECASOUND_VERSION_AGE) AC_SUBST(LIBECASOUNDC_VERSION) +AC_SUBST(LIBECASOUNDC_VERSION_AGE) AC_SUBST(LIBKVUTILS_VERSION) AC_SUBST(LIBKVUTILS_VERSION_AGE) @@ -432,39 +434,46 @@ dnl Checks for pyecasound dnl dnl defines: ECA_S_PYTHON_INCLUDES, ECA_S_PYTHON_DLMODULES, -dnl ECA_AM_COMPILE_PYECASOUND, ECA_AM_HAVE_PYTHON +dnl ECA_AM_PYECASOUND_CEXT, ECA_AM_PYECASOUND_INSTALL dnl -- -compile_pyecasound=no +pyecasound_support=python AC_ARG_ENABLE(pyecasound, - [ --enable-pyecasound Enable compilation of pyecasound (default = no)], + [ --enable-pyecasound Enable compilation of pyecasound (default = python)], [ case "$enableval" in y | yes) - AC_MSG_RESULT(yes) - compile_pyecasound=yes + pyecasound_support=c ;; - n | no) - AC_MSG_RESULT(no) - compile_pyecasound=no + n | no | none) + pyecasound_support=none + ;; + + python) + pyecasound_support=python + ;; + + c) + pyecasound_support=c ;; *) - AC_MSG_ERROR([Invalid parameter value for --enable-pyecasound: $enableval]) + pyecasound_support=python ;; esac ]) dnl -- -dnl Python interpreter +dnl Python interpreter and installation prefix AC_PATH_PROG(PYTHONPATH,python,none) if test x$PYTHONPATH = xnone; then - python_support=no + pyecasound_support=none + python_install_prefix="" else - python_support=yes + python_install_prefix=`python -c "import sys; print (sys.prefix)"` fi dnl -- @@ -497,7 +506,10 @@ if test "X$ECA_S_PYTHON_INCLUDES" = "X" then AC_MSG_WARN([Python.h not found]) - compile_pyecasound=no + if test x${pyecasound_support} = xc; then + dnl -- No python headers found, cannot compile C extension + pyecasound_support=python + fi else AC_MSG_RESULT($ECA_S_PYTHON_INCLUDES) fi @@ -511,14 +523,35 @@ if test "X$with_python_modules" = "X" then - pymoddirs="/usr/local/lib /usr/lib" - dnl -- Double-brackets to espace the real brackets - pymoddirsmore=`python -c "import sys; print (sys.prefix + '/lib/python' + sys.version[[:3]])"` - pymoddirs="$pymoddirs $pymoddirsmore" + if test x${python_install_prefix} != x${ecaprefix} -a \ + x${ecaprefix} != x/usr -a \ + x${ecaprefix} != x/usr/local ; then + pyecasound_support=none + AC_MSG_RESULT([none]) + if test x$PYTHONPATH != xnone; then + python_prefix_tmp=`python -c "import sys; print (sys.prefix + '/lib/python' + sys.version[[:3]])"` + else + python_prefix_tmp="DIR" + fi + AC_MSG_WARN([ + *** + *** Python modules won't be installed as the module install prefix does + *** not match ecasound's build prefix! To override, set python + *** module directory explicitly (for example + *** "--with-python-modules=${python_prefix_tmp}"). + *** + ]) + else + pymoddirs="/usr/local/lib /usr/lib" + dnl -- Double-brackets to espace the real brackets + pymoddirsmore=`python -c "import sys; print (sys.prefix + '/lib/python' + sys.version[[:3]])"` + pymoddirs="$pymoddirs $pymoddirsmore" + AC_MSG_RESULT($pymoddirs) + fi else pymoddirs=$with_python_modules + AC_MSG_RESULT($pymoddirs) fi -AC_MSG_RESULT($pymoddirs) dnl --- dnl a hack to support broken debian python installs @@ -555,9 +588,9 @@ AC_SUBST(ECA_S_PYTHON_MODULES) AC_SUBST(ECA_S_PYTHON_DLMODULES) -dnl if test x$disable_pyecasound = xyes ; then compile_pyecasound=no ; fi -AM_CONDITIONAL(ECA_AM_COMPILE_PYECASOUND, test x$compile_pyecasound = xyes) -AM_CONDITIONAL(ECA_AM_HAVE_PYTHON, test x$python_support = xyes) +dnl if test x$disable_pyecasound = xyes ; then pyecasound_support=no ; fi +AM_CONDITIONAL(ECA_AM_PYECASOUND_CEXT, test x$pyecasound_support = xc) +AM_CONDITIONAL(ECA_AM_PYECASOUND_INSTALL, test x$pyecasound_support != xnone) dnl ------------------------------------------------------------------ @@ -621,12 +654,12 @@ case "$enableval" in y | yes) AC_MSG_RESULT(yes) - termcap_library=yes + termcap_library=ncurses ;; n | no) AC_MSG_RESULT(no) - termcap_library=no + termcap_library=none ;; *) @@ -788,8 +821,14 @@ [AC_CHECK_HEADER(readline/history.h,, AC_MSG_ERROR([*** readline history headers not installed ***]))]) - AC_CHECK_LIB(readline, main,, AC_MSG_ERROR([*** readline support not installed ***])) - AC_CHECK_LIB(history, main,, AC_MSG_ERROR([*** readline history support not installed ***])) + if test x${termcap_library} = xnone; then + readline_extra_libs=""; + else + readline_extra_libs="-l${termcap_library}" + fi + + AC_CHECK_LIB(readline, main, readline_library="-lreadline", AC_MSG_ERROR([*** readline support not installed ***]), ${readline_extra_libs}) + AC_CHECK_LIB(history, main, readline_library="${readline_library} -lhistory", AC_MSG_ERROR([*** readline history support not installed ***]), ${readline_extra_libs}) AC_SUBST(ECA_S_READLINE_INCLUDES) else AC_CONFIG_SUBDIRS(readline-4.0) @@ -865,6 +904,9 @@ AC_CHECK_FUNCS(sched_getparam) AC_CHECK_FUNCS(sched_getscheduler) AC_CHECK_FUNCS(sched_setscheduler) +AC_CHECK_FUNCS(pthread_self) +AC_CHECK_FUNCS(pthread_getschedparam) +AC_CHECK_FUNCS(pthread_setschedparam) AC_CHECK_FUNCS(sigprocmask) AC_CHECK_FUNCS(sigwait) @@ -943,8 +985,12 @@ echo "Following packages are now configured:" echo "ecasound: yes (ecasound,libecasound,libecasoundc)" echo "ecatools: yes" -if test x$compile_pyecasound = xyes ; then - echo "pyecasound: yes" +if test x$pyecasound_support != xnone ; then + if test x$pyecasound_support = xc ; then + echo "pyecasound: yes (as Python C extension module)" + else + echo "pyecasound: yes (as native Python module)" + fi else echo "pyecasound: no" fi @@ -1011,7 +1057,7 @@ echo "-----------------------------------------------------------------" echo "Following directories are used:" echo "Directory prefix: "$ECA_S_PREFIX -if test x$compile_pyecasound = xyes ; then +if test x$pyecasound_support != xnone ; then echo "Python include dir: "$ECA_S_PYTHON_INCLUDES echo "Python module dir: "$ECA_S_PYTHON_MODULES fi --/04w6evG8XlLl3ft Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-pyecasound::Makefile.am" =================================================================== RCS file: /home/cvspsrv/cvsroot/sound/ecasound/pyecasound/Makefile.am,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- pyecasound/Makefile.am 2003/04/02 20:13:52 1.28 +++ pyecasound/Makefile.am 2003/05/30 01:50:40 1.29 @@ -11,7 +11,7 @@ ecasoundc_libs = -L$(top_builddir)/libecasoundc/.libs -lecasoundc endif -if ECA_AM_HAVE_PYTHON +if ECA_AM_PYECASOUND_INSTALL pyecasound_install_list1 = $(srcdir)/eci.py \ $(srcdir)/pyeca.py \ $(srcdir)/ecacontrol.py @@ -19,7 +19,7 @@ $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/pyeca.py \ $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/ecacontrol.py endif -if ECA_AM_COMPILE_PYECASOUND +if ECA_AM_PYECASOUND_CEXT pyecasound_install_list2 = pyecasound.so pyecasound_uninstall_list2 = $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/pyecasound.so endif @@ -39,14 +39,14 @@ # source files # ---------------------------------------------------------------------- -if ECA_AM_COMPILE_PYECASOUND +if ECA_AM_PYECASOUND_CEXT noinst_LTLIBRARIES = libpyecasound.la endif libpyecasound_la_SOURCES = pyecasound.c libpyecasound_la_LDFLAGS = -avoid-version -export-dynamic -if ECA_AM_COMPILE_PYECASOUND +if ECA_AM_PYECASOUND_CEXT all: pyecasound.so pyecasound.so: pyecasound.lo @@ -57,11 +57,11 @@ # hooks # ---------------------------------------------------------------------- -if ECA_AM_COMPILE_PYECASOUND +if ECA_AM_PYECASOUND_CEXT CLEANFILES=pyecasound.so endif -if ECA_AM_HAVE_PYTHON +if ECA_AM_PYECASOUND_INSTALL install-exec-hook: $(pyecasound_install_list1) $(pyecasound_install_list2) $(INSTALL) -d $(DESTDIR)$(ECA_S_PYTHON_DLMODULES) $(INSTALL) $(pyecasound_install_list1) $(pyecasound_install_list2) $(DESTDIR)$(ECA_S_PYTHON_DLMODULES) @@ -69,7 +69,7 @@ install-exec-hook: endif -if ECA_AM_HAVE_PYTHON +if ECA_AM_PYECASOUND_INSTALL uninstall-local: rm -f $(pyecasound_uninstall_list1) $(pyecasound_uninstall_list2) rmdir --ignore-fail-on-non-empty $(DESTDIR)$(ECA_S_PYTHON_DLMODULES) --/04w6evG8XlLl3ft--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306212010.h5LKAKET095259>