Imported Upstream version 3.5

1 files changed, 51 insertions, 235 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 3f51012..157258c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,133 +1,3 @@
-dnl ** AUD_CHECK_MODULE([define name], [module], [version required],
-dnl **     [informational name], [additional error message])
-dnl **
-dnl ** Works like PKG_CHECK_MODULES, but provides an informative
-dnl ** error message if the package is not found. NOTICE! Unlike
-dnl ** PKG_C_M, this macro ONLY supports one module name!
-dnl **
-dnl ** AUD_CHECK_MODULE([GLIB], [gtk+-2.0], [>= 2.8.0], [Gtk+2], [See http://www.gtk.org/])
-AC_DEFUN([AUD_CHECK_MODULE], [
-    PKG_CHECK_MODULES([$1], [$2 $3], [
-    ],[
-        PKG_CHECK_EXISTS([$2], [
-            cv_pkg_version=`$PKG_CONFIG --modversion "$2" 2>/dev/null`
-            AC_MSG_ERROR([[
-$4 version $cv_pkg_version was found, but $2 $3 is required.
-$5]])
-        ],[
-            AC_MSG_ERROR([[
-Cannot find $4! If you are using binary packages based system, check that you
-have the corresponding -dev/devel packages installed.
-$5]])
-        ])
-    ])
-])
-
-
-dnl ** AUD_CONDITIONAL([symbol], [variable to test][, value])
-dnl ** Simplifying wrapper for AM_CONDITIONAL.
-dnl **
-dnl ** AUD_CONDITIONAL([FOO], [foo])
-AC_DEFUN([AUD_CONDITIONAL],
-[if test "x${$2}" = m4_ifval([$3], ["x$3"],["xyes"]) ; then
-    $1="yes"
-else
-    $1="no"
-fi
-AC_SUBST([$1])dnl
-])
-
-
-dnl ** Simple wrapper for AC_ARG_ENABLE
-dnl ** AUD_ARG_ENABLE([name], [default value], [help string], [if enabled], [if disabled])
-AC_DEFUN([AUD_ARG_ENABLE], [dnl
-define([Name], [translit([$1], [./-], [___])])dnl
-define([cBasce], [ifelse([$2],[yes],[Disable],[Enable]) $3 (def: ifelse([$2],[yes],[enabled],[disabled]))])dnl
-    AC_ARG_ENABLE([$1], [AS_HELP_STRING([ifelse([$2],[yes],[--disable-$1],[--enable-$1])], cBasce)],, [enable_[]Name=$2])
-    if test "x${enable_[]Name}" = "xyes"; then
-        m4_ifvaln([$4], [$4], [:])dnl
-        m4_ifvaln([$5], [else $5])dnl
-    fi
-])
-
-
-AC_DEFUN([AUD_ARG_SIMPLE], [dnl
-define([Name], [translit([$1], [./-], [___])])dnl
-define([cBasce], [ifelse([$2],[yes],[Disable],[Enable]) $3 (def: ifelse([$2],[yes],[enabled],[disabled]))])dnl
-    AC_ARG_ENABLE([$1], [AS_HELP_STRING([ifelse([$2],[yes],[--disable-$1],[--enable-$1])], cBasce)],, [enable_[]Name=$2])
-    if test "x${enable_[]Name}" = "xyes"; then
-        AC_DEFINE([$4], [$5], [$6])
-    fi
-    AUD_CONDITIONAL([$4], [enable_$1])
-    AC_SUBST([$4])
-])
-
-
-dnl ** Wrapper for cached compilation check
-dnl ** AUD_TRY_COMPILE([message], [result variable], [includes], [body], [if ok], [if not ok])
-AC_DEFUN([AUD_TRY_COMPILE], [dnl
-    AC_CACHE_CHECK([$1], [$2],
-    [AC_TRY_COMPILE([$3], [$4], [$2="yes"], [$2="no"])])
-    if test "x${$2}" = "xyes"; then
-        m4_ifvaln([$5], [$5], [:])dnl
-        m4_ifvaln([$6], [else $6])dnl
-    fi
-])
-
-
-dnl ** Check for GNU make
-AC_DEFUN([AUD_CHECK_GNU_MAKE],[
-    AC_CACHE_CHECK([for GNU make],_cv_gnu_make_command,[
-    _cv_gnu_make_command=""
-    for a in "$MAKE" make gmake gnumake; do
-        test "x$a" = "x" && continue
-        if ( sh -c "$a --version" 2>/dev/null | grep "GNU Make" >/dev/null ) ; then
-            _cv_gnu_make_command="$a"
-            break
-        fi
-    done
-    ])
-    if test "x$_cv_gnu_make_command" != "x" ; then
-        MAKE="$_cv_gnu_make_command"
-    else
-        AC_MSG_ERROR([** GNU make not found. If it is installed, try setting MAKE environment variable. **])
-    fi
-    AC_SUBST([MAKE])dnl
-])dnl
-
-
-dnl *** Define plugin directories
-AC_DEFUN([AUD_DEFINE_PLUGIN_DIR],[dnl
-define([Name], [translit([$1], [a-z], [A-Z])])dnl
-if test "x$enable_one_plugin_dir" = "xyes"; then
-ifdef([aud_plugin_dirs_defined],[],
-[    pluginsubs="\\\"Plugins\\\""
-])dnl
-    Name[]_PLUGIN_DIR="Plugins"
-else
-    ifdef([aud_def_plugin_dirs_defined],
-    [pluginsubs="$pluginsubs,\\\"$1\\\""],
-    [pluginsubs="\\\"$1\\\""])
-    Name[]_PLUGIN_DIR="$1"
-fi
-AC_SUBST(Name[]_PLUGIN_DIR)dnl
-define([aud_def_plugin_dirs_defined],[1])dnl
-])dnl
-
-
-dnl *** Get plugin directories
-AC_DEFUN([AUD_GET_PLUGIN_DIR],[dnl
-define([Name], [translit([$1_plugin_dir], [A-Z], [a-z])])dnl
-define([BigName], [translit([$1], [a-z], [A-Z])])dnl
-ifdef([aud_get_plugin_dirs_defined],
-[pluginsubs="$pluginsubs,\\\"$1\\\""],
-[pluginsubs="\\\"$1\\\""])
-BigName[]_PLUGIN_DIR=`pkg-config audacious --variable=[]Name[]`
-AC_SUBST(BigName[]_PLUGIN_DIR)dnl
-define([aud_get_plugin_dirs_defined],[1])dnl
-])dnl
-
-
 dnl Add $1 to CFLAGS and CXXFLAGS if supported
 dnl ------------------------------------------
 
@@ -155,7 +25,6 @@ dnl Check for C and C++ compilers
 dnl =============================
 AC_REQUIRE([AC_PROG_CC])
 AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AM_PROG_AS])
 AC_REQUIRE([AC_C_BIGENDIAN])
 AC_REQUIRE([AC_SYS_LARGEFILE])
 
@@ -165,29 +34,53 @@ if test "x$GCC" = "xyes"; then
     AUD_CHECK_CFLAGS(-Wtype-limits)
 fi
 
-dnl Enable "-Wl,-z,defs" only on Linux
-dnl ==============================
-AC_MSG_CHECKING([for Linux])
+dnl Check platform
+dnl ==============
+
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
+AC_MSG_CHECKING([operating system type])
+
+HAVE_LINUX=no
+HAVE_MSWINDOWS=no
+
 case "$target" in
     *linux*)
-        AC_MSG_RESULT([yes])
-        LDFLAGS="$LDFLAGS -Wl,-z,defs"
+        AC_MSG_RESULT(Linux)
+        HAVE_LINUX=yes
+        ;;
+    *mingw*)
+        AC_MSG_RESULT(Windows)
+        HAVE_MSWINDOWS=yes
         ;;
     *)
-        AC_MSG_RESULT([no])
+        AC_MSG_RESULT(other UNIX)
         ;;
 esac
 
+AC_SUBST(HAVE_MSWINDOWS)
+AC_SUBST(HAVE_LINUX)
+
+dnl Enable "-Wl,-z,defs" only on Linux
+dnl ==================================
+if test $HAVE_LINUX = yes ; then
+	LDFLAGS="$LDFLAGS -Wl,-z,defs"
+fi
+
+dnl MinGW needs -march=i686 for atomics
+dnl ===================================
+if test $HAVE_MSWINDOWS = yes ; then
+	CFLAGS="$CFLAGS -march=i686"
+fi
+
 dnl Checks for various programs
 dnl ===========================
-AUD_CHECK_GNU_MAKE
 AC_PROG_LN_S
-AC_PROG_MAKE_SET
 AC_PATH_PROG([RM], [rm])
 AC_PATH_PROG([MV], [mv])
 AC_PATH_PROG([CP], [cp])
 AC_PATH_PROG([AR], [ar])
-AC_PATH_PROG([TR], [tr])
 AC_PATH_PROG([RANLIB], [ranlib])
 AC_PATH_PROG([WINDRES], [windres])
 
@@ -195,103 +88,26 @@ dnl Check for POSIX threads
 dnl =======================
 AC_SEARCH_LIBS([pthread_create], [pthread])
 
-dnl Check for Gtk+/GLib and pals
-dnl ============================
-AUD_CHECK_MODULE([GLIB], [glib-2.0], [>= 2.28], [Glib2])
-AUD_CHECK_MODULE([GMODULE], [gmodule-2.0], [>= 2.28], [GModule])
-AUD_CHECK_MODULE([GTHREAD], [gthread-2.0], [>= 2.28], [GThread])
-AUD_CHECK_MODULE([PANGO], [pango], [>= 1.20], [Pango])
-AUD_CHECK_MODULE([CAIRO], [cairo], [>= 1.6], [Cairo])
-AUD_CHECK_MODULE([GTK], [gtk+-3.0], [>= 3.0.0], [GTK+])
-
-])
-
-
-dnl **
-dnl ** Plugin helper macros
-dnl **
-
-dnl ** Unconditionally add a plugin to "build these" list
-AC_DEFUN([AUD_PLUGIN_ADD], [dnl
-define([Name], [translit([$1], [A-Z./-], [a-z___])])dnl
-have_[]Name="yes"; res_short_[]Name="$1"
-res_desc_[]Name="$3"; ifdef([aud_def_plugin_$2], [$2[]_PLUGINS="${$2[]_PLUGINS} $1"], [$2[]_PLUGINS="$1"])dnl
-define([aud_def_plugin_$2],[1])dnl
-])
-
-
-dnl ** Generic template for macros below
-AC_DEFUN([AUD_PLUGIN_CHK], [dnl
-define([cBasce], [ifelse([$3],[yes],[Disable],[Enable]) $5 (def: ifelse([$3],[yes],[enabled],[disabled]))])dnl
-AC_ARG_ENABLE([$1], [AS_HELP_STRING([ifelse([$3],[yes],[--disable-$1],[--enable-$1])], cBasce)],, [enable_$2="$3"])dnl
-    have_$2="no"
-    if test "x${enable_$2}" = "xyes"; then
-        m4_ifvaln([$6], [$6], [:])
-        if test "x${have_$2}" = "xyes"; then
-            m4_ifvaln([$7], [$7], [:])dnl
-        else
-            res_msg_$2="(not found)"
-            m4_ifvaln([$8], [$8], [:])dnl
-        fi
-    else
-        res_msg_$2="(disabled)"
-        m4_ifvaln([$9], [$9], [:])dnl
-    fi
-])
-
-
-dnl ** Add a plugin based on --enable/--disable options
-AC_DEFUN([AUD_PLUGIN_CHECK_SIMPLE], [dnl
-define([cBasce], [ifelse([$2],[yes],[Disable],[Enable]) $6 (def: ifelse([$2],[yes],[enabled],[disabled]))])dnl
-AC_ARG_ENABLE([$1], [AS_HELP_STRING([ifelse([$2],[yes],[--disable-$1],[--enable-$1])], cBasce)],, [enable_$2="$3"])dnl
-    have_$2="no"
-    if test "x${enable_$2}" = "xyes"; then
-        m4_ifvaln([$6], [$6], [:])
-    else
-        res_msg_$2="(disabled)"
-        m4_ifvaln([$7], [$7], [:])dnl
-    fi
-])
-
-
-dnl ** Check and enable a plugin with a pkg-config check
-AC_DEFUN([AUD_PLUGIN_CHECK_PKG], [dnl
-define([Name], [translit([$1], [A-Z./-], [a-z___])])dnl
-define([BigN], [translit([$1], [a-z./-], [A-Z___])])dnl
-    AUD_PLUGIN_CHK([$1], Name, [$2], [$4], [$6], [dnl
-        PKG_CHECK_MODULES([]BigN, [$7], [have_[]Name[]="yes"], [have_[]Name[]="no"])
-    ], [
-    AUD_PLUGIN_ADD([$5], [$3])
-    m4_ifvaln([$8], [$8])
-    ], [$9], [$10])
-])
+dnl Check for GTK+ and pals
+dnl =======================
 
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32)
+PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= 2.32)
+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4)
 
-dnl ** Check and enable a plugin with a header files check
-AC_DEFUN([AUD_PLUGIN_CHECK_HEADERS], [
-define([Name], [translit([$1], [A-Z./-], [a-z___])])dnl
-    AUD_PLUGIN_CHK([$1], Name, [$2], [$4], [$6], [
-        AC_CHECK_HEADERS([$7], [have_[]Name[]="yes"], [have_[]Name[]="no"])
-    ], [
-    AUD_PLUGIN_ADD([$5], [$3])
-    m4_ifvaln([$8], [$8])
-    ], [$9], [$10])
-])
+if test $HAVE_MSWINDOWS = yes ; then
+    PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.32)
+else
+	PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32)
+fi
 
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+AC_SUBST(GIO_CFLAGS)
+AC_SUBST(GIO_LIBS)
+AC_SUBST(GMODULE_CFLAGS)
+AC_SUBST(GMODULE_LIBS)
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
 
-dnl ** Check and enable a plugin with a complex check
-AC_DEFUN([AUD_PLUGIN_CHECK_COMPLEX], [
-# CHECK_COMPLEX #1 : $1
-define([Name], [translit([$1], [A-Z./-], [a-z___])])dnl
-    AUD_PLUGIN_CHK([$1], Name, [$2], [$4], [$6], [
-# CHECK_COMPLEX #2 BEGIN
-        $7
-# CHECK_COMPLEX #2 END
-    ], [
-# CHECK_COMPLEX #3 BEGIN
-    AUD_PLUGIN_ADD([$5], [$3])
-    m4_ifvaln([$8], [$8])
-# CHECK_COMPLEX #3 END
-    ], [$9], [$10])
-# CHECK_COMPLEX #4 END
 ])