configure.ac		configure.ac
	skipping to change at line 23		skipping to change at line 23
	# libcanberra is distributed in the hope that it will be useful, but		# libcanberra is distributed in the hope that it will be useful, but
	# WITHOUT ANY WARRANTY; without even the implied warranty of		# WITHOUT ANY WARRANTY; without even the implied warranty of
	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	# Lesser General Public License for more details.		# Lesser General Public License for more details.
	#		#
	# You should have received a copy of the GNU Lesser General Public		# You should have received a copy of the GNU Lesser General Public
	# License along with libcanberra. If not, see		# License along with libcanberra. If not, see
	# <http://www.gnu.org/licenses/>.		# <http://www.gnu.org/licenses/>.
	m4_define([ca_major],[0])		m4_define([ca_major],[0])
	m4_define([ca_minor],[29])		m4_define([ca_minor],[30])
	m4_define([ca_version],[ca_major.ca_minor])		m4_define([ca_version],[ca_major.ca_minor])
	AC_PREREQ([2.68])		AC_PREREQ([2.68])
	AC_INIT([libcanberra],		AC_INIT([libcanberra],
	[ca_version],		[ca_version],
	[mzyvopnaoreen (at) 0pointer (dot) de],		[mzyvopnaoreen (at) 0pointer (dot) de],
	[libcanberra],		[libcanberra],
	[http://0pointer.de/lennart/projects/libcanberra/])		[http://0pointer.de/lennart/projects/libcanberra/])
	AC_CONFIG_SRCDIR([src/common.c])		AC_CONFIG_SRCDIR([src/common.c])
	AC_CONFIG_HEADERS([config.h])		AC_CONFIG_HEADERS([config.h])
	AC_CONFIG_MACRO_DIR(m4)		AC_CONFIG_MACRO_DIR(m4)
	AC_CONFIG_AUX_DIR([build-aux])		AC_CONFIG_AUX_DIR([build-aux])
	AM_INIT_AUTOMAKE([foreign 1.11 -Wall silent-rules tar-pax no-dist-gzip dist -xz])		AM_INIT_AUTOMAKE([foreign 1.11 -Wall silent-rules tar-pax no-dist-gzip dist -xz])
	AM_SILENT_RULES([yes])		AM_SILENT_RULES([yes])
	AC_SUBST(LIBCANBERRA_VERSION_INFO, [2:5:2])		AC_SUBST(LIBCANBERRA_VERSION_INFO, [2:5:2])
	AC_SUBST(LIBCANBERRA_GTK_VERSION_INFO, [1:8:1])		AC_SUBST(LIBCANBERRA_GTK_VERSION_INFO, [1:9:1])
	AC_CANONICAL_HOST		AC_CANONICAL_HOST
	AC_DEFINE_UNQUOTED([CANONICAL_HOST], "$host", [Canonical host string.])		AC_DEFINE_UNQUOTED([CANONICAL_HOST], "$host", [Canonical host string.])
	if type -p stow > /dev/null && test -d /usr/local/stow ; then		if type -p stow > /dev/null && test -d /usr/local/stow ; then
	AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix se t to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])		AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix se t to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])
	ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSIO N}"		ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSIO N}"
	fi		fi
	#### Checks for programs. ####		#### Checks for programs. ####
	AC_PROG_MKDIR_P		AC_PROG_MKDIR_P
	AC_PROG_LN_S		AC_PROG_LN_S
			AM_PROG_AR
	# CC		# CC
	AC_PROG_CC		AC_PROG_CC
	AC_PROG_CC_C99		AC_PROG_CC_C99
	AM_PROG_CC_C_O		AM_PROG_CC_C_O
	AC_PROG_GCC_TRADITIONAL		AC_PROG_GCC_TRADITIONAL
	AC_USE_SYSTEM_EXTENSIONS		AC_USE_SYSTEM_EXTENSIONS
	# C++		# C++
	skipping to change at line 386		skipping to change at line 387
	[		[
	case "${enableval}" in		case "${enableval}" in
	yes) gstreamer=yes ;;		yes) gstreamer=yes ;;
	no) gstreamer=no ;;		no) gstreamer=no ;;
	*) AC_MSG_ERROR(bad value ${enableval} for --disable-gstrea mer) ;;		*) AC_MSG_ERROR(bad value ${enableval} for --disable-gstrea mer) ;;
	esac		esac
	],		],
	[gstreamer=auto])		[gstreamer=auto])
	if test "x${gstreamer}" != xno ; then		if test "x${gstreamer}" != xno ; then
	PKG_CHECK_MODULES(GST, [ gstreamer-0.10 >= 0.10.15 ],		PKG_CHECK_MODULES(GST, [ gstreamer-1.0 >= 0.10.15 ],
	[		[
	HAVE_GSTREAMER=1		HAVE_GSTREAMER=1
	AC_DEFINE([HAVE_GSTREAMER], 1, [Have GStreamer?])		AC_DEFINE([HAVE_GSTREAMER], 1, [Have GStreamer?])
	],		],
	[		[
	HAVE_GSTREAMER=0		HAVE_GSTREAMER=0
	if test "x$gstreamer" = xyes ; then		if test "x$gstreamer" = xyes ; then
	AC_MSG_ERROR([*** GStreamer not found ***])		AC_MSG_ERROR([*** GStreamer not found ***])
	fi		fi
	])		])
	skipping to change at line 439		skipping to change at line 440
	case "${enableval}" in		case "${enableval}" in
	yes) gtk=yes ;;		yes) gtk=yes ;;
	no) gtk=no ;;		no) gtk=no ;;
	*) AC_MSG_ERROR(bad value ${enableval} for --disable-gtk) ; ;		*) AC_MSG_ERROR(bad value ${enableval} for --disable-gtk) ; ;
	esac		esac
	],		],
	[gtk=auto])		[gtk=auto])
	AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])		AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
	if test "x${gtk}" != xno ; then		if test "x${gtk}" != xno ; then
	PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.20.0 gthread-2.0 ],		PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.20.0 gthread-2.0 glib-2.0 >= 2.3 2 gdk-2.0 x11 ],
	[		[
	HAVE_GTK=1		HAVE_GTK=1
	AC_DEFINE([HAVE_GTK], 1, [Have GTK?])		AC_DEFINE([HAVE_GTK], 1, [Have GTK?])
	GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0 `		GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0 `
	GTK_MODULES_DIR="${libdir}/gtk-2.0/modules"		GTK_MODULES_DIR="${libdir}/gtk-2.0/modules"
	],		],
	[		[
	HAVE_GTK=0		HAVE_GTK=0
	if test "x$gtk" = xyes ; then		if test "x$gtk" = xyes ; then
	skipping to change at line 475		skipping to change at line 476
	[		[
	case "${enableval}" in		case "${enableval}" in
	yes) gtk3=yes ;;		yes) gtk3=yes ;;
	no) gtk3=no ;;		no) gtk3=no ;;
	*) AC_MSG_ERROR(bad value ${enableval} for --disable-gtk3) ;;		*) AC_MSG_ERROR(bad value ${enableval} for --disable-gtk3) ;;
	esac		esac
	],		],
	[gtk3=auto])		[gtk3=auto])
	if test "x${gtk3}" != xno ; then		if test "x${gtk3}" != xno ; then
	PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 ],		PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 glib-2.0 >= 2.32 gdk-3.0 x11 ],
	[		[
	HAVE_GTK3=1		HAVE_GTK3=1
	AC_DEFINE([HAVE_GTK3], 1, [Have GTK3?])		AC_DEFINE([HAVE_GTK3], 1, [Have GTK3?])
	GTK3_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3. 0`		GTK3_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3. 0`
	GTK3_MODULES_DIR="${libdir}/gtk-3.0/modules"		GTK3_MODULES_DIR="${libdir}/gtk-3.0/modules"
	],		],
	[		[
	HAVE_GTK3=0		HAVE_GTK3=0
	if test "x$gtk3" = xyes ; then		if test "x$gtk3" = xyes ; then
End of changes. 6 change blocks.
	5 lines changed or deleted		6 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/