16961N/A--- libcanberra-0.15/configure.ac-orig 2009-08-05 00:50:36.125980000 -0500

16961N/A+++ libcanberra-0.15/configure.ac 2009-08-05 01:23:33.609719000 -0500

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

16961N/A m4_define([ca_minor],[15])

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])

16961N/A@@ -61,14 +61,8 @@ 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)

16961N/A+AC_PROG_LIBTOOL

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

16961N/A

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

16961N/A@@ -89,7 +83,7 @@ dnl can give the proper place to find li

16961N/A dnl variables like LDFLAGS and CPPFLAGS.

16961N/A

16961N/A AC_CHECK_HEADER([ltdl.h],

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

16961N/A+ [AC_CHECK_LIB([ltdl], [lt_dlclose], [LIBLTDL=-lltdl], [LIBLTDL=])],

16961N/A [LIBLTDL=])

14134N/A

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