# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1103650322 0
# Node ID a66c634b222a20f33c96b02500382ce057d878c3
# Parent  98279d92a78b0e9ee48a2f52e9f2dbc0e03e7cf5
Macro quotation cleanup to satisfy Automake 1.8 and friends.


diff -r 98279d92a78b -r a66c634b222a acinclude.m4
--- a/acinclude.m4	Tue Dec 21 16:54:05 2004 +0000
+++ b/acinclude.m4	Tue Dec 21 17:32:02 2004 +0000
@@ -7,7 +7,7 @@
 dnl Try to find a file (or one of more files in a list of dirs).
 dnl -------------------------------------------------------------------------
 
-AC_DEFUN(MY_FIND_FILE,
+AC_DEFUN([MY_FIND_FILE],
 [
 $3=""
 for i in $2; do
@@ -22,7 +22,7 @@
 
 dnl -------------------------------------------------------------------------
 
-AC_DEFUN(MY_SUBST,
+AC_DEFUN([MY_SUBST],
 dnl Substitute an instance of @$1@ with value "$2".
 dnl Example: MY_SUBST(FOO,BAR) <-> @FOO@ => BAR
 [
@@ -30,7 +30,7 @@
     AC_SUBST($1)
 ])
 
-AC_DEFUN(MY_SUBST_DEF,
+AC_DEFUN([MY_SUBST_DEF],
 dnl Substitute an instance of @$1@ with value "#define $1".
 dnl Example: MY_SUBST_DEF(FOO) <-> @FOO@ => #define FOO
 [
@@ -38,7 +38,7 @@
     AC_SUBST($1)
 ])
 
-AC_DEFUN(MY_SUBST_UNDEF,
+AC_DEFUN([MY_SUBST_UNDEF],
 dnl Substitute an instance of @$1@ with value "#undef $1".
 dnl Example: MY_SUBST_UNDEF(FOO) <-> @FOO@ => #undef FOO
 [
@@ -50,7 +50,7 @@
 dnl Pass C++ compiler options to libtool which supports C only.
 dnl -------------------------------------------------------------------------
 
-AC_DEFUN(MY_PROG_LIBTOOL,
+AC_DEFUN([MY_PROG_LIBTOOL],
 [
     xs_save_cc="$CC"
     xs_save_cflags="$CFLAGS"
@@ -63,7 +63,7 @@
 
 dnl -------------------------------------------------------------------------
 
-AC_DEFUN(MY_TRY_LINK_SAVE,
+AC_DEFUN([MY_TRY_LINK_SAVE],
 [
     xs_cxx_save="$CXX"
     xs_cxxflags_save="$CXXFLAGS"
@@ -72,7 +72,7 @@
 ])
 
 
-AC_DEFUN(MY_TRY_LINK_RESTORE,
+AC_DEFUN([MY_TRY_LINK_RESTORE],
 [
     CXX="$xs_cxx_save"
     CXXFLAGS="$xs_cxxflags_save"
@@ -81,20 +81,20 @@
 ])
 
 
-AC_DEFUN(MY_PROG_PKGCONFIG,
+AC_DEFUN([MY_PROG_PKGCONFIG],
 [
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, "")
+    AC_PATH_PROG([PKG_CONFIG], [pkg-config])
 ])
 
 
-AC_DEFUN(MY_NEED_PKGCONFIG,
+AC_DEFUN([MY_NEED_PKGCONFIG],
 [
     AC_REQUIRE([MY_PROG_PKGCONFIG])
     if test -z "$PKG_CONFIG"; then
-        AC_MSG_ERROR([pkg-config not found. See http://pkgconfig.sourceforge.net])
+        AC_MSG_ERROR([[pkg-config not found. See http://pkgconfig.sourceforge.net]])
     fi
     if ! $PKG_CONFIG --atleast-pkgconfig-version 0.5 ; then
-        AC_MSG_ERROR([pkg-config too old; version 0.5 or better required.])
+        AC_MSG_ERROR([[pkg-config too old; version 0.5 or better required.]])
     fi
 ])
 
@@ -105,11 +105,11 @@
 dnl @SIDPLAY1_INCLUDES@ will be substituted with compiler parameters
 dnl -------------------------------------------------------------------------
 
-AC_DEFUN(XS_PATH_LIBSIDPLAY1,
+AC_DEFUN([XS_PATH_LIBSIDPLAY1],
 [
     AC_MSG_CHECKING([for working SIDPlay1 library and headers])
 
-    AC_LANG_PUSH(C++)
+    AC_LANG_PUSH([C++])
     
     # Use include path given by user (if any).
     if test -n "$xs_sidplay1_includes"; then
@@ -150,18 +150,18 @@
 
     SIDPLAY1_LDADD="$xs_sidplay1_ldflags -lsidplay"
     SIDPLAY1_INCLUDES="$xs_sidplay1_cxxflags"
-    AC_SUBST(SIDPLAY1_LDADD)
-    AC_SUBST(SIDPLAY1_INCLUDES)
+    AC_SUBST([SIDPLAY1_LDADD])
+    AC_SUBST([SIDPLAY1_INCLUDES])
     else
         AC_MSG_RESULT([no])
     fi
 
-    AC_LANG_POP(C++)
+    AC_LANG_POP([C++])
 ])
 
 dnl Functions used by XS_PATH_LIBSIDPLAY1.
 
-AC_DEFUN(MY_FIND_LIBSIDPLAY1,
+AC_DEFUN([MY_FIND_LIBSIDPLAY1],
 [
     # Search common locations where header files might be stored.
     xs_sidplay1_incdirs="$xs_sidplay1_includes /usr/include /usr/local/include /usr/lib/sidplay/include /usr/local/lib/sidplay/include /opt/sfw/include /opt/csw/include"
@@ -186,7 +186,7 @@
     fi
 ])
 
-AC_DEFUN(MY_TRY_LIBSIDPLAY1,
+AC_DEFUN([MY_TRY_LIBSIDPLAY1],
 [
     MY_TRY_LINK_SAVE
 
@@ -211,11 +211,11 @@
 dnl @SIDPLAY_LDADD@ will be substituted with linker parameters
 dnl @SIDPLAY_INCLUDES@ will be substituted with compiler parameters
 dnl -------------------------------------------------------------------------
-AC_DEFUN(XS_PATH_LIBSIDPLAY2,
+AC_DEFUN([XS_PATH_LIBSIDPLAY2],
 [
     AC_MSG_CHECKING([for working SIDPlay2 library and headers])
 
-    AC_LANG_PUSH(C++)
+    AC_LANG_PUSH([C++])
     
     AC_REQUIRE([MY_PROG_PKGCONFIG])
     if test -n "$PKG_CONFIG" && $PKG_CONFIG --atleast-version $LIBSIDPLAY2_REQUIRED_VERSION libsidplay2; then
@@ -256,18 +256,18 @@
 
     SIDPLAY2_LDADD="$xs_sidplay2_ldadd"
     SIDPLAY2_INCLUDES="$xs_sidplay2_cxxflags"
-    AC_SUBST(SIDPLAY2_LDADD)
-    AC_SUBST(SIDPLAY2_INCLUDES)
+    AC_SUBST([SIDPLAY2_LDADD])
+    AC_SUBST([SIDPLAY2_INCLUDES])
     else
         AC_MSG_RESULT([no])
     fi
 
-    AC_LANG_POP(C++)
+    AC_LANG_POP([C++])
 ])
 
 
 dnl Functions used by XS_PATH_LIBSIDPLAY2.
-AC_DEFUN(MY_FIND_LIBSIDPLAY2,
+AC_DEFUN([MY_FIND_LIBSIDPLAY2],
 [
     # See whether user didn't provide paths.
     if test -z "$xs_sidplay2_includes"; then
@@ -315,7 +315,7 @@
 ])
 
 
-AC_DEFUN(MY_TRY_LIBSIDPLAY2,
+AC_DEFUN([MY_TRY_LIBSIDPLAY2],
 [
     MY_TRY_LINK_SAVE
 
@@ -339,11 +339,11 @@
 dnl @BUILDERS_INCLUDES@
 dnl @BUILDERS_LDFLAGS@
 dnl -------------------------------------------------------------------------
-AC_DEFUN(BUILDERS_FIND,
+AC_DEFUN([BUILDERS_FIND],
 [
     AC_MSG_CHECKING([for SIDPlay2 builders directory])
 
-    AC_LANG_PUSH(C++)
+    AC_LANG_PUSH([C++])
 
     AC_REQUIRE([XS_PATH_LIBSIDPLAY2])
 
@@ -399,10 +399,10 @@
         ])
     fi
 
-    AC_SUBST(BUILDERS_INCLUDES)
-    AC_SUBST(BUILDERS_LDFLAGS)
+    AC_SUBST([BUILDERS_INCLUDES])
+    AC_SUBST([BUILDERS_LDFLAGS])
 
-    AC_LANG_POP(C++)
+    AC_LANG_POP([C++])
 ])
 
 
@@ -410,10 +410,10 @@
 dnl Test for working reSID builder.
 dnl sets $(RESID_LDADD), substitutes @RESID_LDADD@
 dnl -------------------------------------------------------------------------
-AC_DEFUN(BUILDERS_FIND_RESID,
+AC_DEFUN([BUILDERS_FIND_RESID],
 [
     AC_MSG_CHECKING([for reSID builder module])
-    AC_LANG_PUSH(C++)
+    AC_LANG_PUSH([C++])
     MY_TRY_LINK_SAVE
     
     CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
@@ -437,8 +437,8 @@
         RESID_LDADD="-lresid-builder"
     fi
     AC_MSG_RESULT($builders_work)
-    AC_SUBST(RESID_LDADD)
-    AC_LANG_POP(C++)
+    AC_SUBST([RESID_LDADD])
+    AC_LANG_POP([C++])
 ])
 
 
@@ -446,10 +446,10 @@
 dnl Test for working HardSID builder.
 dnl sets $(HARDSID_LDADD), substitutes @HARDSID_LDADD@
 dnl -------------------------------------------------------------------------
-AC_DEFUN(BUILDERS_FIND_HARDSID,
+AC_DEFUN([BUILDERS_FIND_HARDSID],
 [
     AC_MSG_CHECKING([for HardSID builder module])
-    AC_LANG_PUSH(C++)
+    AC_LANG_PUSH([C++])
     MY_TRY_LINK_SAVE
 
     CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
@@ -473,8 +473,8 @@
         HARDSID_LDADD="-lhardsid-builder"
     fi
     AC_MSG_RESULT($builders_work)
-    AC_SUBST(HARDSID_LDADD)
-    AC_LANG_POP(C++)
+    AC_SUBST([HARDSID_LDADD])
+    AC_LANG_POP([C++])
 ])
 
 
diff -r 98279d92a78b -r a66c634b222a configure.in
--- a/configure.in	Tue Dec 21 16:54:05 2004 +0000
+++ b/configure.in	Tue Dec 21 17:32:02 2004 +0000
@@ -3,7 +3,7 @@
 dnl ***
 
 dnl Require autoconf 2.56 or later
-AC_PREREQ(2.56)
+AC_PREREQ([2.56])
 
 dnl Initialize
 AC_INIT([XMMS-SID], [0.8.0beta14], [ccr@tnsp.org])
@@ -27,7 +27,7 @@
 dnl ***
 dnl *** Some general checks
 dnl ***
-AC_PREFIX_PROGRAM(xmms)
+AC_PREFIX_PROGRAM([xmms])
 AC_DISABLE_STATIC
 AC_LIBTOOL_DLOPEN
 AC_LIB_RPATH