right WRT threading. Use AC_LANG(C) instead of AC_LANG(C++) so that
tests by default are in C mode . If not, checks such as
AC_CHECK_LIB($ax_lib, main) fails on Sun Studio C which complains
about retursive calls to main.
AC_PROG_RANLIB
AM_PROG_LIBTOOL
AC_PROG_RANLIB
AM_PROG_LIBTOOL
-# Use C++ compilers only for tests
-AC_LANG(C++)
+# Default language to use for tests (some tests may switch to C++)
+AC_LANG(C)
if test "$enable_shared" = "yes"; then
AC_DEFINE([HAVE_DL_SUPPORT],[1],
if test "$enable_shared" = "yes"; then
AC_DEFINE([HAVE_DL_SUPPORT],[1],
# Checks for libraries.
AC_CHECK_LIB(dl,dlopen)
# Checks for libraries.
AC_CHECK_LIB(dl,dlopen)
+## YAZPP checks
+YAZPP_INIT(threads,1.0.2)
+if test -z "$YAZPPLIB"; then
+ AC_MSG_ERROR([YAZ++ development libraries missing])
+fi
+YAZ_DOC
+CPPFLAGS="$YAZPPINC $CPPFLAGS"
# check for Boost C++ development libs and headers
# check for Boost C++ development libs and headers
-## YAZPP checks
-YAZPP_INIT(threads,1.0.2)
-if test -z "$YAZPPLIB"; then
- AC_MSG_ERROR([YAZ++ development libraries missing])
-fi
-YAZ_DOC
# Checks for header files.
##AC_HEADER_STDC
# Checks for header files.
##AC_HEADER_STDC
-## $Id: Makefile.am,v 1.63 2007-02-26 11:40:03 marc Exp $
+## $Id: Makefile.am,v 1.64 2007-02-26 13:31:00 adam Exp $
MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
-AM_CXXFLAGS = $(YAZPPINC) $(BOOST_CPPFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS)
AM_LDFLAGS = $(BOOST_LDFLAGS) \
$(BOOST_DATE_TIME_LIB) \
AM_LDFLAGS = $(BOOST_LDFLAGS) \
$(BOOST_DATE_TIME_LIB) \