From 575d89445c5fbadf055d0910a52cc9bf4eaca962 Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Sun, 25 Mar 2007 00:44:50 +0100 Subject: [PATCH] configure: Add -lXau to NASLIBS if applicable to obtain XauGetBestAuthByAddr and XauDisposeAuth. --- configure | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 6 ++++- 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 09acfea60a..17705e03f8 100755 --- a/configure +++ b/configure @@ -8746,7 +8746,74 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_NAS 1 _ACEOF - NASLIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS" + { echo "$as_me:$LINENO: checking for XauGetBestAuthByAddr in -lXau" >&5 +echo $ECHO_N "checking for XauGetBestAuthByAddr in -lXau... $ECHO_C" >&6; } +if test "${ac_cv_lib_Xau_XauGetBestAuthByAddr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXau $X_LIBS $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 GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XauGetBestAuthByAddr (); +int +main () +{ +return XauGetBestAuthByAddr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_Xau_XauGetBestAuthByAddr=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_Xau_XauGetBestAuthByAddr=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauGetBestAuthByAddr" >&5 +echo "${ECHO_T}$ac_cv_lib_Xau_XauGetBestAuthByAddr" >&6; } +if test $ac_cv_lib_Xau_XauGetBestAuthByAddr = yes; then + NASLIBS="-lXau -laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS" +else + NASLIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS" +fi + + fi fi diff --git a/configure.ac b/configure.ac index d38e84eb53..5d8cb52641 100644 --- a/configure.ac +++ b/configure.ac @@ -457,7 +457,11 @@ then [AC_CHECK_HEADERS(audio/soundlib.h,,,[#include