16709N/A--- libcanberra-0.13/configure.ac-orig 2009-06-24 15:19:09.939768000 -0500

16709N/A+++ libcanberra-0.13/configure.ac 2009-06-24 15:18:57.446438000 -0500

16709N/A@@ -23,7 +23,7 @@ m4_define([ca_major],[0])

16709N/A m4_define([ca_minor],[13])

16709N/A m4_define([ca_version],[ca_major.ca_minor])

14134N/A

15702N/A-AC_PREREQ(2.63)

14134N/A+AC_PREREQ(2.61)

14134N/A

16709N/A AC_INIT([libcanberra],[ca_version],[mzyvopnaoreen (at) 0pointer (dot) de])

14134N/A AC_CONFIG_SRCDIR([src/common.c])

16709N/A@@ -61,40 +61,15 @@ AC_USE_SYSTEM_EXTENSIONS

14134N/A

14134N/A AC_PROG_CXX

14134N/A

15702N/A-DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wno-long-long -Winline -Wvla -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wpacked -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wstrict-aliasing=2 -Wcast-align -Wwrite-strings -Winline -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option"

14134N/A-

14134N/A-for flag in $DESIRED_FLAGS ; do

14134N/A- CC_CHECK_CFLAGS([$flag], [CFLAGS="$CFLAGS $flag"])

14134N/A-done

14134N/A-

14134N/A #### libtool stuff ####

15702N/A-LT_PREREQ(2.2)

15702N/A-LT_INIT([dlopen win32-dll disable-static])

16359N/A-

16359N/A-dnl Unfortunately, even up to libtool 2.2.6a there is no way to know

16359N/A-dnl exactly which version of libltdl is present in the system, so we

16359N/A-dnl just assume that it's a working version as long as we have the

16359N/A-dnl library and the header files.

16359N/A-dnl

16359N/A-dnl As an extra safety device, check for lt_dladvise_init() which is

16359N/A-dnl only implemented in libtool 2.x, and refine as we go if we have

16359N/A-dnl refined requirements.

16359N/A-dnl

16359N/A-dnl Check the header files first since the system may have a

16359N/A-dnl libltdl.so for runtime, but no headers, and we want to bail out as

16359N/A-dnl soon as possible.

16359N/A-dnl

16359N/A-dnl We don't need any special variable for this though, since the user

16359N/A-dnl can give the proper place to find libltdl through the standard

16359N/A-dnl variables like LDFLAGS and CPPFLAGS.

16359N/A-

16359N/A-AC_CHECK_HEADER([ltdl.h],

16359N/A- [AC_CHECK_LIB([ltdl], [lt_dladvise_init], [LIBLTDL=-lltdl], [LIBLTDL=])],

16359N/A- [LIBLTDL=])

16359N/A-

16359N/A-AS_IF([test "x$LIBLTDL" = "x"],

16359N/A- [AC_MSG_ERROR([Unable to find libltdl.])])

16359N/A-AC_SUBST([LIBLTDL])

15702N/A+AC_LTDL_ENABLE_INSTALL

15702N/A+AC_LIBLTDL_INSTALLABLE

15702N/A+AC_LIBTOOL_DLOPEN

15702N/A+AC_LIBTOOL_WIN32_DLL

15702N/A+AC_PROG_LIBTOOL

15702N/A+AC_SUBST(LTDLINCL)

15702N/A+AC_SUBST(LIBLTDL)

15702N/A+AC_CONFIG_SUBDIRS(libltdl)

14134N/A

15702N/A #### Determine build environment ####

15702N/A