46 lines
2.2 KiB
Text
46 lines
2.2 KiB
Text
$NetBSD: patch-ak,v 1.8 2008/02/08 17:33:02 drochner Exp $
|
|
|
|
--- configure.orig 2007-02-01 02:12:35.000000000 +0100
|
|
+++ configure
|
|
@@ -26336,6 +26336,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
|
|
} && test -s conftest$ac_exeext &&
|
|
$as_test_x conftest$ac_exeext; then
|
|
ac_cv_lib_Xinerama_XineramaQueryExtension=yes
|
|
+ X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"
|
|
else
|
|
echo "$as_me: failed program was:" >&5
|
|
sed 's/^/| /' conftest.$ac_ext >&5
|
|
@@ -26607,14 +26608,14 @@ case $host in
|
|
LDFLAGS="$LDFLAGS -L/usr/local/lib"
|
|
;;
|
|
*)
|
|
- THREAD_LIBS="-lpthread"
|
|
- { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
|
|
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
|
|
+ THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
|
|
+ { echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
|
|
+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; }
|
|
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lpthread $LIBS"
|
|
+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
@@ -26968,11 +26969,11 @@ echo $ECHO_N "checking for XINE-LIB vers
|
|
XINE_LIBS=`$XINE_CONFIG $xine_config_args --libs`
|
|
XINE_ACFLAGS=`$XINE_CONFIG $xine_config_args --acflags`
|
|
xine_config_major_version=`$XINE_CONFIG $xine_config_args --version | \
|
|
- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
|
|
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\1/'`
|
|
xine_config_minor_version=`$XINE_CONFIG $xine_config_args --version | \
|
|
- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
|
|
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\2/'`
|
|
xine_config_sub_version=`$XINE_CONFIG $xine_config_args --version | \
|
|
- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
|
|
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\3/'`
|
|
xine_data_dir=`$XINE_CONFIG $xine_config_args --datadir`
|
|
xine_script_dir=`$XINE_CONFIG $xine_config_args --scriptdir`
|
|
xine_plugin_dir=`$XINE_CONFIG $xine_config_args --plugindir`
|