Commit 9f04ff69 authored by Andrej Shadura's avatar Andrej Shadura

Imported Upstream version 3.5

parent e8535aeb
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 Add $1 to CFLAGS and CXXFLAGS if supported
dnl ------------------------------------------ dnl ------------------------------------------
...@@ -155,7 +25,6 @@ dnl Check for C and C++ compilers ...@@ -155,7 +25,6 @@ dnl Check for C and C++ compilers
dnl ============================= dnl =============================
AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_PROG_CXX]) AC_REQUIRE([AC_PROG_CXX])
AC_REQUIRE([AM_PROG_AS])
AC_REQUIRE([AC_C_BIGENDIAN]) AC_REQUIRE([AC_C_BIGENDIAN])
AC_REQUIRE([AC_SYS_LARGEFILE]) AC_REQUIRE([AC_SYS_LARGEFILE])
...@@ -165,29 +34,53 @@ if test "x$GCC" = "xyes"; then ...@@ -165,29 +34,53 @@ if test "x$GCC" = "xyes"; then
AUD_CHECK_CFLAGS(-Wtype-limits) AUD_CHECK_CFLAGS(-Wtype-limits)
fi fi
dnl Enable "-Wl,-z,defs" only on Linux dnl Check platform
dnl ============================== dnl ==============
AC_MSG_CHECKING([for Linux])
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AC_MSG_CHECKING([operating system type])
HAVE_LINUX=no
HAVE_MSWINDOWS=no
case "$target" in case "$target" in
*linux*) *linux*)
AC_MSG_RESULT([yes]) AC_MSG_RESULT(Linux)
LDFLAGS="$LDFLAGS -Wl,-z,defs" HAVE_LINUX=yes
;;
*mingw*)
AC_MSG_RESULT(Windows)
HAVE_MSWINDOWS=yes
;; ;;
*) *)
AC_MSG_RESULT([no]) AC_MSG_RESULT(other UNIX)
;; ;;
esac 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 Checks for various programs
dnl =========================== dnl ===========================
AUD_CHECK_GNU_MAKE
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PATH_PROG([RM], [rm]) AC_PATH_PROG([RM], [rm])
AC_PATH_PROG([MV], [mv]) AC_PATH_PROG([MV], [mv])
AC_PATH_PROG([CP], [cp]) AC_PATH_PROG([CP], [cp])
AC_PATH_PROG([AR], [ar]) AC_PATH_PROG([AR], [ar])
AC_PATH_PROG([TR], [tr])
AC_PATH_PROG([RANLIB], [ranlib]) AC_PATH_PROG([RANLIB], [ranlib])
AC_PATH_PROG([WINDRES], [windres]) AC_PATH_PROG([WINDRES], [windres])
...@@ -195,103 +88,26 @@ dnl Check for POSIX threads ...@@ -195,103 +88,26 @@ dnl Check for POSIX threads
dnl ======================= dnl =======================
AC_SEARCH_LIBS([pthread_create], [pthread]) AC_SEARCH_LIBS([pthread_create], [pthread])
dnl Check for Gtk+/GLib and pals dnl Check for GTK+ and pals
dnl ============================ 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])
])
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 if test $HAVE_MSWINDOWS = yes ; then
AC_DEFUN([AUD_PLUGIN_CHECK_HEADERS], [ PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.32)
define([Name], [translit([$1], [A-Z./-], [a-z___])])dnl else
AUD_PLUGIN_CHK([$1], Name, [$2], [$4], [$6], [ PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32)
AC_CHECK_HEADERS([$7], [have_[]Name[]="yes"], [have_[]Name[]="no"]) fi
], [
AUD_PLUGIN_ADD([$5], [$3])
m4_ifvaln([$8], [$8])
], [$9], [$10])
])
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
]) ])
#!/bin/sh #!/bin/sh
aclocal -I m4 || exit 1
# compatibility script for automake <= 1.12 autoconf || exit 1
# users of automake >= 1.13 should run 'autoreconf' instead autoheader || exit 1
aclocal -I m4
autoheader
autoconf
...@@ -60,9 +60,14 @@ PLUGIN_SUFFIX = @PLUGIN_SUFFIX@ ...@@ -60,9 +60,14 @@ PLUGIN_SUFFIX = @PLUGIN_SUFFIX@
INSTALL_LIB = @INSTALL_LIB@ INSTALL_LIB = @INSTALL_LIB@
UNINSTALL_LIB = @UNINSTALL_LIB@ UNINSTALL_LIB = @UNINSTALL_LIB@
CLEAN_LIB = @CLEAN_LIB@ CLEAN_LIB = @CLEAN_LIB@
AS_DEPENDS = @AS_DEPENDS@
CC_DEPENDS = @CC_DEPENDS@
CXX_DEPENDS = @CXX_DEPENDS@
OBJC_DEPENDS = @OBJC_DEPENDS@
OBJCXX_DEPENDS = @OBJCXX_DEPENDS@
LN_S = @LN_S@ LN_S = @LN_S@
MKDIR_P = mkdir -p MKDIR_P = mkdir -p
INSTALL = @INSTALL@ INSTALL = @INSTALL@ -p
SHELL = @SHELL@ SHELL = @SHELL@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
JAVAC = @JAVAC@ JAVAC = @JAVAC@
...@@ -73,6 +78,7 @@ prefix = @prefix@ ...@@ -73,6 +78,7 @@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
bindir = @bindir@ bindir = @bindir@
libdir = @libdir@ libdir = @libdir@
pkgconfigdir = @pkgconfigdir@
plugindir ?= ${libdir}/${PACKAGE_NAME} plugindir ?= ${libdir}/${PACKAGE_NAME}
datarootdir = @datarootdir@ datarootdir = @datarootdir@
datadir = @datadir@ datadir = @datadir@
...@@ -104,15 +110,17 @@ MO_FILES = ${LOCALES:.po=.mo} ...@@ -104,15 +110,17 @@ MO_FILES = ${LOCALES:.po=.mo}
.SILENT: .SILENT:
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
.PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS}
all: all:
${MAKE} ${MFLAGS} subdirs ${MAKE} ${MFLAGS} subdirs
${MAKE} ${MFLAGS} depend ${MAKE} ${MFLAGS} depend
${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales ${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
subdirs: subdirs: ${SUBDIRS}
for i in ${SUBDIRS}; do \
${SUBDIRS}:
for i in $@; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} || exit $$?; \ ${MAKE} ${MFLAGS} || exit $$?; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
...@@ -124,9 +132,35 @@ depend: pre-depend ${SRCS} ...@@ -124,9 +132,35 @@ depend: pre-depend ${SRCS}
test -f .deps || regen=1; \ test -f .deps || regen=1; \
for i in ${SRCS}; do \ for i in ${SRCS}; do \
case $$i in \ case $$i in \
*.c | *.cc | *.cxx | *.m | *.mm | *.S) \ *.c) \
test $$i -nt .deps && regen=1; \ if test x"${CC_DEPENDS}" = x"yes"; then \
deps="$$deps $$i.dep"; \ test $$i -nt .deps && regen=1; \
deps="$$deps $$i.dep"; \
fi; \
;; \
*.cc | *.cxx) \
if test x"${CXX_DEPENDS}" = x"yes"; then \
test $$i -nt .deps && regen=1; \
deps="$$deps $$i.dep"; \
fi; \
;; \
*.m) \
if test x"${OBJC_DEPENDS}" = x"yes"; then \
test $$i -nt .deps && regen=1; \
deps="$$deps $$i.dep"; \
fi; \
;; \
*.mm) \
if test x"${OBJCXX_DEPENDS}" = x"yes"; then \
test $$i -nt .deps && regen=1; \
deps="$$deps $$i.dep"; \
fi; \
;; \
*.S) \
if test x"${AS_DEPENDS}" = x"yes"; then \
test $$i -nt .deps && regen=1; \
deps="$$deps $$i.dep"; \
fi; \
;; \ ;; \
esac; \ esac; \
done; \ done; \
...@@ -142,8 +176,28 @@ depend: pre-depend ${SRCS} ...@@ -142,8 +176,28 @@ depend: pre-depend ${SRCS}
fi; \ fi; \
fi fi
.c.c.dep .cc.cc.dep .cxx.cxx.dep .m.m.dep .mm.mm.dep .S.S.dep: .c.c.dep:
${CPP} ${CPPFLAGS} -M $< | \ ${CPP} ${CPPFLAGS} ${CFLAGS} -M $< | \
sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
{ rm -f $@; false; }
.cc.cc.dep .cxx.cxx.dep:
${CPP} ${CPPFLAGS} ${CXXFLAGS} -M $< | \
sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
{ rm -f $@; false; }
.m.m.dep:
${CPP} ${CPPFLAGS} ${OBJCFLAGS} -M $< | \
sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
{ rm -f $@; false; }
.mm.mm.dep:
${CPP} ${CPPFLAGS} ${OBJCPPFLAGS} -M $< | \
sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
{ rm -f $@; false; }
.S.S.dep:
${CPP} ${CPPFLAGS} ${ASFLAGS} -M $< | \
sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \ sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
{ rm -f $@; false; } { rm -f $@; false; }
...@@ -507,7 +561,7 @@ locales: ${MO_FILES} ...@@ -507,7 +561,7 @@ locales: ${MO_FILES}
${COMPILE_PLUGIN_FAILED}; \ ${COMPILE_PLUGIN_FAILED}; \
fi fi
install: ${SHARED_LIB} ${STATIC_LIB} ${STATIC_PIC_LIB} ${PLUGIN} ${PROG} install-extra install: install-extra
for i in ${SUBDIRS}; do \ for i in ${SUBDIRS}; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} install || exit $$?; \ ${MAKE} ${MFLAGS} install || exit $$?; \
......
...@@ -3,12 +3,6 @@ ...@@ -3,12 +3,6 @@
/* Define if building universal (internal helper macro) */ /* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD #undef AC_APPLE_UNIVERSAL_BUILD
/* Define if amidi-plug ALSA backend is to be built */
#undef AMIDIPLUG_ALSA
/* Define if amidi-plug FluidSynth backend is to be built */
#undef AMIDIPLUG_FLUIDSYNTH
/* Define to 1 if translation of program messages to the user's native /* Define to 1 if translation of program messages to the user's native
language is requested. */ language is requested. */
#undef ENABLE_NLS #undef ENABLE_NLS
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
PACKAGE ?= @PACKAGE@
USE_NLS ?= @USE_NLS@
VERSION ?= @VERSION@
# overrides setting in buildsys.mk # overrides setting in buildsys.mk
plugindir = @plugindir@ plugindir = @plugindir@
...@@ -20,17 +16,12 @@ TRANSPORT_PLUGINS ?= @TRANSPORT_PLUGINS@ ...@@ -20,17 +16,12 @@ TRANSPORT_PLUGINS ?= @TRANSPORT_PLUGINS@
VISUALIZATION_PLUGINS ?= @VISUALIZATION_PLUGINS@ VISUALIZATION_PLUGINS ?= @VISUALIZATION_PLUGINS@
VISUALIZATION_PLUGIN_DIR ?= @VISUALIZATION_PLUGIN_DIR@ VISUALIZATION_PLUGIN_DIR ?= @VISUALIZATION_PLUGIN_DIR@
AMIDIPLUG_BACKEND_DIR ?= @AMIDIPLUG_BACKEND_DIR@
AMIDIPLUG_BACKENDS ?= @AMIDIPLUG_BACKENDS@
ALSA_CFLAGS ?= @ALSA_CFLAGS@ ALSA_CFLAGS ?= @ALSA_CFLAGS@
ALSA_LIBS ?= @ALSA_LIBS@ ALSA_LIBS ?= @ALSA_LIBS@
BINIO_CFLAGS ?= @BINIO_CFLAGS@ BINIO_CFLAGS ?= @BINIO_CFLAGS@
BINIO_LIBS ?= @BINIO_LIBS@ BINIO_LIBS ?= @BINIO_LIBS@
BS2B_CFLAGS ?= @BS2B_CFLAGS@ BS2B_CFLAGS ?= @BS2B_CFLAGS@
BS2B_LIBS ?= @BS2B_LIBS@ BS2B_LIBS ?= @BS2B_LIBS@
CAIRO_CFLAGS ?= @CAIRO_CFLAGS@
CAIRO_LIBS ?= @CAIRO_LIBS@
CDIO_LIBS ?= @CDIO_LIBS@ CDIO_LIBS ?= @CDIO_LIBS@
CDIO_CFLAGS ?= @CDIO_CFLAGS@ CDIO_CFLAGS ?= @CDIO_CFLAGS@
CDDB_LIBS ?= @CDDB_LIBS@ CDDB_LIBS ?= @CDDB_LIBS@
...@@ -53,8 +44,7 @@ GDKX11_CFLAGS ?= @GDKX11_CFLAGS@ ...@@ -53,8 +44,7 @@ GDKX11_CFLAGS ?= @GDKX11_CFLAGS@
GDKX11_LIBS ?= @GDKX11_LIBS@ GDKX11_LIBS ?= @GDKX11_LIBS@
GIO_CFLAGS ?= @GIO_CFLAGS@ GIO_CFLAGS ?= @GIO_CFLAGS@
GIO_LIBS ?= @GIO_LIBS@ GIO_LIBS ?= @GIO_LIBS@
GIO_UNIX_CFLAGS ?= @GIO_UNIX_CFLAGS@ GL_LIBS ?= @GL_LIBS@
GIO_UNIX_LIBS ?= @GIO_UNIX_LIBS@
GLIB_CFLAGS ?= @GLIB_CFLAGS@ GLIB_CFLAGS ?= @GLIB_CFLAGS@
GLIB_LIBS ?= @GLIB_LIBS@ GLIB_LIBS ?= @GLIB_LIBS@
GMODULE_CFLAGS ?= @GMODULE_CFLAGS@ GMODULE_CFLAGS ?= @GMODULE_CFLAGS@
...@@ -76,10 +66,6 @@ NEON_LIBS ?= @NEON_LIBS@ ...@@ -76,10 +66,6 @@ NEON_LIBS ?= @NEON_LIBS@
NOTIFY_CFLAGS ?= @NOTIFY_CFLAGS@ NOTIFY_CFLAGS ?= @NOTIFY_CFLAGS@
NOTIFY_LIBS ?= @NOTIFY_LIBS@ NOTIFY_LIBS ?= @NOTIFY_LIBS@
OSS_CFLAGS ?= @OSS_CFLAGS@ OSS_CFLAGS ?= @OSS_CFLAGS@
PANGO_CFLAGS ?= @PANGO_CFLAGS@
PANGO_LIBS ?= @PANGO_LIBS@
PANGOCAIRO_CFLAGS ?= @PANGOCAIRO_CFLAGS@
PANGOCAIRO_LIBS ?= @PANGOCAIRO_LIBS@
SAMPLERATE_CFLAGS ?= @SAMPLERATE_CFLAGS@ SAMPLERATE_CFLAGS ?= @SAMPLERATE_CFLAGS@
SAMPLERATE_LIBS ?= @SAMPLERATE_LIBS@ SAMPLERATE_LIBS ?= @SAMPLERATE_LIBS@
SDL_CFLAGS ?= @SDL_CFLAGS@ SDL_CFLAGS ?= @SDL_CFLAGS@
......
...@@ -21,7 +21,12 @@ dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ...@@ -21,7 +21,12 @@ dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
dnl POSSIBILITY OF SUCH DAMAGE. dnl POSSIBILITY OF SUCH DAMAGE.
dnl dnl
AC_DEFUN([BUILDSYS_INIT], [ AC_CONFIG_COMMANDS_PRE([
AC_SUBST(CC_DEPENDS, $GCC)
AC_SUBST(CXX_DEPENDS, $GXX)
AC_SUBST(OBJC_DEPENDS, $GOBJC)
AC_SUBST(OBJCXX_DEPENDS, $GOBJCXX)
AC_PATH_PROG(TPUT, tput) AC_PATH_PROG(TPUT, tput)
AS_IF([test x"$TPUT" != x""], [ AS_IF([test x"$TPUT" != x""], [
...@@ -68,6 +73,15 @@ AC_DEFUN([BUILDSYS_INIT], [ ...@@ -68,6 +73,15 @@ AC_DEFUN([BUILDSYS_INIT], [
]) ])
]) ])
AC_CONFIG_COMMANDS_POST([
${as_echo:="echo"} ${as_me:="configure"}": touching .deps files"
for i in $(find . -name Makefile); do
DEPSFILE="$(dirname $i)/.deps"
test -f "$DEPSFILE" && rm "$DEPSFILE"
touch -t 0001010000 "$DEPSFILE"
done
])
AC_DEFUN([BUILDSYS_PROG_IMPLIB], [ AC_DEFUN([BUILDSYS_PROG_IMPLIB], [
AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_CANONICAL_HOST])
AC_MSG_CHECKING(whether we need an implib) AC_MSG_CHECKING(whether we need an implib)
...@@ -95,14 +109,14 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [ ...@@ -95,14 +109,14 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
darwin*) darwin*)
AC_MSG_RESULT(Darwin) AC_MSG_RESULT(Darwin)
LIB_CFLAGS='-fPIC -DPIC' LIB_CFLAGS='-fPIC -DPIC'
LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -install_name ${libdir}/$$(i=${SHARED_LIB}; echo $${i%.dylib}).${LIB_MAJOR}.dylib'