summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/sidplay/Makefile15
-rw-r--r--audio/sidplay/files/md54
-rw-r--r--audio/sidplay/files/patch-sum7
-rw-r--r--audio/sidplay/patches/patch-aa54
-rw-r--r--audio/sidplay/patches/patch-ab82
-rw-r--r--audio/sidplay/patches/patch-ac1031
-rw-r--r--audio/sidplay/pkg/PLIST14
7 files changed, 128 insertions, 1079 deletions
diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile
index bb57abcd0d2..41697962e0e 100644
--- a/audio/sidplay/Makefile
+++ b/audio/sidplay/Makefile
@@ -1,17 +1,22 @@
-# $NetBSD: Makefile,v 1.3 1999/07/04 14:41:14 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/20 21:12:04 pooka Exp $
#
-DISTNAME= sidplay-1_36_35
-PKGNAME= sidplay-1.36.35
-WRKSRC= ${WRKDIR}/sidplay-1.36.35
+DISTNAME= sidplay-base-1_0_4
+PKGNAME= sidplay-1.0.4
+WRKSRC= ${WRKDIR}/sidplay-base-1.0.4
CATEGORIES= audio
MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
EXTRACT_SUFX= .tgz
-MAINTAINER= pooka@iki.fi
+MAINTAINER= pooka@netbsd.org
HOMEPAGE= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/
+DEPENDS+= libsidplay>=1.36.38:../../audio/libsidplay
+
GNU_CONFIGURE= yes
USE_GMAKE= yes
+CONFIGURE_ARGS+= --with-sidplay-includes=${LOCALBASE}/include \
+ --with-sidplay-library=${LOCALBASE}/lib
+
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/sidplay/files/md5 b/audio/sidplay/files/md5
index b14718488d8..bd6819e7e8a 100644
--- a/audio/sidplay/files/md5
+++ b/audio/sidplay/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/07/04 14:41:15 frueauf Exp $
+$NetBSD: md5,v 1.4 2000/06/20 21:12:09 pooka Exp $
-MD5 (sidplay-1_36_35.tgz) = 9b540cfbf28a3b2e619173f69680c33e
+MD5 (sidplay-base-1_0_4.tgz) = bfc0031b4a59ca7b3f9f654a0ef0bb3f
diff --git a/audio/sidplay/files/patch-sum b/audio/sidplay/files/patch-sum
index d0cdb96c769..f79ee2cd9a7 100644
--- a/audio/sidplay/files/patch-sum
+++ b/audio/sidplay/files/patch-sum
@@ -1,5 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/08/22 20:33:22 frueauf Exp $
+$NetBSD: patch-sum,v 1.3 2000/06/20 21:12:10 pooka Exp $
-MD5 (patch-aa) = e9df4bbbf29d296f78fe97811b13bb03
-MD5 (patch-ab) = f65437e5a011af61a22dc74c7052ae3e
-MD5 (patch-ac) = 55e3bb81899bfdbc6cfd38bb5c3a4e16
+MD5 (patch-aa) = ee71730a95731ae318ce0a110fcc8962
+MD5 (patch-ab) = 471fe6fc718918e8786f57c5e281419f
diff --git a/audio/sidplay/patches/patch-aa b/audio/sidplay/patches/patch-aa
index 380e5529bf0..5ffa5a41245 100644
--- a/audio/sidplay/patches/patch-aa
+++ b/audio/sidplay/patches/patch-aa
@@ -1,13 +1,47 @@
-$NetBSD: patch-aa,v 1.3 1999/07/04 14:41:15 frueauf Exp $
+$NetBSD: patch-aa,v 1.4 2000/06/20 21:12:10 pooka Exp $
---- console/Makefile.in.orig Thu Jun 17 08:59:51 1999
-+++ console/Makefile.in Wed Jun 23 23:50:39 1999
-@@ -25,7 +25,7 @@
- LIBM = @LIBM@
- LIBIOS = @LIBIOS@
- SIDLIB = -L$(TOPDIR)/libsidplay -lsidplay
--LIBS = @LIBS@ $(LIBM) $(LIBIOS) $(SIDLIB)
-+LIBS = @LIBS@ $(LIBM) $(LIBIOS) $(SIDLIB) @LIBAUDIO@
+--- Makefile.in.orig Wed May 31 21:52:44 2000
++++ Makefile.in Tue Jun 20 00:23:09 2000
+@@ -61,6 +61,7 @@
+ host_triplet = @host@
+ CP = @CP@
+ CXX = @CXX@
++LIBAUDIO = @LIBAUDIO@
+ MAKEINFO = @MAKEINFO@
+ PACKAGE = @PACKAGE@
+ SIDPLAY_INCLUDES = @SIDPLAY_INCLUDES@
+@@ -80,13 +81,13 @@
+ bin_PROGRAMS = sidplay sid2wav sidcon
- #--------------------------------------------------------------
+ sidplay_SOURCES = sidplay.cpp
+-sidplay_LDADD = audiodrv.o @SIDPLAY_LDFLAGS@ -lsidplay
++sidplay_LDADD = audiodrv.o @SIDPLAY_LDFLAGS@ -lsidplay @LIBAUDIO@
+ sid2wav_SOURCES = sid2wav.cpp
+-sid2wav_LDADD = @SIDPLAY_LDFLAGS@ -lsidplay
++sid2wav_LDADD = @SIDPLAY_LDFLAGS@ -lsidplay @LIBAUDIO@
+
+ sidcon_SOURCES = sidcon.cpp
+-sidcon_LDADD = @SIDPLAY_LDFLAGS@ -lsidplay
++sidcon_LDADD = @SIDPLAY_LDFLAGS@ -lsidplay @LIBAUDIO@
+
+ INCLUDES = @SIDPLAY_INCLUDES@
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -123,7 +124,7 @@
+
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ DEP_FILES = .deps/audiodrv.P .deps/sid2wav.P .deps/sidcon.P \
+ .deps/sidplay.P
+@@ -278,7 +279,7 @@
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+- cp -pr $$d/$$file $(distdir)/$$file; \
++ cp -pr $$/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
diff --git a/audio/sidplay/patches/patch-ab b/audio/sidplay/patches/patch-ab
index 15d6798f74c..4290402061a 100644
--- a/audio/sidplay/patches/patch-ab
+++ b/audio/sidplay/patches/patch-ab
@@ -1,17 +1,71 @@
-$NetBSD: patch-ab,v 1.4 1999/08/22 20:32:34 frueauf Exp $
+$NetBSD: patch-ab,v 1.5 2000/06/20 21:12:10 pooka Exp $
---- configure.in-orig Sun Apr 11 20:01:39 1999
-+++ configure.in Sun Aug 22 22:23:47 1999
-@@ -69,7 +69,11 @@
+--- configure.orig Wed May 31 21:52:45 2000
++++ configure Tue Jun 20 00:20:27 2000
+@@ -1411,10 +1411,48 @@
+ done
- AC_CHECK_PROG(MAKEDEP,makedepend,makedepend,nomakedep)
- if test "$MAKEDEP" = "nomakedep"; then
-- AC_MSG_ERROR(No ``makedepend'' found.)
-+ AC_CHECK_PROG(MKDEP,mkdep,mkdep,nomkdep)
-+ if test "$MKDEP" = "nomkdep"; then
-+ AC_MSG_ERROR(No ``makedepend'' or ``mkdep'' found.)
-+ fi;
-+ MAKEDEP=$MKDEP
- fi;
- AC_SUBST(MAKEDEP)
++echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
++echo "configure:1416: 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
++else
++ ac_save_LIBS="$LIBS"
++LIBS="-lossaudio $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 1424 "configure"
++#include "confdefs.h"
++
++int main() {
++main()
++; return 0; }
++EOF
++if { (eval echo configure:1431: \"$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
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
++ rm -rf conftest*
++ eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++ echo "$ac_t""yes" 1>&6
++ 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:1418: checking for $ac_word" >&5
++echo "configure:1456: 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
+@@ -1449,7 +1487,7 @@
+
+
+ echo $ac_n "checking which audio driver to install""... $ac_c" 1>&6
+-echo "configure:1453: checking which audio driver to install" >&5
++echo "configure:1491: checking which audio driver to install" >&5
+ case "$host" in
+ *linux*) cat >> confdefs.h <<\EOF
+ #define HAVE_LINUX 1
+@@ -1669,6 +1707,7 @@
+ s%@SIDPLAY_LDFLAGS@%$SIDPLAY_LDFLAGS%g
+ s%@SIDPLAY_INCLUDES@%$SIDPLAY_INCLUDES%g
+ s%@CXXCPP@%$CXXCPP%g
++s%@LIBAUDIO@%$LIBAUDIO%g
+ s%@CP@%$CP%g
+
+ CEOF
diff --git a/audio/sidplay/patches/patch-ac b/audio/sidplay/patches/patch-ac
deleted file mode 100644
index 9292ce47cd3..00000000000
--- a/audio/sidplay/patches/patch-ac
+++ /dev/null
@@ -1,1031 +0,0 @@
-$NetBSD: patch-ac,v 1.4 1999/08/22 20:32:34 frueauf Exp $
-
---- configure-orig Sun Apr 11 20:01:39 1999
-+++ configure Sun Aug 22 22:25:43 1999
-@@ -1,7 +1,7 @@
- #! /bin/sh
-
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.12
-+# Generated automatically using autoconf version 2.13
- # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
- #
- # This configure script is free software; the Free Software Foundation
-@@ -50,6 +50,7 @@
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
- # Maximum number of lines to put in a shell here document.
- ac_max_here_lines=12
-
-@@ -333,7 +334,7 @@
- verbose=yes ;;
-
- -version | --version | --versio | --versi | --vers)
-- echo "configure generated by autoconf version 2.12"
-+ echo "configure generated by autoconf version 2.13"
- exit 0 ;;
-
- -with-* | --with-*)
-@@ -503,9 +504,11 @@
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
-
-+ac_exeext=
-+ac_objext=o
- if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-@@ -562,33 +565,33 @@
-
-
- # Make sure we can run config.sub.
--if $ac_config_sub sun4 >/dev/null 2>&1; then :
-+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
- else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
- fi
-
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:571: checking host system type" >&5
-+echo "configure:574: checking host system type" >&5
-
- host_alias=$host
- case "$host_alias" in
- NONE)
- case $nonopt in
- NONE)
-- if host_alias=`$ac_config_guess`; then :
-+ if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
- else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
- fi ;;
- *) host_alias=$nonopt ;;
- esac ;;
- esac
-
--host=`$ac_config_sub $host_alias`
-+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
- host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- echo "$ac_t""$host" 1>&6
-
- echo $ac_n "checking target system type""... $ac_c" 1>&6
--echo "configure:592: checking target system type" >&5
-+echo "configure:595: checking target system type" >&5
-
- target_alias=$target
- case "$target_alias" in
-@@ -599,14 +602,14 @@
- esac ;;
- esac
-
--target=`$ac_config_sub $target_alias`
-+target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
- target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- echo "$ac_t""$target" 1>&6
-
- echo $ac_n "checking build system type""... $ac_c" 1>&6
--echo "configure:610: checking build system type" >&5
-+echo "configure:613: checking build system type" >&5
-
- build_alias=$build
- case "$build_alias" in
-@@ -617,7 +620,7 @@
- esac ;;
- esac
-
--build=`$ac_config_sub $build_alias`
-+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
- build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-@@ -630,20 +633,21 @@
-
-
-
--for ac_prog in $CCC c++ g++ gcc CC cxx cc++
-+for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:639: checking for $ac_word" >&5
-+echo "configure:642: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- if test -n "$CXX"; then
- ac_cv_prog_CXX="$CXX" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_CXX="$ac_prog"
-@@ -666,21 +670,23 @@
-
-
- echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:670: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-+echo "configure:674: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-
- ac_ext=C
- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cxx_cross
-
--cat > conftest.$ac_ext <<EOF
--#line 680 "configure"
-+cat > conftest.$ac_ext << EOF
-+
-+#line 685 "configure"
- #include "confdefs.h"
--main(){return(0);}
-+
-+int main(){return(0);}
- EOF
--if { (eval echo configure:684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- ac_cv_prog_cxx_works=yes
- # If we can't run a trivial program, we are probably using a cross compiler.
- if (./conftest; exit) 2>/dev/null; then
-@@ -698,7 +704,7 @@
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
-
- echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
-@@ -706,12 +712,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 ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:710: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:716: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
- cross_compiling=$ac_cv_prog_cxx_cross
-
- echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
--echo "configure:715: checking whether we are using GNU C++" >&5
-+echo "configure:721: checking whether we are using GNU C++" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -720,7 +726,7 @@
- yes;
- #endif
- EOF
--if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:730: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
- ac_cv_prog_gxx=yes
- else
- ac_cv_prog_gxx=no
-@@ -731,11 +737,15 @@
-
- if test $ac_cv_prog_gxx = yes; then
- GXX=yes
-- ac_test_CXXFLAGS="${CXXFLAGS+set}"
-- ac_save_CXXFLAGS="$CXXFLAGS"
-- CXXFLAGS=
-- echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
--echo "configure:739: checking whether ${CXX-g++} accepts -g" >&5
-+else
-+ GXX=
-+fi
-+
-+ac_test_CXXFLAGS="${CXXFLAGS+set}"
-+ac_save_CXXFLAGS="$CXXFLAGS"
-+CXXFLAGS=
-+echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-+echo "configure:749: checking whether ${CXX-g++} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -750,23 +760,27 @@
- fi
-
- echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
-- if test "$ac_test_CXXFLAGS" = set; then
-- CXXFLAGS="$ac_save_CXXFLAGS"
-- elif test $ac_cv_prog_cxx_g = yes; then
-+if test "$ac_test_CXXFLAGS" = set; then
-+ CXXFLAGS="$ac_save_CXXFLAGS"
-+elif test $ac_cv_prog_cxx_g = yes; then
-+ if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
- else
-- CXXFLAGS="-O2"
-+ CXXFLAGS="-g"
- fi
- else
-- GXX=
-- test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
-+ if test "$GXX" = yes; then
-+ CXXFLAGS="-O2"
-+ else
-+ CXXFLAGS=
-+ fi
- fi
-
- ac_ext=C
- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cxx_cross
-
-
-@@ -774,7 +788,7 @@
-
-
- echo $ac_n "checking for bool""... $ac_c" 1>&6
--echo "configure:778: checking for bool" >&5
-+echo "configure:792: checking for bool" >&5
- if eval "test \"`echo '$''{'ac_cv_have_bool'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -783,18 +797,18 @@
- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cxx_cross
-
- cat > conftest.$ac_ext <<EOF
--#line 791 "configure"
-+#line 805 "configure"
- #include "confdefs.h"
-
- int main() {
- bool aBool = true;
- ; return 0; }
- EOF
--if { (eval echo configure:798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_have_bool="yes"
- else
-@@ -816,7 +830,7 @@
-
-
- echo $ac_n "checking size of short int""... $ac_c" 1>&6
--echo "configure:820: checking size of short int" >&5
-+echo "configure:834: checking size of short int" >&5
- if eval "test \"`echo '$''{'ac_cv_sizeof_short_int'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -824,7 +838,7 @@
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 828 "configure"
-+#line 842 "configure"
- #include "confdefs.h"
- #ifdef __cplusplus
- extern "C" void exit(int);
-@@ -838,7 +852,7 @@
- exit(0);
- }
- EOF
--if { (eval echo configure:842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- ac_cv_sizeof_short_int=`cat conftestval`
- else
-@@ -858,7 +872,7 @@
-
-
- echo $ac_n "checking size of int""... $ac_c" 1>&6
--echo "configure:862: checking size of int" >&5
-+echo "configure:876: checking size of int" >&5
- if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -866,7 +880,7 @@
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 870 "configure"
-+#line 884 "configure"
- #include "confdefs.h"
- #ifdef __cplusplus
- extern "C" void exit(int);
-@@ -880,7 +894,7 @@
- exit(0);
- }
- EOF
--if { (eval echo configure:884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- ac_cv_sizeof_int=`cat conftestval`
- else
-@@ -900,7 +914,7 @@
-
-
- echo $ac_n "checking size of long int""... $ac_c" 1>&6
--echo "configure:904: checking size of long int" >&5
-+echo "configure:918: checking size of long int" >&5
- if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -908,7 +922,7 @@
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 912 "configure"
-+#line 926 "configure"
- #include "confdefs.h"
- #ifdef __cplusplus
- extern "C" void exit(int);
-@@ -922,7 +936,7 @@
- exit(0);
- }
- EOF
--if { (eval echo configure:926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- ac_cv_sizeof_long_int=`cat conftestval`
- else
-@@ -943,14 +957,14 @@
-
-
- echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
--echo "configure:947: checking whether byte ordering is bigendian" >&5
-+echo "configure:961: checking whether byte ordering is bigendian" >&5
- if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_cv_c_bigendian=unknown
- # See if sys/param.h defines the BYTE_ORDER macro.
- cat > conftest.$ac_ext <<EOF
--#line 954 "configure"
-+#line 968 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -961,11 +975,11 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- # It does; now see whether it defined to BIG_ENDIAN or not.
- cat > conftest.$ac_ext <<EOF
--#line 969 "configure"
-+#line 983 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -976,7 +990,7 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_c_bigendian=yes
- else
-@@ -996,7 +1010,7 @@
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 1000 "configure"
-+#line 1014 "configure"
- #include "confdefs.h"
- #ifdef __cplusplus
- extern "C" void exit(int);
-@@ -1012,7 +1026,7 @@
- exit (u.c[sizeof (long) - 1] == 1);
- }
- EOF
--if { (eval echo configure:1016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- ac_cv_c_bigendian=no
- else
-@@ -1037,7 +1051,7 @@
-
-
- echo $ac_n "checking for long file names""... $ac_c" 1>&6
--echo "configure:1041: checking for long file names" >&5
-+echo "configure:1055: checking for long file names" >&5
- if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1081,7 +1095,7 @@
- fi
-
- echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
--echo "configure:1085: checking how to run the C++ preprocessor" >&5
-+echo "configure:1099: checking how to run the C++ preprocessor" >&5
- if test -z "$CXXCPP"; then
- if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1090,17 +1104,17 @@
- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cxx_cross
- CXXCPP="${CXX-g++} -E"
- cat > conftest.$ac_ext <<EOF
--#line 1098 "configure"
-+#line 1112 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- :
- else
-@@ -1112,18 +1126,24 @@
- fi
- rm -f conftest*
- ac_cv_prog_CXXCPP="$CXXCPP"
-+ac_ext=C
-+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cxx_cross
- fi
- fi
- CXXCPP="$ac_cv_prog_CXXCPP"
- echo "$ac_t""$CXXCPP" 1>&6
-
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:1122: checking for ANSI C header files" >&5
-+echo "configure:1142: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1127 "configure"
-+#line 1147 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -1131,8 +1151,8 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
- ac_cv_header_stdc=yes
-@@ -1148,7 +1168,7 @@
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1152 "configure"
-+#line 1172 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -1166,7 +1186,7 @@
- if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1170 "configure"
-+#line 1190 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -1187,7 +1207,7 @@
- :
- else
- cat > conftest.$ac_ext <<EOF
--#line 1191 "configure"
-+#line 1211 "configure"
- #include "confdefs.h"
- #ifdef __cplusplus
- extern "C" void exit(int);
-@@ -1201,7 +1221,7 @@
- exit (0); }
-
- EOF
--if { (eval echo configure:1205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- :
- else
-@@ -1227,12 +1247,12 @@
- for ac_func in strcasecmp stricmp strncasecmp strnicmp
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1231: checking for $ac_func" >&5
-+echo "configure:1251: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1236 "configure"
-+#line 1256 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -1258,7 +1278,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1286,18 +1306,18 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1290: checking for $ac_hdr" >&5
-+echo "configure:1310: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1295 "configure"
-+#line 1315 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-@@ -1326,18 +1346,18 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1330: checking for $ac_hdr" >&5
-+echo "configure:1350: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1335 "configure"
-+#line 1355 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-@@ -1368,18 +1388,18 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1372: checking for $ac_hdr" >&5
-+echo "configure:1392: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1377 "configure"
-+#line 1397 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-@@ -1406,7 +1426,7 @@
-
-
- echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
--echo "configure:1410: checking for main in -lm" >&5
-+echo "configure:1430: checking for main in -lm" >&5
- ac_lib_var=`echo m'_'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
-@@ -1414,14 +1434,14 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lm $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1418 "configure"
-+#line 1438 "configure"
- #include "confdefs.h"
-
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:1425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1445: \"$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
-@@ -1442,7 +1462,7 @@
- fi
-
- echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
--echo "configure:1446: checking for main in -lossaudio" >&5
-+echo "configure:1466: 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
-@@ -1450,14 +1470,14 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lossaudio $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1454 "configure"
-+#line 1474 "configure"
- #include "confdefs.h"
-
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:1461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1481: \"$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
-@@ -1478,7 +1498,7 @@
- fi
-
- echo $ac_n "checking for main in -liostream""... $ac_c" 1>&6
--echo "configure:1482: checking for main in -liostream" >&5
-+echo "configure:1502: checking for main in -liostream" >&5
- ac_lib_var=`echo iostream'_'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
-@@ -1486,14 +1506,14 @@
- ac_save_LIBS="$LIBS"
- LIBS="-liostream $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1490 "configure"
-+#line 1510 "configure"
- #include "confdefs.h"
-
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1517: \"$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
-@@ -1515,19 +1535,19 @@
-
-
- echo $ac_n "checking whether standard member ios::binary is available""... $ac_c" 1>&6
--echo "configure:1519: checking whether standard member ios::binary is available" >&5
-+echo "configure:1539: checking whether standard member ios::binary is available" >&5
- if eval "test \"`echo '$''{'ac_cv_have_ios_binary'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1524 "configure"
-+#line 1544 "configure"
- #include "confdefs.h"
- #include <fstream.h>
- int main() {
- ifstream myTest(ios::in|ios::binary)
- ; return 0; }
- EOF
--if { (eval echo configure:1531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_have_ios_binary=yes
- else
-@@ -1550,15 +1570,16 @@
- # Extract the first word of "gmake", so it can be a program name with args.
- set dummy gmake; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1554: checking for $ac_word" >&5
-+echo "configure:1574: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- if test -n "$MAKE"; then
- ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_MAKE="gmake"
-@@ -1580,15 +1601,16 @@
- # Extract the first word of "gnumake", so it can be a program name with args.
- set dummy gnumake; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1584: checking for $ac_word" >&5
-+echo "configure:1605: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_MAKE2'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- if test -n "$MAKE2"; then
- ac_cv_prog_MAKE2="$MAKE2" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_MAKE2="gnumake"
-@@ -1613,15 +1635,16 @@
- # Extract the first word of "makedepend", so it can be a program name with args.
- set dummy makedepend; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1617: checking for $ac_word" >&5
-+echo "configure:1639: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_MAKEDEP'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- if test -n "$MAKEDEP"; then
- ac_cv_prog_MAKEDEP="$MAKEDEP" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_MAKEDEP="makedepend"
-@@ -1640,22 +1663,56 @@
- fi
-
- if test "$MAKEDEP" = "nomakedep"; then
-- { echo "configure: error: No ``makedepend'' found." 1>&2; exit 1; }
-+ # Extract the first word of "mkdep", so it can be a program name with args.
-+set dummy mkdep; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:1670: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_MKDEP'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ if test -n "$MKDEP"; then
-+ ac_cv_prog_MKDEP="$MKDEP" # Let the user override the test.
-+else
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ ac_cv_prog_MKDEP="mkdep"
-+ break
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+ test -z "$ac_cv_prog_MKDEP" && ac_cv_prog_MKDEP="nomkdep"
-+fi
-+fi
-+MKDEP="$ac_cv_prog_MKDEP"
-+if test -n "$MKDEP"; then
-+ echo "$ac_t""$MKDEP" 1>&6
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ if test "$MKDEP" = "nomkdep"; then
-+ { echo "configure: error: No ``makedepend'' or ``mkdep'' found." 1>&2; exit 1; }
-+ fi;
-+ MAKEDEP=$MKDEP
- fi;
-
-
- # 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:1651: checking for $ac_word" >&5
-+echo "configure:1707: 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
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_RANLIB="ranlib"
-@@ -1676,7 +1733,7 @@
- # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1680: checking for $ac_word" >&5
-+echo "configure:1737: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1684,9 +1741,13 @@
- /*)
- ac_cv_path_AR="$AR" # Let the user override the test with a path.
- ;;
-+ ?:/*)
-+ ac_cv_path_AR="$AR" # Let the user override the test with a dos path.
-+ ;;
- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_AR="$ac_dir/$ac_word"
-@@ -1708,7 +1769,7 @@
- # 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:1712: checking for $ac_word" >&5
-+echo "configure:1773: 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
-@@ -1716,9 +1777,13 @@
- /*)
- ac_cv_path_CP="$CP" # Let the user override the test with a path.
- ;;
-+ ?:/*)
-+ ac_cv_path_CP="$CP" # Let the user override the test with a dos path.
-+ ;;
- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_CP="$ac_dir/$ac_word"
-@@ -1740,7 +1805,7 @@
- # Extract the first word of "rm", so it can be a program name with args.
- set dummy rm; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1744: checking for $ac_word" >&5
-+echo "configure:1809: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1748,9 +1813,13 @@
- /*)
- ac_cv_path_RM="$RM" # Let the user override the test with a path.
- ;;
-+ ?:/*)
-+ ac_cv_path_RM="$RM" # Let the user override the test with a dos path.
-+ ;;
- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_RM="$ac_dir/$ac_word"
-@@ -1770,7 +1839,7 @@
- fi
-
- echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
--echo "configure:1774: checking whether ln -s works" >&5
-+echo "configure:1843: 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
-@@ -1797,28 +1866,30 @@
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:1805: checking for a BSD compatible install" >&5
-+echo "configure:1875: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
-+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
- for ac_dir in $PATH; do
- # Account for people who put trailing slashes in PATH elements.
- case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
-- for ac_prog in ginstall installbsd scoinst install; do
-+ # Don't use installbsd from OSF since it installs stuff as root
-+ # by default.
-+ for ac_prog in ginstall scoinst install; do
- if test -f $ac_dir/$ac_prog; then
- if test $ac_prog = install &&
- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
-- # OSF/1 installbsd also uses dspmsg, but is usable.
- :
- else
- ac_cv_path_install="$ac_dir/$ac_prog -c"
-@@ -1848,11 +1919,13 @@
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
- echo $ac_n "checking which audio driver to install""... $ac_c" 1>&6
--echo "configure:1856: checking which audio driver to install" >&5
-+echo "configure:1929: checking which audio driver to install" >&5
- case "$host" in
- *linux*) cat >> confdefs.h <<\EOF
- #define HAVE_LINUX 1
-@@ -1928,7 +2001,7 @@
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
- (set) 2>&1 |
-- case `(ac_space=' '; set) 2>&1` in
-+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote substitution
- # turns \\\\ into \\, and sed turns \\ into \).
-@@ -1995,7 +2068,7 @@
- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
- -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-- echo "$CONFIG_STATUS generated by autoconf version 2.12"
-+ echo "$CONFIG_STATUS generated by autoconf version 2.13"
- exit 0 ;;
- -help | --help | --hel | --he | --h)
- echo "\$ac_cs_usage"; exit 0 ;;
-@@ -2015,9 +2088,11 @@
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
- $ac_vpsub
- $extrasub
-+s%@SHELL@%$SHELL%g
- s%@CFLAGS@%$CFLAGS%g
- s%@CPPFLAGS@%$CPPFLAGS%g
- s%@CXXFLAGS@%$CXXFLAGS%g
-+s%@FFLAGS@%$FFLAGS%g
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
- s%@LIBS@%$LIBS%g
-@@ -2059,12 +2134,14 @@
- s%@MAKE@%$MAKE%g
- s%@MAKE2@%$MAKE2%g
- s%@MAKEDEP@%$MAKEDEP%g
-+s%@MKDEP@%$MKDEP%g
- s%@RANLIB@%$RANLIB%g
- s%@AR@%$AR%g
- s%@CP@%$CP%g
- s%@RM@%$RM%g
- s%@LN_S@%$LN_S%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
-
- CEOF
diff --git a/audio/sidplay/pkg/PLIST b/audio/sidplay/pkg/PLIST
index cea6369e91e..19860f0ef63 100644
--- a/audio/sidplay/pkg/PLIST
+++ b/audio/sidplay/pkg/PLIST
@@ -1,16 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/02/09 13:09:56 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/06/20 21:12:11 pooka Exp $
bin/sidplay
bin/sid2wav
bin/sidcon
-include/sidplay/compconf.h
-include/sidplay/config.h
-include/sidplay/emucfg.h
-include/sidplay/fformat.h
-include/sidplay/myendian.h
-include/sidplay/mytypes.h
-include/sidplay/player.h
-include/sidplay/sidtune.h
-include/sidplay/version.h
-include/sidplay/fixpoint.h
-lib/libsidplay.a
-@dirrm include/sidplay
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 18:48:28 +0000