Attachment #54703 for bug #69213

Lines 1-5 Link Here

(-)xosd-2.2.14.orig/aclocal.m4 (-3 / +2 lines)
1	# generated automatically by aclocal 1.9.2 -- Autoconf --	1	# generated automatically by aclocal 1.9.5 -- Autoconf --
2
3	# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004	2	# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
4	# Free Software Foundation, Inc.	3	# Free Software Foundation, Inc.
5	# This file is free software; the Free Software Foundation	4	# This file is free software; the Free Software Foundation
Lines 6534-6540 Link Here
6534	# Call AM_AUTOMAKE_VERSION so it can be traced.	6533	# Call AM_AUTOMAKE_VERSION so it can be traced.
6535	# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.	6534	# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
6536	AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],	6535	AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
6537	[AM_AUTOMAKE_VERSION([1.9.2])])	6536	[AM_AUTOMAKE_VERSION([1.9.5])])
6538		6537
6539	# AM_AUX_DIR_EXPAND	6538	# AM_AUX_DIR_EXPAND
6540		6539




dnl    LT_REVISION = 0;
dnl    LT_CURRENT ++;
dnl    if (any interfaces have been _added_ since last release)
dnl		  AGE ++;
dnl    if (any interfaces have been _removed_ or _incompatibly changed_)
dnl		  AGE = 0;
dnl }
LT_CURRENT=4
LT_AGE=2

AM_PROG_LIBTOOL
AC_PATH_XTRA([X11],[X11/Xlib.h],[XrmInitialize()])
# We need two libtools, one that builds both shared and static, and
# one that builds only static.	This is because the resulting libtool
# does not allow us to choose which to build at runtime.
sed -e 's/^build_old_libs=yes/build_old_libs=no/' libtool > libtool-disable-static
chmod +x libtool-disable-static


dnl Checks for libraries.
AM_PATH_GTK(1.2.2,,
		AC_MSG_WARN([*** GTK+ >= 1.2.2 not found ***]))
AC_CHECK_LIB(X11, XInitThreads,,
		 AC_MSG_ERROR([*** X11 not threadsafe ***]))
AC_CHECK_LIB(Xext, XShapeQueryExtension,,
		 AC_MSG_ERROR([*** X11 Shape extension not found ***]))
AC_CHECK_LIB(pthread, pthread_create,,
		 AC_MSG_ERROR([*** POSIX thread support not found ***]))

dnl Check for header files.
AC_HEADER_STDC


# nicked from the irmix project...
AC_ARG_ENABLE([xinerama],
			  AC_HELP_STRING([--disable-xinerama],
				 [disable use of Xinerama extension]),
			  [disable_xinerama="yes"],
		  [disable_xinerama="no"])

if test x$disable_xinerama = "xno"
then
		AC_CHECK_LIB(Xinerama_pic,
					 XineramaQueryExtension,
					 [X_LIBS="$X_LIBS -lXinerama_pic"
					  AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
					  ac_have_xinerama="yes"],
					  AC_CHECK_LIB(Xinerama,
								   XineramaQueryExtension,
								   [X_LIBS="$X_LIBS -lXinerama"
									AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama
installed])
									ac_have_xinerama="yes"],,
									[$X_LIBS -lXext $X_EXTRA_LIBS]),
					 [$X_LIBS -lXext $X_EXTRA_LIBS])
fi

dnl Check if beep-media-player is available
if pkg-config --exists bmp
then
	PKG_CHECK_MODULES(BMP, bmp)
	BMP_GENERAL_PLUGIN_DIR=$(pkg-config --variable general_plugin_dir bmp)
	AC_SUBST(BMP_GENERAL_PLUGIN_DIR)
	no_bmp="no"
else
	no_bmp="yes"
	AC_MSG_WARN("beep media player not found")
fi




dnl Check for xmms
AM_PATH_XMMS(1.2.7,,
		 AC_MSG_WARN("xmms plugins can not be built"))

dnl Override where to place libxmms_xosd.so
AC_ARG_WITH([plugindir],
			AC_HELP_STRING([--with-plugindir=DIR],
			   [Set the xmms plugin directory]),
			[XMMS_PLUGIN_DIR="$withval"],
			[XMMS_PLUGIN_DIR="$XMMS_GENERAL_PLUGIN_DIR"])

dnl Check for gdk-pixbuf
AM_PATH_GDK_PIXBUF(0.22.0,,
		   AC_MSG_WARN("new xmms plugin can not be built"))

dnl Override where to place pixmaps for libxmms_xosd.so
AC_ARG_WITH([pixmapdir],
		AC_HELP_STRING([--with-pixmapdir=DIR],
				[Set the directory for xmms plugin pixmaps]),
			[XMMS_PIXMAPDIR="$withval"],
		[XMMS_PIXMAPDIR="${datadir}/xosd"])

AC_SUBST(XMMS_PIXMAPDIR)

dnl XMMS PLUGINS
dnl new xmms
AC_ARG_ENABLE([new-xmms],
		  AC_HELP_STRING([--disable-new-xmms],
				 [Disable new xmms plugin (enabled by default)]),
			[enable_new_xmms="$enableval"],
		  [enable_new_xmms="yes"])

dnl old xmms
AC_ARG_ENABLE([old-xmms],
		  AC_HELP_STRING([--enable-old-xmms],
				[Enable old xmms plugin (disabled by default)]),
			[enable_old_xmms="$enableval"],
		  [enable_old_xmms="no"])


dnl BEEP-MEDIA-PLAYER PLUGINS
dnl new bmp
AC_ARG_ENABLE([new-bmp],
		AC_HELP_STRING([--disable-new-bmp],
				[Disable new beep media plugin (enabled by default)]),
			[enable_new_bmp="$enableval"],
		  [enable_new_bmp="yes"])
dnl old bmp
AC_ARG_ENABLE([old-bmp],
		  AC_HELP_STRING([--enable-old-bmp],
				[Enable old bmp plugin (disabled by default)]),
			[enable_old_bmp="$enableval"],
		  [enable_old_bmp="no"])

dnl CHECK PLUGINS
dnl beep media player
dnl new
AC_MSG_CHECKING([whether new beep media plugin was requested])
if test x"$enable_new_bmp" == "xyes"
then
	test x"$no_bmp" == "xyes" && AC_MSG_ERROR([yes, but cannot be built])
	AC_MSG_RESULT([yes])
else
	AC_MSG_RESULT([no])
fi
AM_CONDITIONAL([BUILD_BEEP_NEW_PLUGIN],
		   [test x"$enable_new_bmp" = "xyes"])
dnl old
AC_MSG_CHECKING([whether old beep media plugin was requested])
if test x"$enable_old_bmp" == "xyes"
then
	test x"$no_bmp" == "xyes" && AC_MSG_ERROR([yes, but cannot be built])
	AC_MSG_RESULT([yes])
else
	AC_MSG_RESULT([no])
fi
AM_CONDITIONAL([BUILD_BEEP_OLD_PLUGIN],
		   [test x"$enable_old_bmp" = "xyes"])

dnl XMMS 
dnl new 
AC_MSG_CHECKING([whether new xmms plugin was requested])
if test x"$enable_new_xmms" == "xyes"
then
	if test x"$no_xmms" == "xyes" -o x"$no_gdk_pixbuf" == "xyes"
	then
		AC_MSG_ERROR([yes, but cannot be built])
	fi
	AC_MSG_RESULT([yes])
else
	AC_MSG_RESULT([no])
fi
AM_CONDITIONAL([BUILD_NEW_PLUGIN],
		   [test x"$enable_new_xmms" = "xyes"])

dnl old
dnl Check for Beep Media player
AC_ARG_ENABLE([beep_media_player_plugin],
		AC_HELP_STRING([--enable-beep_media_player_plugin],
			     [Enable beep media plugin (enabled by default)]),
              [beep_media_player_plugin="$enableval"],
              [beep_media_player_plugin="yes"])
AC_MSG_CHECKING([whether beep media plugin was requested])
AC_MSG_RESULT($beep_media_player_plugin)

AM_CONDITIONAL([BUILD_BEEP_MEDIA_PLUGIN],
	       [test x"$beep_media_player_plugin" = "xyes" -a x"$no_bmp" == "xyes"])

		


dnl OLD plugin
AC_ARG_ENABLE([old-plugin],
	      AC_HELP_STRING([--enable-old-plugin],
			     [Enable old xmms plugin (disabled by default)]),
              [enable_old_plugin="$enableval"],
              [enable_old_plugin="no"])
AC_MSG_CHECKING([whether old xmms plugin was requested])
if test x"$enable_old_xmms" = "xyes"
then
	if test x"$no_xmms" == "xyes"
	then
		AC_MSG_ERROR([yes, but cannot be built])
	fi
	AC_MSG_RESULT([yes])
else
	AC_MSG_RESULT([no])
fi
AM_CONDITIONAL([BUILD_OLD_PLUGIN],
		   [test x"$enable_old_xmms" = "xyes"])


dnl Define XOSD_VERSION
AC_DEFINE_UNQUOTED(XOSD_VERSION, "${VERSION}")




# Don't build a static library
LIBTOOL = $(top_builddir)/libtool-disable-static

if BUILD_BEEP_NEW_PLUGIN
if BUILD_NEW_PLUGIN
NEW_bmpplugin = libbmp_osd.la
endif
if BUILD_BEEP_OLD_PLUGIN
OLD_bmpplugin = libbmp_osd_old.la
endif
endif

bmpplugin_LTLIBRARIES = $(NEW_bmpplugin) $(OLD_bmpplugin)


Lines 22-30 Link Here

(-)xosd-2.2.14.orig/src/bmp_plugin/bmp_osd.c (-3 / +3 lines)
22		22
23	#include "bmp_osd.h"	23	#include "bmp_osd.h"
24		24
25	#include <xmms/plugin.h>	25	#include <bmp/plugin.h>
26	#include <xmms/xmmsctrl.h>	26	#include <bmp/beepctrl.h>
27	#include <xmms/configfile.h>	27	#include <bmp/configfile.h>
28		28
29	static void init(void);	29	static void init(void);
30	static void cleanup(void);	30	static void cleanup(void);

Lines 22-28 Link Here

(-)xosd-2.2.14.orig/src/bmp_plugin/dlg_config.c (-1 / +1 lines)
22		22
23	#include "bmp_osd.h"	23	#include "bmp_osd.h"
24		24
25	#include <xmms/configfile.h>	25	#include <bmp/configfile.h>
26		26
27	static GtkToggleButton	27	static GtkToggleButton
28	* vol_on, *bal_on,	28	* vol_on, *bal_on,

Lines 21-27 Link Here

(-)xosd-2.2.14.orig/src/bmp_plugin/dlg_config_old.c (-1 / +1 lines)
21		21
22	#include "bmp_osd.h"	22	#include "bmp_osd.h"
23		23
24	#include <xmms/configfile.h>	24	#include <bmp/configfile.h>
25		25
26	static GtkToggleButton	26	static GtkToggleButton
27	* vol_on, *bal_on,	27	* vol_on, *bal_on,

Return to bug 69213

Lines 22-30 Link Here

(-)xosd-2.2.14.orig/configure.ac (-69 / +117 lines)
22	dnl LT_REVISION = 0;	22	dnl LT_REVISION = 0;
23	dnl LT_CURRENT ++;	23	dnl LT_CURRENT ++;
24	dnl if (any interfaces have been _added_ since last release)	24	dnl if (any interfaces have been _added_ since last release)
25	dnl AGE ++;	25	dnl AGE ++;
26	dnl if (any interfaces have been _removed_ or _incompatibly changed_)	26	dnl if (any interfaces have been _removed_ or _incompatibly changed_)
27	dnl AGE = 0;	27	dnl AGE = 0;
28	dnl }	28	dnl }
29	LT_CURRENT=4	29	LT_CURRENT=4
30	LT_AGE=2	30	LT_AGE=2
Lines 43-49 Link Here
43	AM_PROG_LIBTOOL	43	AM_PROG_LIBTOOL
44	AC_PATH_XTRA([X11],[X11/Xlib.h],[XrmInitialize()])	44	AC_PATH_XTRA([X11],[X11/Xlib.h],[XrmInitialize()])
45	# We need two libtools, one that builds both shared and static, and	45	# We need two libtools, one that builds both shared and static, and
46	# one that builds only static. This is because the resulting libtool	46	# one that builds only static. This is because the resulting libtool
47	# does not allow us to choose which to build at runtime.	47	# does not allow us to choose which to build at runtime.
48	sed -e 's/^build_old_libs=yes/build_old_libs=no/' libtool > libtool-disable-static	48	sed -e 's/^build_old_libs=yes/build_old_libs=no/' libtool > libtool-disable-static
49	chmod +x libtool-disable-static	49	chmod +x libtool-disable-static
Lines 55-67 Link Here
55		55
56	dnl Checks for libraries.	56	dnl Checks for libraries.
57	AM_PATH_GTK(1.2.2,,	57	AM_PATH_GTK(1.2.2,,
58	AC_MSG_WARN([* GTK+ >= 1.2.2 not found *]))	58	AC_MSG_WARN([* GTK+ >= 1.2.2 not found *]))
59	AC_CHECK_LIB(X11, XInitThreads,,	59	AC_CHECK_LIB(X11, XInitThreads,,
60	AC_MSG_ERROR([* X11 not threadsafe *]))	60	AC_MSG_ERROR([* X11 not threadsafe *]))
61	AC_CHECK_LIB(Xext, XShapeQueryExtension,,	61	AC_CHECK_LIB(Xext, XShapeQueryExtension,,
62	AC_MSG_ERROR([* X11 Shape extension not found *]))	62	AC_MSG_ERROR([* X11 Shape extension not found *]))
63	AC_CHECK_LIB(pthread, pthread_create,,	63	AC_CHECK_LIB(pthread, pthread_create,,
64	AC_MSG_ERROR([* POSIX thread support not found *]))	64	AC_MSG_ERROR([* POSIX thread support not found *]))
65		65
66	dnl Check for header files.	66	dnl Check for header files.
67	AC_HEADER_STDC	67	AC_HEADER_STDC
Lines 76-176 Link Here
76		76
77	# nicked from the irmix project...	77	# nicked from the irmix project...
78	AC_ARG_ENABLE([xinerama],	78	AC_ARG_ENABLE([xinerama],
79	AC_HELP_STRING([--disable-xinerama],	79	AC_HELP_STRING([--disable-xinerama],
80	[disable use of Xinerama extension]),	80	[disable use of Xinerama extension]),
81	[disable_xinerama="yes"],	81	[disable_xinerama="yes"],
82	[disable_xinerama="no"])	82	[disable_xinerama="no"])
83		83
84	if test x$disable_xinerama = "xno"	84	if test x$disable_xinerama = "xno"
85	then	85	then
86	AC_CHECK_LIB(Xinerama_pic,	86	AC_CHECK_LIB(Xinerama_pic,
87	XineramaQueryExtension,	87	XineramaQueryExtension,
88	[X_LIBS="$X_LIBS -lXinerama_pic"	88	[X_LIBS="$X_LIBS -lXinerama_pic"
89	AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])	89	AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
90	ac_have_xinerama="yes"],	90	ac_have_xinerama="yes"],
91	AC_CHECK_LIB(Xinerama,	91	AC_CHECK_LIB(Xinerama,
92	XineramaQueryExtension,	92	XineramaQueryExtension,
93	[X_LIBS="$X_LIBS -lXinerama"	93	[X_LIBS="$X_LIBS -lXinerama"
94	AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama	94	AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama
95	installed])	95	installed])
96	ac_have_xinerama="yes"],,	96	ac_have_xinerama="yes"],,
97	[$X_LIBS -lXext $X_EXTRA_LIBS]),	97	[$X_LIBS -lXext $X_EXTRA_LIBS]),
98	[$X_LIBS -lXext $X_EXTRA_LIBS])	98	[$X_LIBS -lXext $X_EXTRA_LIBS])
99	fi	99	fi
100		100
		101	dnl Check if beep-media-player is available
101	if pkg-config --exists bmp	102	if pkg-config --exists bmp
102	then	103	then
103	PKG_CHECK_MODULES(BMP, bmp)	104	PKG_CHECK_MODULES(BMP, bmp)
104	BMP_GENERAL_PLUGIN_DIR=$(pkg-config --variable general_plugin_dir bmp)	105	BMP_GENERAL_PLUGIN_DIR=$(pkg-config --variable general_plugin_dir bmp)
105	AC_SUBST(BMP_GENERAL_PLUGIN_DIR)	106	AC_SUBST(BMP_GENERAL_PLUGIN_DIR)
106	no_bmp="yes"	107	no_bmp="no"
107	else	108	else
108	no_bmp="no"	109	no_bmp="yes"
109	AC_MSG_WARN("beep media player not found")	110	AC_MSG_WARN("beep media player not found")
110	fi	111	fi
111		112
112
113
114
115	dnl Check for xmms	113	dnl Check for xmms
116	AM_PATH_XMMS(1.2.7,,	114	AM_PATH_XMMS(1.2.7,,
117	AC_MSG_WARN("xmms plugins can not be built"))	115	AC_MSG_WARN("xmms plugins can not be built"))
		116
118	dnl Override where to place libxmms_xosd.so	117	dnl Override where to place libxmms_xosd.so
119	AC_ARG_WITH([plugindir],	118	AC_ARG_WITH([plugindir],
120	AC_HELP_STRING([--with-plugindir=DIR],	119	AC_HELP_STRING([--with-plugindir=DIR],
121	[Set the xmms plugin directory]),	120	[Set the xmms plugin directory]),
122	[XMMS_PLUGIN_DIR="$withval"],	121	[XMMS_PLUGIN_DIR="$withval"],
123	[XMMS_PLUGIN_DIR="$XMMS_GENERAL_PLUGIN_DIR"])	122	[XMMS_PLUGIN_DIR="$XMMS_GENERAL_PLUGIN_DIR"])
124		123
125	dnl Check for gdk-pixbuf	124	dnl Check for gdk-pixbuf
126	AM_PATH_GDK_PIXBUF(0.22.0,,	125	AM_PATH_GDK_PIXBUF(0.22.0,,
127	AC_MSG_WARN("new xmms plugin can not be built"))	126	AC_MSG_WARN("new xmms plugin can not be built"))
		127
128	dnl Override where to place pixmaps for libxmms_xosd.so	128	dnl Override where to place pixmaps for libxmms_xosd.so
129	AC_ARG_WITH([pixmapdir],	129	AC_ARG_WITH([pixmapdir],
130	AC_HELP_STRING([--with-pixmapdir=DIR],	130	AC_HELP_STRING([--with-pixmapdir=DIR],
131	[Set the directory for xmms plugin pixmaps]),	131	[Set the directory for xmms plugin pixmaps]),
132	[XMMS_PIXMAPDIR="$withval"],	132	[XMMS_PIXMAPDIR="$withval"],
133	[XMMS_PIXMAPDIR="${datadir}/xosd"])	133	[XMMS_PIXMAPDIR="${datadir}/xosd"])
		134
134	AC_SUBST(XMMS_PIXMAPDIR)	135	AC_SUBST(XMMS_PIXMAPDIR)
135		136
136	dnl NEW plugin	137	dnl XMMS PLUGINS
137	AC_ARG_ENABLE([new-plugin],	138	dnl new xmms
138	AC_HELP_STRING([--disable-new-plugin],	139	AC_ARG_ENABLE([new-xmms],
139	[Disable new xmms plugin (enabled by default)]),	140	AC_HELP_STRING([--disable-new-xmms],
140	[enable_new_plugin="$enableval"],	141	[Disable new xmms plugin (enabled by default)]),
141	[enable_new_plugin="yes"])	142	[enable_new_xmms="$enableval"],
		143	[enable_new_xmms="yes"])
		144
		145	dnl old xmms
		146	AC_ARG_ENABLE([old-xmms],
		147	AC_HELP_STRING([--enable-old-xmms],
		148	[Enable old xmms plugin (disabled by default)]),
		149	[enable_old_xmms="$enableval"],
		150	[enable_old_xmms="no"])
		151
		152
		153	dnl BEEP-MEDIA-PLAYER PLUGINS
		154	dnl new bmp
		155	AC_ARG_ENABLE([new-bmp],
		156	AC_HELP_STRING([--disable-new-bmp],
		157	[Disable new beep media plugin (enabled by default)]),
		158	[enable_new_bmp="$enableval"],
		159	[enable_new_bmp="yes"])
		160	dnl old bmp
		161	AC_ARG_ENABLE([old-bmp],
		162	AC_HELP_STRING([--enable-old-bmp],
		163	[Enable old bmp plugin (disabled by default)]),
		164	[enable_old_bmp="$enableval"],
		165	[enable_old_bmp="no"])
		166
		167	dnl CHECK PLUGINS
		168	dnl beep media player
		169	dnl new
		170	AC_MSG_CHECKING([whether new beep media plugin was requested])
		171	if test x"$enable_new_bmp" == "xyes"
		172	then
		173	test x"$no_bmp" == "xyes" && AC_MSG_ERROR([yes, but cannot be built])
		174	AC_MSG_RESULT([yes])
		175	else
		176	AC_MSG_RESULT([no])
		177	fi
		178	AM_CONDITIONAL([BUILD_BEEP_NEW_PLUGIN],
		179	[test x"$enable_new_bmp" = "xyes"])
		180	dnl old
		181	AC_MSG_CHECKING([whether old beep media plugin was requested])
		182	if test x"$enable_old_bmp" == "xyes"
		183	then
		184	test x"$no_bmp" == "xyes" && AC_MSG_ERROR([yes, but cannot be built])
		185	AC_MSG_RESULT([yes])
		186	else
		187	AC_MSG_RESULT([no])
		188	fi
		189	AM_CONDITIONAL([BUILD_BEEP_OLD_PLUGIN],
		190	[test x"$enable_old_bmp" = "xyes"])
		191
		192	dnl XMMS
		193	dnl new
142	AC_MSG_CHECKING([whether new xmms plugin was requested])	194	AC_MSG_CHECKING([whether new xmms plugin was requested])
143	AC_MSG_RESULT($enable_new_plugin)	195	if test x"$enable_new_xmms" == "xyes"
		196	then
		197	if test x"$no_xmms" == "xyes" -o x"$no_gdk_pixbuf" == "xyes"
		198	then
		199	AC_MSG_ERROR([yes, but cannot be built])
		200	fi
		201	AC_MSG_RESULT([yes])
		202	else
		203	AC_MSG_RESULT([no])
		204	fi
144	AM_CONDITIONAL([BUILD_NEW_PLUGIN],	205	AM_CONDITIONAL([BUILD_NEW_PLUGIN],
145	[test x"$enable_new_plugin" = "xyes" -a x"$no_xmms" != "xyes" -a x"$no_gdk_pixbuf" != "xyes"])	206	[test x"$enable_new_xmms" = "xyes"])
146		207
147		208	dnl old
148	dnl Check for Beep Media player
149	AC_ARG_ENABLE([beep_media_player_plugin],
150	AC_HELP_STRING([--enable-beep_media_player_plugin],
151	[Enable beep media plugin (enabled by default)]),
152	[beep_media_player_plugin="$enableval"],
153	[beep_media_player_plugin="yes"])
154	AC_MSG_CHECKING([whether beep media plugin was requested])
155	AC_MSG_RESULT($beep_media_player_plugin)
156
157	AM_CONDITIONAL([BUILD_BEEP_MEDIA_PLUGIN],
158	[test x"$beep_media_player_plugin" = "xyes" -a x"$no_bmp" == "xyes"])
159
160
161
162
163	dnl OLD plugin
164	AC_ARG_ENABLE([old-plugin],
165	AC_HELP_STRING([--enable-old-plugin],
166	[Enable old xmms plugin (disabled by default)]),
167	[enable_old_plugin="$enableval"],
168	[enable_old_plugin="no"])
169	AC_MSG_CHECKING([whether old xmms plugin was requested])	209	AC_MSG_CHECKING([whether old xmms plugin was requested])
170	AC_MSG_RESULT($enable_old_plugin)	210	if test x"$enable_old_xmms" = "xyes"
		211	then
		212	if test x"$no_xmms" == "xyes"
		213	then
		214	AC_MSG_ERROR([yes, but cannot be built])
		215	fi
		216	AC_MSG_RESULT([yes])
		217	else
		218	AC_MSG_RESULT([no])
		219	fi
171	AM_CONDITIONAL([BUILD_OLD_PLUGIN],	220	AM_CONDITIONAL([BUILD_OLD_PLUGIN],
172	[test x"$enable_old_plugin" = "xyes" -a x"$no_xmms" != "xyes"])	221	[test x"$enable_old_xmms" = "xyes"])
173
174		222
175	dnl Define XOSD_VERSION	223	dnl Define XOSD_VERSION
176	AC_DEFINE_UNQUOTED(XOSD_VERSION, "${VERSION}")	224	AC_DEFINE_UNQUOTED(XOSD_VERSION, "${VERSION}")

Lines 7-20 Link Here

(-)xosd-2.2.14.orig/src/bmp_plugin/Makefile.am (-4 / +2 lines)
7	# Don't build a static library	7	# Don't build a static library
8	LIBTOOL = $(top_builddir)/libtool-disable-static	8	LIBTOOL = $(top_builddir)/libtool-disable-static
9		9
10	if BUILD_BEEP_MEDIA_PLUGIN	10	if BUILD_BEEP_NEW_PLUGIN
11	if BUILD_NEW_PLUGIN
12	NEW_bmpplugin = libbmp_osd.la	11	NEW_bmpplugin = libbmp_osd.la
13	endif	12	endif
14	if BUILD_OLD_PLUGIN	13	if BUILD_BEEP_OLD_PLUGIN
15	OLD_bmpplugin = libbmp_osd_old.la	14	OLD_bmpplugin = libbmp_osd_old.la
16	endif	15	endif
17	endif
18		16
19	bmpplugin_LTLIBRARIES = $(NEW_bmpplugin) $(OLD_bmpplugin)	17	bmpplugin_LTLIBRARIES = $(NEW_bmpplugin) $(OLD_bmpplugin)
20		18