diff --git a/Makefile.in b/Makefile.in
index b9bb715..8d91388 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,9 +100,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff --git a/aclocal.m4 b/aclocal.m4
index f6eb2a8..0dc45c2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -20,221 +20,6 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
-        ])
-elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
-AC_DEFUN([PKG_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([pkgconfigdir],
-    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-    [with_pkgconfigdir=]pkg_default)
-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
-
-
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([noarch-pkgconfigdir],
-    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-    [with_noarch_pkgconfigdir=]pkg_default)
-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
-
-
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
-AC_DEFUN([PKG_CHECK_VAR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-
-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-AS_VAR_COPY([$1], [pkg_cv_][$1])
-
-AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
-
 # Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -1445,6 +1230,7 @@ m4_include([macros/ltsugar.m4])
 m4_include([macros/ltversion.m4])
 m4_include([macros/lt~obsolete.m4])
 m4_include([macros/ogg.m4])
+m4_include([macros/pkg.m4])
 m4_include([macros/progtest.m4])
 m4_include([macros/sdl2.m4])
 m4_include([macros/vorbis.m4])
diff --git a/configure b/configure
index f834218..869e30a 100755
--- a/configure
+++ b/configure
@@ -17346,8 +17346,6 @@ rm -f core conftest.err conftest.$ac_objext \
 
   rm -f conf.sdltest
 
-  LIBS=$SDL_LIBS
-  CFLAGS=$SDL_CFLAGS
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL_NumJoysticks in -lSDL" >&5
 $as_echo_n "checking for SDL_NumJoysticks in -lSDL... " >&6; }
 if ${ac_cv_lib_SDL_SDL_NumJoysticks+:} false; then :
diff --git a/configure.ac b/configure.ac
index 776533c..29473c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -586,8 +586,6 @@ AC_ARG_ENABLE(sdl,
 	  [ enable_sdl=no ])
 if test "x$enable_sdl" = xyes ; then
   AM_PATH_SDL2(2.0.0,have_sdl=yes,have_sdl=no)
-  LIBS=$SDL_LIBS
-  CFLAGS=$SDL_CFLAGS
   AC_CHECK_LIB(SDL,SDL_NumJoysticks,have_sdljoy=yes)
 fi
 if test "x$have_sdl" = xyes ; then
diff --git a/macros/Makefile.am b/macros/Makefile.am
index e2ef852..f478f03 100644
--- a/macros/Makefile.am
+++ b/macros/Makefile.am
@@ -27,6 +27,7 @@ MACROS= \
   ltsugar.m4 \
   ltversion.m4 \
   ogg.m4 \
+  pkg.m4 \
   progtest.m4 \
   sdl2.m4 \
   stdint_h.m4 \
diff --git a/macros/Makefile.in b/macros/Makefile.in
index 2267505..981af34 100644
--- a/macros/Makefile.in
+++ b/macros/Makefile.in
@@ -95,9 +95,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -346,6 +346,7 @@ MACROS = \
   ltsugar.m4 \
   ltversion.m4 \
   ogg.m4 \
+  pkg.m4 \
   progtest.m4 \
   sdl2.m4 \
   stdint_h.m4 \
diff --git a/macros/pkg.m4 b/macros/pkg.m4
new file mode 100644
index 0000000..c5b26b5
--- /dev/null
+++ b/macros/pkg.m4
@@ -0,0 +1,214 @@
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
diff --git a/modules/AliceLogo/Makefile.in b/modules/AliceLogo/Makefile.in
index fcd3610..4bece28 100644
--- a/modules/AliceLogo/Makefile.in
+++ b/modules/AliceLogo/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/Confirm/Makefile.in b/modules/Confirm/Makefile.in
index e702e4c..55e474a 100644
--- a/modules/Confirm/Makefile.in
+++ b/modules/Confirm/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/Gpx/Makefile.in b/modules/Gpx/Makefile.in
index 24b8414..d9d49c9 100644
--- a/modules/Gpx/Makefile.in
+++ b/modules/Gpx/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/Makefile.in b/modules/Makefile.in
index c5c20c5..4229fe5 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -95,9 +95,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/Math/Makefile.in b/modules/Math/Makefile.in
index 7d90873..dcc4683 100644
--- a/modules/Math/Makefile.in
+++ b/modules/Math/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/MsgSkip/Makefile.in b/modules/MsgSkip/Makefile.in
index 92c0566..fc1ead4 100644
--- a/modules/MsgSkip/Makefile.in
+++ b/modules/MsgSkip/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/NIGHTDLL/Makefile.in b/modules/NIGHTDLL/Makefile.in
index c9125b2..4f4957b 100644
--- a/modules/NIGHTDLL/Makefile.in
+++ b/modules/NIGHTDLL/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/NightDemonDemo/Makefile.in b/modules/NightDemonDemo/Makefile.in
index 815b023..03574e6 100644
--- a/modules/NightDemonDemo/Makefile.in
+++ b/modules/NightDemonDemo/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/RandMT/Makefile.in b/modules/RandMT/Makefile.in
index 35ce0b7..f132a7c 100644
--- a/modules/RandMT/Makefile.in
+++ b/modules/RandMT/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/SACT/Makefile.in b/modules/SACT/Makefile.in
index 3606424..74e9866 100644
--- a/modules/SACT/Makefile.in
+++ b/modules/SACT/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/ShArray/Makefile.in b/modules/ShArray/Makefile.in
index 05eb7ce..fb2b3a6 100644
--- a/modules/ShArray/Makefile.in
+++ b/modules/ShArray/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/ShCalc/Makefile.in b/modules/ShCalc/Makefile.in
index c9c133e..db2b226 100644
--- a/modules/ShCalc/Makefile.in
+++ b/modules/ShCalc/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/ShGraph/Makefile.in b/modules/ShGraph/Makefile.in
index 4f1c506..4ae7f4e 100644
--- a/modules/ShGraph/Makefile.in
+++ b/modules/ShGraph/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/ShPort/Makefile.in b/modules/ShPort/Makefile.in
index 7a82614..e5f4687 100644
--- a/modules/ShPort/Makefile.in
+++ b/modules/ShPort/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/ShSound/Makefile.in b/modules/ShSound/Makefile.in
index 3cb3538..362c2fe 100644
--- a/modules/ShSound/Makefile.in
+++ b/modules/ShSound/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/ShString/Makefile.in b/modules/ShString/Makefile.in
index b625792..37968fd 100644
--- a/modules/ShString/Makefile.in
+++ b/modules/ShString/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/dDemo/Makefile.in b/modules/dDemo/Makefile.in
index 634f6ca..0104199 100644
--- a/modules/dDemo/Makefile.in
+++ b/modules/dDemo/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/eDemo/Makefile.in b/modules/eDemo/Makefile.in
index 7200c9a..8b23388 100644
--- a/modules/eDemo/Makefile.in
+++ b/modules/eDemo/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/eeDemo/Makefile.in b/modules/eeDemo/Makefile.in
index 7284906..3f5fe2b 100644
--- a/modules/eeDemo/Makefile.in
+++ b/modules/eeDemo/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/lib/Makefile.in b/modules/lib/Makefile.in
index 93d3161..acba61e 100644
--- a/modules/lib/Makefile.in
+++ b/modules/lib/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/nDEMO/Makefile.in b/modules/nDEMO/Makefile.in
index c841fbf..ad867dd 100644
--- a/modules/nDEMO/Makefile.in
+++ b/modules/nDEMO/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/nDEMOE/Makefile.in b/modules/nDEMOE/Makefile.in
index f56c37c..8f32704 100644
--- a/modules/nDEMOE/Makefile.in
+++ b/modules/nDEMOE/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/oDEMO/Makefile.in b/modules/oDEMO/Makefile.in
index c513286..ae66f08 100644
--- a/modules/oDEMO/Makefile.in
+++ b/modules/oDEMO/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/oujimisc/Makefile.in b/modules/oujimisc/Makefile.in
index 4f0601d..2e22066 100644
--- a/modules/oujimisc/Makefile.in
+++ b/modules/oujimisc/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/modules/tDemo/Makefile.in b/modules/tDemo/Makefile.in
index c09ff0a..6754752 100644
--- a/modules/tDemo/Makefile.in
+++ b/modules/tDemo/Makefile.in
@@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/src/Makefile.in b/src/Makefile.in
index de80736..3216bcb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -101,9 +101,9 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
 	$(top_srcdir)/macros/ltsugar.m4 \
 	$(top_srcdir)/macros/ltversion.m4 \
 	$(top_srcdir)/macros/lt~obsolete.m4 \
-	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/progtest.m4 \
-	$(top_srcdir)/macros/sdl2.m4 $(top_srcdir)/macros/vorbis.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/macros/ogg.m4 $(top_srcdir)/macros/pkg.m4 \
+	$(top_srcdir)/macros/progtest.m4 $(top_srcdir)/macros/sdl2.m4 \
+	$(top_srcdir)/macros/vorbis.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs