File sidplay-2.0.9.dif of Package sidplay

--- Makefile.am
+++ Makefile.am
@@ -1,4 +1,4 @@
-
+ACLOCAL_AMFLAGS = -I unix
 AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = doc unix src
--- configure.ac
+++ configure.ac
@@ -15,6 +15,7 @@ AC_PROG_CXX
 dnl Initialise Libtool.
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
+m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_BIGENDIAN
--- unix/my_macros.m4
+++ unix/my_macros.m4
@@ -80,8 +80,8 @@ AC_DEFUN([MY_CHECK_IOS_BIN],
     AC_CACHE_VAL(test_cv_have_ios_binary,
     [
         AC_TRY_COMPILE(
-            [#include <fstream.h>],
-            [ifstream myTest(ios::in|ios::binary);],
+            [#include <fstream>],
+            [std::ifstream myTest("foo", std::ios::in|std::ios::binary);],
             [test_cv_have_ios_binary=yes],
             [test_cv_have_ios_binary=no]
         )
@@ -105,9 +105,9 @@ AC_DEFUN([MY_CHECK_IOS_OPENMODE],
     AC_CACHE_VAL(test_cv_have_ios_openmode,
     [
         AC_TRY_COMPILE(
-            [#include <fstream.h>
-             #include <iomanip.h>],
-            [ios::openmode myTest = ios::in;],
+            [#include <fstream>
+             #include <iomanip>],
+            [std::ios::openmode myTest = std::ios::in;],
             [test_cv_have_ios_openmode=yes],
             [test_cv_have_ios_openmode=no]
         )
@@ -131,8 +131,8 @@ AC_DEFUN([MY_CHECK_EXCEPTIONS],
     AC_CACHE_VAL(test_cv_have_exceptions,
     [
         AC_TRY_COMPILE(
-            [#include <new.h>],
-            [char* buf = new(nothrow) char[1024];],
+            [#include <new>],
+            [char* buf = new(std::nothrow) char[1024];],
             [test_cv_have_exceptions=yes],
             [test_cv_have_exceptions=no]
         )
@@ -161,7 +161,7 @@ AC_DEFUN([MY_TRY_COMPILE],
 
     CXXFLAGS="$CXXFLAGS $1"
     LDFLAGS="$LDFLAGS $2"
-    CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
+    CXX="${SHELL-/bin/sh} ./libtool --mode=link $CXX"
 
     AC_TRY_LINK(
         [#include <$3>],