libcanberra-01-solaris.diff revision 15702
--- libcanberra-0.10/configure.ac-orig 2008-10-13 09:08:45.888690000 -0500
+++ libcanberra-0.10/configure.ac 2008-10-13 09:09:08.413216000 -0500
@@ -19,7 +19,7 @@
# License along with libcanberra. If not, see
# <http://www.gnu.org/licenses/>.
-AC_PREREQ(2.63)
+AC_PREREQ(2.61)
AC_INIT([libcanberra], 0.11, [mzyvopnaoreen (at) 0pointer (dot) de])
AC_CONFIG_SRCDIR([src/common.c])
@@ -57,17 +57,16 @@ AC_USE_SYSTEM_EXTENSIONS
AC_PROG_CXX
-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"
-
-for flag in $DESIRED_FLAGS ; do
- CC_CHECK_CFLAGS([$flag], [CFLAGS="$CFLAGS $flag"])
-done
-
#### libtool stuff ####
-LT_PREREQ(2.2)
-LT_CONFIG_LTDL_DIR([libltdl])
-LT_INIT([dlopen win32-dll disable-static])
-LTDL_INIT([convenience recursive])
+
+AC_LTDL_ENABLE_INSTALL
+AC_LIBLTDL_INSTALLABLE
+AC_LIBTOOL_DLOPEN
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+AC_SUBST(LTDLINCL)
+AC_SUBST(LIBLTDL)
+AC_CONFIG_SUBDIRS(libltdl)
#### Determine build environment ####
@@ -561,7 +560,6 @@ GTK_DOC_CHECK(1.9)
AC_CONFIG_FILES([
Makefile
-libltdl/Makefile
src/Makefile
libcanberra.pc
libcanberra-gtk.pc
--- libcanberra-0.11/Makefile.am-orig 2009-01-21 17:31:36.847858000 -0600
+++ libcanberra-0.11/Makefile.am 2009-01-21 17:31:45.150199000 -0600
@@ -19,7 +19,7 @@
dist_doc_DATA = README
EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas
-SUBDIRS = libltdl src gtkdoc doc
+SUBDIRS = src gtkdoc doc
MAINTAINERCLEANFILES = README
noinst_DATA = README