7bd361e15a
* Compiles on NetBSD (:-), in contrast to the present/old version; May still need work on NetBSD-current (2.0G) * No list of changes available either in xsidplay sources nor on the homepage
63 lines
1.6 KiB
Text
63 lines
1.6 KiB
Text
$NetBSD: patch-aa,v 1.9 2004/09/17 23:21:27 hubertf Exp $
|
|
|
|
--- configure.orig 2003-02-01 21:18:09.000000000 +0100
|
|
+++ configure
|
|
@@ -6577,6 +6577,7 @@ else
|
|
fi
|
|
|
|
|
|
+if test -z "$DISABLE_ARTSD_TEST"; then
|
|
# aRts (KDE Sound Server).
|
|
# Extract the first word of "artsc-config", so it can be a program name with args.
|
|
set dummy artsc-config; ac_word=$2
|
|
@@ -6622,6 +6623,7 @@ EOF
|
|
ARTSC_INCLUDES="`$ARTSC_CONFIG --cflags`"
|
|
ARTSC_LDADD="`$ARTSC_CONFIG --libs`"
|
|
fi
|
|
+fi # DISABLE_ARTSD_TEST
|
|
|
|
|
|
if test -n "$ARTSC_CONFIG"; then
|
|
@@ -6634,7 +6636,7 @@ fi
|
|
|
|
|
|
|
|
-
|
|
+if test -z "$DISABLE_ESD_TEST"; then
|
|
# Enlightenment Sound Daemon.
|
|
# Extract the first word of "esd-config", so it can be a program name with args.
|
|
set dummy esd-config; ac_word=$2
|
|
@@ -6680,6 +6682,7 @@ EOF
|
|
ESD_INCLUDES="`$ESD_CONFIG --cflags`"
|
|
ESD_LDADD="`$ESD_CONFIG --libs`"
|
|
fi
|
|
+fi # DISABLE_ESD_TEST
|
|
|
|
|
|
if test -n "$ESD_CONFIG"; then
|
|
@@ -7789,6 +7792,7 @@ fi
|
|
done
|
|
|
|
my_qt_includes=$qt_incdir
|
|
+my_qt_lib=-lqt
|
|
|
|
qt_libdir=""
|
|
for i in $qt_libdirs;
|
|
@@ -7797,6 +7801,8 @@ my_qt_includes=$qt_incdir
|
|
do
|
|
if test -r "$i/$j"; then
|
|
qt_libdir=$i
|
|
+ my_qt_lib=-lqt-mt
|
|
+ echo "Using multi-threaded version of Qt lib (libqt-mt)"
|
|
break 2
|
|
fi
|
|
done
|
|
@@ -7886,7 +7892,7 @@ echo "configure:7879: checking for Qt ve
|
|
CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
|
|
CXXFLAGS="$CXXFLAGS $QT_INCLUDES"
|
|
LDFLAGS="$LDFLAGS $QT_LDFLAGS"
|
|
- LIBS="$LIBS -lqt"
|
|
+ LIBS="$LIBS ${my_qt_lib}"
|
|
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 7893 "configure"
|