summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorpooka <pooka@pkgsrc.org>2000-10-29 08:54:52 +0000
committerpooka <pooka@pkgsrc.org>2000-10-29 08:54:52 +0000
commitdfd329c7e7721a7231b10e0bb53fbe7b672117bb (patch)
tree75d3f115917fc5654ded9352fb7215ae374194e1 /audio
parent96fa41263d9438a4319a9236031c1f081ac4ea3e (diff)
downloadpkgsrc-dfd329c7e7721a7231b10e0bb53fbe7b672117bb.tar.gz
Update to 1.5.4.
Changes since 1.3.9: * ported to qt2 * playlist support * important bugfixes
Diffstat (limited to 'audio')
-rw-r--r--audio/xsidplay/Makefile20
-rw-r--r--audio/xsidplay/files/md54
-rw-r--r--audio/xsidplay/files/patch-sum6
-rw-r--r--audio/xsidplay/patches/patch-aa14
-rw-r--r--audio/xsidplay/patches/patch-ab157
5 files changed, 100 insertions, 101 deletions
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index d0093b3a7d4..733146acb0c 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2000/07/20 08:25:42 agc Exp $
+# $NetBSD: Makefile,v 1.15 2000/10/29 08:54:52 pooka Exp $
#
-DISTNAME= xsidplay-1_3_9
-PKGNAME= xsidplay-1.3.9
-WRKSRC= ${WRKDIR}/xsidplay-1.3.9
+DISTNAME= xsidplay-1_5_4
+PKGNAME= xsidplay-1.5.4
+WRKSRC= ${WRKDIR}/xsidplay-1.5.4
CATEGORIES= audio x11
MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
EXTRACT_SUFX= .tgz
@@ -11,22 +11,22 @@ EXTRACT_SUFX= .tgz
MAINTAINER= pooka@netbsd.org
HOMEPAGE= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/
-DEPENDS+= sidplay-1.0.*:../../audio/sidplay
-DEPENDS+= qt1-1.44:../../x11/qt1
+DEPENDS+= sidplay>=1.0:../../audio/sidplay
+DEPENDS+= qt2>=2.2.1nb1:../../x11/qt2
USE_X11BASE= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-EVAL_PREFIX+= QT1DIR=qt1
+EVAL_PREFIX+= QT2DIR=qt2-libs
CONFIGURE_ARGS+= --with-sidplay-includes=${LOCALBASE}/include \
--with-sidplay-library=${LOCALBASE}/lib \
- --with-qt-dir=${QT1DIR}/qt1
+ --with-qt-dir=${QT2DIR}/qt2
-LDFLAGS+= -Wl,-R${QT1DIR}/qt1/lib
+LDFLAGS+= -Wl,-R${QT2DIR}/qt2/lib
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-CONFIGURE_ENV+= "MOC=${QT1DIR}/qt1/bin/moc"
+CONFIGURE_ENV+= "MOC=${QT2DIR}/qt2/bin/moc"
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin
diff --git a/audio/xsidplay/files/md5 b/audio/xsidplay/files/md5
index c0d09d00a2d..46f2c91aaef 100644
--- a/audio/xsidplay/files/md5
+++ b/audio/xsidplay/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2000/06/20 21:14:04 pooka Exp $
+$NetBSD: md5,v 1.4 2000/10/29 08:54:54 pooka Exp $
-MD5 (xsidplay-1_3_9.tgz) = 0899624e144c6b686d69d7396689e8c5
+MD5 (xsidplay-1_5_4.tgz) = ce3551a55e24c64adfb16bd8c4e4b29f
diff --git a/audio/xsidplay/files/patch-sum b/audio/xsidplay/files/patch-sum
index 6e64c97e848..428eda40c38 100644
--- a/audio/xsidplay/files/patch-sum
+++ b/audio/xsidplay/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.4 2000/06/20 21:14:04 pooka Exp $
+$NetBSD: patch-sum,v 1.5 2000/10/29 08:54:54 pooka Exp $
-MD5 (patch-aa) = 44a716355657ae0f102ad2f099f29f79
-MD5 (patch-ab) = 97dea313cca22234fdbf4555f1e2734e
+MD5 (patch-aa) = 36bef5273f726e98f4b577f63ba5a6ad
+MD5 (patch-ab) = 26d9df1e1ff0dc7935f1d5bc00fd5755
diff --git a/audio/xsidplay/patches/patch-aa b/audio/xsidplay/patches/patch-aa
index dd0564223cb..e857bcb4121 100644
--- a/audio/xsidplay/patches/patch-aa
+++ b/audio/xsidplay/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.6 2000/06/20 21:14:05 pooka Exp $
+$NetBSD: patch-aa,v 1.7 2000/10/29 08:54:54 pooka Exp $
---- src/Makefile.in.orig Wed May 3 21:27:00 2000
-+++ src/Makefile.in Tue Jun 20 23:53:19 2000
-@@ -102,7 +102,7 @@
+--- src/Makefile.in.orig Thu Oct 26 18:51:21 2000
++++ src/Makefile.in Sat Oct 28 15:18:33 2000
+@@ -104,7 +104,7 @@
bin_PROGRAMS = xsidplay
--xsidplay_LDADD = $(OBJMETA) AudioDriver.o @SIDPLAY_LDFLAGS@ -lsidplay @QT_LDFLAGS@ -lqt
-+xsidplay_LDADD = $(OBJMETA) AudioDriver.o @SIDPLAY_LDFLAGS@ -lsidplay @QT_LDFLAGS@ -lqt -lX11 -lXext @LIBAUDIO@
+-xsidplay_LDADD = audio/libaudio.a stilview/libstilview.a songlendb/libsonglendb.a tools/libtools.a widgets/libwidgets.a @SIDPLAY_LDFLAGS@ -lsidplay @QT_LDFLAGS@ -lqt
++xsidplay_LDADD = audio/libaudio.a stilview/libstilview.a songlendb/libsonglendb.a tools/libtools.a widgets/libwidgets.a @SIDPLAY_LDFLAGS@ -lsidplay @QT_LDFLAGS@ -lX11 -lXext -lICE -lSM -lqt @LIBAUDIO@
- xsidplay_SOURCES = AudioConfig.h HistoryDialog.cpp StilDialog.h AudioDialog.cpp HistoryDialog.h StilDialogData.cpp AudioDialog.h HistoryDialogData.cpp StilDialogData.h AudioDialogData.cpp HistoryDialogData.h TextFile.cpp AudioDialogData.h HistoryFile.cpp TextFile.h ConfigFile.cpp HistoryFile.h TimeLCD.cpp ConfigFile.h HistoryItem.h TimeLCD.h EmuDialog.cpp LEDButton.cpp WaveViewDialog.cpp EmuDialog.h LEDButton.h WaveViewDialog.h EmuDialogData.cpp MainDialog.cpp WaveViewDialogData.cpp EmuDialogData.h MainDialog.h WaveViewDialogData.h FilterDialog.cpp MainDialogData.cpp myTimer.h FilterDialog.h MainDialogData.h stil.cpp FilterDialogData.cpp MixerConfig.h stil.h FilterDialogData.h MixerDialog.cpp stilcomm.cpp GlobalIcon.h MixerDialog.h stilcomm.h HVSCDialog.cpp MixerDialogData.cpp stildefs.h HVSCDialog.h MixerDialogData.h xsidplay.cpp HVSCDialogData.cpp PicButton.cpp xsidplay.h HVSCDialogData.h PicButton.h HVSCconfig.h StilDialog.cpp
+ xsidplay_SOURCES = $(BUILT_SOURCES) AudioDialog.cpp AudioDialog.h AudioDialogData.cpp AudioDialogData.h ConfigC.cpp ConfigC.h ConfigFile.cpp ConfigFile.h ConfigFileOld.cpp ConfigFileOld.h EmuDialog.cpp EmuDialog.h EmuDialogData.cpp EmuDialogData.h FilterDialog.cpp FilterDialog.h FilterDialogData.cpp FilterDialogData.h GlobalIcon.h HVSC_Dialog.cpp HVSC_Dialog.h HVSC_DialogData.cpp HVSC_DialogData.h HVSC_Config.h HistoryDialog.cpp HistoryDialog.h HistoryDialogData.cpp HistoryDialogData.h HistoryFile.cpp HistoryFile.h HistoryItem.h MainDialog.cpp MainDialog.h MainDialogData.cpp MainDialogData.h MixerConfig.h MixerDialog.cpp MixerDialog.h MixerDialogData.cpp MixerDialogData.h Player.h Player.cpp Playlist.cpp Playlist.h PlaylistDialog.cpp PlaylistDialog.h PlaylistDialogData.cpp PlaylistDialogData.h PlaylistEditDialog.cpp PlaylistEditDialog.h PlaylistEditDialogData.cpp PlaylistEditDialogData.h PlaylistCheck.cpp PlaylistCheck.h PlaylistItem.h PlaylistOptDialog.cpp PlaylistOptDialog.h StilDialog.cpp StilDialog.h WaveViewDialog.cpp WaveViewDialog.h WaveViewDialogData.cpp WaveViewDialogData.h WidgetOffset.cpp WidgetOffset.h myTimer.h filenames.h xsidplay.cpp
diff --git a/audio/xsidplay/patches/patch-ab b/audio/xsidplay/patches/patch-ab
index 5777d7befb9..625a8d4d8e2 100644
--- a/audio/xsidplay/patches/patch-ab
+++ b/audio/xsidplay/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2000/06/20 21:14:05 pooka Exp $
+$NetBSD: patch-ab,v 1.6 2000/10/29 08:54:54 pooka Exp $
---- configure.orig Wed May 3 21:25:54 2000
-+++ configure Tue Jun 20 01:11:25 2000
-@@ -1837,10 +1837,48 @@
+--- configure.orig Thu Oct 26 18:40:22 2000
++++ configure Sat Oct 28 15:19:05 2000
+@@ -1876,10 +1876,47 @@
done
+echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
-+echo "configure:1842: checking for main in -lossaudio" >&5
++echo "configure:1881: checking for main in -lossaudio" >&5
+ac_lib_var=`echo ossaudio'_'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
@@ -15,14 +15,14 @@ $NetBSD: patch-ab,v 1.5 2000/06/20 21:14:05 pooka Exp $
+ ac_save_LIBS="$LIBS"
+LIBS="-lossaudio $LIBS"
+cat > conftest.$ac_ext <<EOF
-+#line 1850 "configure"
++#line 1889 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
-+if { (eval echo configure:1857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1896: \"$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
@@ -37,216 +37,215 @@ $NetBSD: patch-ab,v 1.5 2000/06/20 21:14:05 pooka Exp $
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
-+ LIBAUDIO=-lossaudio
++ LIBAUDIO=-lossaudio
+else
+ echo "$ac_t""no" 1>&6
+fi
-+
-+
++
+
# Extract the first word of "cp", so it can be a program name with args.
set dummy cp; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1844: checking for $ac_word" >&5
-+echo "configure:1882: checking for $ac_word" >&5
+-echo "configure:1883: checking for $ac_word" >&5
++echo "configure:1920: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -1875,7 +1913,7 @@
+@@ -1914,7 +1951,7 @@
echo $ac_n "checking which audio driver to install""... $ac_c" 1>&6
--echo "configure:1879: checking which audio driver to install" >&5
-+echo "configure:1917: checking which audio driver to install" >&5
+-echo "configure:1918: checking which audio driver to install" >&5
++echo "configure:1955: checking which audio driver to install" >&5
my_have_audio_driver=no
case "$host" in
*linux*) my_have_audio_driver=yes
-@@ -1993,7 +2031,7 @@
+@@ -2032,7 +2069,7 @@
fi
echo $ac_n "checking build system type""... $ac_c" 1>&6
--echo "configure:1997: checking build system type" >&5
-+echo "configure:2035: checking build system type" >&5
+-echo "configure:2036: checking build system type" >&5
++echo "configure:2073: checking build system type" >&5
build_alias=$build
case "$build_alias" in
-@@ -2013,7 +2051,7 @@
+@@ -2052,7 +2089,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:2017: checking for $ac_word" >&5
-+echo "configure:2055: checking for $ac_word" >&5
+-echo "configure:2056: checking for $ac_word" >&5
++echo "configure:2093: 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
-@@ -2043,7 +2081,7 @@
+@@ -2082,7 +2119,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:2047: checking for $ac_word" >&5
-+echo "configure:2085: checking for $ac_word" >&5
+-echo "configure:2086: checking for $ac_word" >&5
++echo "configure:2123: 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
-@@ -2073,7 +2111,7 @@
+@@ -2112,7 +2149,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:2077: checking for $ac_word" >&5
-+echo "configure:2115: checking for $ac_word" >&5
+-echo "configure:2116: checking for $ac_word" >&5
++echo "configure:2153: 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
-@@ -2124,7 +2162,7 @@
+@@ -2163,7 +2200,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:2128: checking for $ac_word" >&5
-+echo "configure:2166: checking for $ac_word" >&5
+-echo "configure:2167: checking for $ac_word" >&5
++echo "configure:2204: 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
-@@ -2156,7 +2194,7 @@
+@@ -2195,7 +2232,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:2160: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:2198: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+-echo "configure:2199: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:2236: 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.
-@@ -2167,12 +2205,12 @@
+@@ -2206,12 +2243,12 @@
cat > conftest.$ac_ext << EOF
--#line 2171 "configure"
-+#line 2209 "configure"
+-#line 2210 "configure"
++#line 2247 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
--if { (eval echo configure:2176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:2215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2252: \"$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
-@@ -2198,12 +2236,12 @@
+@@ -2237,12 +2274,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:2202: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:2240: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+-echo "configure:2241: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2278: 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:2207: checking whether we are using GNU C" >&5
-+echo "configure:2245: checking whether we are using GNU C" >&5
+-echo "configure:2246: checking whether we are using GNU C" >&5
++echo "configure:2283: 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
-@@ -2212,7 +2250,7 @@
+@@ -2251,7 +2288,7 @@
yes;
#endif
EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2216: \"$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:2254: \"$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:2255: \"$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:2292: \"$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
-@@ -2231,7 +2269,7 @@
+@@ -2270,7 +2307,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:2235: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:2273: checking whether ${CC-cc} accepts -g" >&5
+-echo "configure:2274: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:2311: 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
-@@ -2274,7 +2312,7 @@
+@@ -2313,7 +2350,7 @@
if test "$ac_cv_prog_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:2278: checking for ld used by GCC" >&5
-+echo "configure:2316: checking for ld used by GCC" >&5
+-echo "configure:2317: checking for ld used by GCC" >&5
++echo "configure:2354: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
# Accept absolute paths.
-@@ -2298,10 +2336,10 @@
+@@ -2337,10 +2374,10 @@
esac
elif test "$with_gnu_ld" = yes; then
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
--echo "configure:2302: checking for GNU ld" >&5
-+echo "configure:2340: checking for GNU ld" >&5
+-echo "configure:2341: checking for GNU ld" >&5
++echo "configure:2378: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
--echo "configure:2305: checking for non-GNU ld" >&5
-+echo "configure:2343: checking for non-GNU ld" >&5
+-echo "configure:2344: checking for non-GNU ld" >&5
++echo "configure:2381: checking for non-GNU ld" >&5
fi
if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2336,7 +2374,7 @@
+@@ -2375,7 +2412,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:2340: checking if the linker ($LD) is GNU ld" >&5
-+echo "configure:2378: checking if the linker ($LD) is GNU ld" >&5
+-echo "configure:2379: checking if the linker ($LD) is GNU ld" >&5
++echo "configure:2416: checking if the linker ($LD) is GNU ld" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -2352,7 +2390,7 @@
+@@ -2391,7 +2428,7 @@
echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
--echo "configure:2356: checking for BSD-compatible nm" >&5
-+echo "configure:2394: checking for BSD-compatible nm" >&5
+-echo "configure:2395: checking for BSD-compatible nm" >&5
++echo "configure:2432: checking for BSD-compatible nm" >&5
if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -2388,7 +2426,7 @@
+@@ -2427,7 +2464,7 @@
echo "$ac_t""$NM" 1>&6
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
--echo "configure:2392: checking whether ln -s works" >&5
-+echo "configure:2430: checking whether ln -s works" >&5
+-echo "configure:2431: checking whether ln -s works" >&5
++echo "configure:2468: 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
-@@ -2442,8 +2480,8 @@
+@@ -2481,8 +2518,8 @@
case "$lt_target" in
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 2446 "configure"' > conftest.$ac_ext
-- if { (eval echo configure:2447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+ echo '#line 2484 "configure"' > conftest.$ac_ext
-+ if { (eval echo configure:2485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+- echo '#line 2485 "configure"' > conftest.$ac_ext
+- if { (eval echo configure:2486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++ echo '#line 2522 "configure"' > conftest.$ac_ext
++ if { (eval echo configure:2523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
LD="${LD-ld} -32"
-@@ -2464,19 +2502,19 @@
+@@ -2503,19 +2540,19 @@
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
--echo "configure:2468: checking whether the C compiler needs -belf" >&5
-+echo "configure:2506: checking whether the C compiler needs -belf" >&5
+-echo "configure:2507: checking whether the C compiler needs -belf" >&5
++echo "configure:2544: 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
cat > conftest.$ac_ext <<EOF
--#line 2473 "configure"
-+#line 2511 "configure"
+-#line 2512 "configure"
++#line 2549 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
--if { (eval echo configure:2480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:2519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2556: \"$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
-@@ -2764,6 +2802,7 @@
+@@ -2809,6 +2846,7 @@
s%@QT_INCLUDES@%$QT_INCLUDES%g
s%@QT_LDFLAGS@%$QT_LDFLAGS%g
s%@MOC@%$MOC%g