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],[28])		m4_define([ca_minor],[29])
	m4_define([ca_version],[ca_major.ca_minor])		m4_define([ca_version],[ca_major.ca_minor])
	AC_PREREQ(2.63)		AC_PREREQ([2.68])
			AC_INIT([libcanberra],
			[ca_version],
			[mzyvopnaoreen (at) 0pointer (dot) de],
			[libcanberra],
			[http://0pointer.de/lennart/projects/libcanberra/])
	AC_INIT([libcanberra],[ca_version],[mzyvopnaoreen (at) 0pointer (dot) de])
	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])
	AM_INIT_AUTOMAKE([foreign 1.10 -Wall])		AM_INIT_AUTOMAKE([foreign 1.11 -Wall silent-rules tar-pax no-dist-gzip dist
			-xz])
			AM_SILENT_RULES([yes])
	AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/libcanberra/])
	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:8: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.])
	m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
	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 set to		AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix se
	/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])		t to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])
	ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"		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
	# 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++
	AC_PROG_CXX		AC_PROG_CXX
	DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wno-long-long -Winline -Wv		CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
	la -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -		-pipe \
	Wlogical-op -Wsign-compare -Wpacked -Wformat-security -Wmissing-include-dir		-Wall \
	s -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -W		-W \
	declaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-		-Wextra \
	prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshado		-Winline \
	w -Wendif-labels -Wstrict-aliasing=2 -Wcast-align -Wwrite-strings -Wno-unus		-Wvla \
	ed-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-		-Wundef \
	show-option -fno-strict-aliasing"		-Wformat=2 \
			-Wlogical-op \
	for flag in $DESIRED_FLAGS ; do		-Wsign-compare \
	CC_CHECK_CFLAGS([$flag], [CFLAGS="$CFLAGS $flag"])		-Wformat-security \
	done		-Wmissing-include-dirs \
			-Wformat-nonliteral \
			-Wold-style-definition \
			-Wpointer-arith \
			-Winit-self \
			-Wdeclaration-after-statement \
			-Wfloat-equal \
			-Wmissing-prototypes \
			-Wstrict-prototypes \
			-Wredundant-decls \
			-Wmissing-declarations \
			-Wmissing-noreturn \
			-Wshadow \
			-Wendif-labels \
			-Wcast-align \
			-Wstrict-aliasing=2 \
			-Wwrite-strings \
			-Wno-long-long \
			-Wno-overlength-strings \
			-Wno-unused-parameter \
			-Wno-missing-field-initializers \
			-Wno-unused-result \
			-Wunsafe-loop-optimizations \
			-Wpacked \
			-Werror=overflow \
			-Wp,-D_FORTIFY_SOURCE=2 \
			-ffast-math \
			-fno-common \
			-fdiagnostics-show-option \
			-fno-strict-aliasing \
			-ffunction-sections \
			-fdata-sections])
			AC_SUBST([WARNINGFLAGS], $with_cflags)
			CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [\
			-Wl,--as-needed \
			-Wl,--gc-sections])
			AC_SUBST([GCLDFLAGS], $with_ldflags)
	#### libtool stuff ####		#### libtool stuff ####
	LT_PREREQ(2.2)		LT_PREREQ(2.2)
	LT_INIT([dlopen win32-dll disable-static])		LT_INIT([dlopen win32-dll disable-static])
	dnl Unfortunately, even up to libtool 2.2.6a there is no way to know		dnl Unfortunately, even up to libtool 2.2.6a there is no way to know
	dnl exactly which version of libltdl is present in the system, so we		dnl exactly which version of libltdl is present in the system, so we
	dnl just assume that it's a working version as long as we have the		dnl just assume that it's a working version as long as we have the
	dnl library and the header files.		dnl library and the header files.
	dnl		dnl
	skipping to change at line 395		skipping to change at line 444
	],		],
	[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 ],
	[		[
	HAVE_GTK=1		HAVE_GTK=1
	AC_DEFINE([HAVE_GTK], 1, [Have GTK?])		AC_DEFINE([HAVE_GTK], 1, [Have GTK?])
	AC_PATH_PROG(GCONFTOOL, gconftool-2)
	AM_GCONF_SOURCE_2
	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
	AC_MSG_ERROR([*** GTK not found ***])		AC_MSG_ERROR([*** GTK not found ***])
	fi		fi
	])		])
	else		else
	skipping to change at line 434		skipping to change at line 480
	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 ],
	[		[
	HAVE_GTK3=1		HAVE_GTK3=1
	AC_DEFINE([HAVE_GTK3], 1, [Have GTK3?])		AC_DEFINE([HAVE_GTK3], 1, [Have GTK3?])
	AC_PATH_PROG(GCONFTOOL, gconftool-2)
	AM_GCONF_SOURCE_2
	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
	AC_MSG_ERROR([*** GTK3 not found ***])		AC_MSG_ERROR([*** GTK3 not found ***])
	fi		fi
	])		])
	else		else
End of changes. 11 change blocks.
	29 lines changed or deleted		66 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/