From 6f8f4753ff2122937a20d4d15f69fbd6a01620a7 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 28 Mar 2005 09:58:45 +0000 Subject: [PATCH] Added checking for artsc library. --- configure | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++-- configure.ac | 9 ++++--- 2 files changed, 73 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 41b3b77f1c..98a0c7c9d6 100755 --- a/configure +++ b/configure @@ -11186,7 +11186,71 @@ then ARTSC_LIBS=`$ARTSCCONFIG --libs` save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $ARTSC_CFLAGS" - cat >conftest.$ac_ext <<_ACEOF + echo "$as_me:$LINENO: checking for arts_init in -lartsc" >&5 +echo $ECHO_N "checking for arts_init in -lartsc... $ECHO_C" >&6 +if test "${ac_cv_lib_artsc_arts_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lartsc $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.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 arts_init (); +int +main () +{ +arts_init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_artsc_arts_init=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_artsc_arts_init=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_artsc_arts_init" >&5 +echo "${ECHO_T}$ac_cv_lib_artsc_arts_init" >&6 +if test $ac_cv_lib_artsc_arts_init = yes; then + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11224,7 +11288,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (exit $ac_status); }; }; then ARTSLIBS=$ARTSC_LIBS - ARTSINCL=$ARTSC_CFLAGS + ARTSINCL=$ARTSC_CFLAGS cat >>confdefs.h <<\_ACEOF @@ -11237,6 +11301,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi + CFLAGS="$save_CFLAGS" fi diff --git a/configure.ac b/configure.ac index 84c42fba00..3dfc1f3fe4 100644 --- a/configure.ac +++ b/configure.ac @@ -671,10 +671,11 @@ then ARTSC_LIBS=`$ARTSCCONFIG --libs` save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $ARTSC_CFLAGS" - AC_TRY_COMPILE([#include ],[arts_stream_t stream;], - [AC_SUBST(ARTSLIBS, $ARTSC_LIBS) - AC_SUBST(ARTSINCL, $ARTSC_CFLAGS) - AC_DEFINE(HAVE_ARTS, 1, [Define if you have ARTS sound server])]) + AC_CHECK_LIB(artsc,arts_init, + [AC_TRY_COMPILE([#include ],[arts_stream_t stream;], + [AC_SUBST(ARTSLIBS, $ARTSC_LIBS) + AC_SUBST(ARTSINCL, $ARTSC_CFLAGS) + AC_DEFINE(HAVE_ARTS, 1, [Define if you have ARTS sound server])])],) CFLAGS="$save_CFLAGS" fi -- 2.32.0.93.g670b81a890