← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/collectd/oneiric

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Morten Kjeldgaard
  • Date: 2008-11-18 15:54:20 UTC
  • mfrom: (1.1.5 upstream) (3.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20081118155420-sc2mxv2pebafkmon
Tags: 4.4.2-2ubuntu1
https://launchpad.net/bugs/298828
* Merge from Debian unstable (LP: #298828). Remaining Ubuntu changes:
* Add ubuntu_in6-glibc28.dpatch patch, fix FTBFS.
* Add ubuntu_hardening.dpatch patch, fix FTBFS.
* Add ubuntu_perl.c.dpatch, fix FTBFS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
57
57
AC_HEADER_SYS_WAIT
58
58
AC_HEADER_DIRENT
59
59
 
60
 
AC_CHECK_HEADERS(stdint.h stdio.h errno.h math.h stdarg.h syslog.h fcntl.h signal.h assert.h sys/types.h sys/socket.h sys/select.h poll.h netdb.h arpa/inet.h sys/resource.h sys/param.h kstat.h regex.h sys/ioctl.h endian.h)
 
60
AC_CHECK_HEADERS(stdint.h stdio.h errno.h math.h stdarg.h syslog.h fcntl.h signal.h assert.h sys/types.h sys/socket.h sys/select.h poll.h netdb.h arpa/inet.h sys/resource.h sys/param.h kstat.h regex.h sys/ioctl.h endian.h sys/isa_defs.h)
61
61
 
62
62
# For ping library
63
63
AC_CHECK_HEADERS(netinet/in_systm.h, [], [],
891
891
             [AC_DEFINE(HAVE_LIBHAL, 1, [Define to 1 if you have 'hal' library])],
892
892
             [with_libhal="no"])
893
893
if test "x$with_libhal" = "xyes"; then
894
 
        PKG_PROG_PKG_CONFIG
895
894
        if test "x$PKG_CONFIG" != "x"; then
896
895
                BUILD_WITH_LIBHAL_CFLAGS="`pkg-config --cflags hal`"
897
896
                BUILD_WITH_LIBHAL_LIBS="`pkg-config --libs hal`"
1738
1737
fi
1739
1738
AM_CONDITIONAL(BUILD_WITH_LIBNETSNMP, test "x$with_libnetsnmp" = "xyes")
1740
1739
 
1741
 
with_upsclient_config="libupsclient-config"
1742
 
with_upsclient_cflags=""
1743
 
with_upsclient_libs=""
1744
 
AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@], [Path to libupsclient.])],
1745
 
[
1746
 
        if test "x$withval" = "xno"
 
1740
with_libupsclient="no (pkg-config isn't available)"
 
1741
with_libupsclient_cflags=""
 
1742
with_libupsclient_libs=""
 
1743
if test "x$PKG_CONFIG" != "x"
 
1744
then
 
1745
        pkg-config --exists 'libupsclient' 2>/dev/null
 
1746
        if test "$?" = "0"
1747
1747
        then
1748
 
                with_libupsclient="no"
1749
 
        else
1750
 
                if test "x$withval" != "xyes"
1751
 
                then
1752
 
                        if test -f "$withval" && test -x "$withval";
1753
 
                        then
1754
 
                                with_upsclient_config="$withval"
1755
 
                        else
1756
 
                                with_upsclient_config="$withval/bin/libupsclient-config"
1757
 
                        fi
1758
 
                fi
1759
1748
                with_libupsclient="yes"
 
1749
        else
 
1750
                with_libupsclient="no (pkg-config doesn't know library)"
1760
1751
        fi
1761
 
],
1762
 
[
1763
 
        with_libupsclient="yes"
1764
 
])
 
1752
fi
1765
1753
if test "x$with_libupsclient" = "xyes"
1766
1754
then
1767
 
        with_upsclient_cflags=`$with_upsclient_config --cflags 2>/dev/null`
1768
 
        upsclient_config_status=$?
1769
 
 
1770
 
        if test $upsclient_config_status -ne 0
1771
 
        then
1772
 
                with_libupsclient="no ($with_upsclient_config failed)"
 
1755
        with_libupsclient_cflags="`pkg-config --cflags 'libupsclient'`"
 
1756
        if test $? -ne 0
 
1757
        then
 
1758
                with_libupsclient="no"
 
1759
        fi
 
1760
        with_libupsclient_libs="`pkg-config --libs 'libupsclient'`"
 
1761
        if test $? -ne 0
 
1762
        then
 
1763
                with_libupsclient="no"
1773
1764
        fi
1774
1765
fi
1775
1766
if test "x$with_libupsclient" = "xyes"
1776
1767
then
1777
1768
        SAVE_CPPFLAGS="$CPPFLAGS"
1778
 
        CPPFLAGS="$CPPFLAGS $with_upsclient_cflags"
 
1769
        CPPFLAGS="$CPPFLAGS $with_libupsclient_cflags"
1779
1770
 
1780
1771
        AC_CHECK_HEADERS(upsclient.h, [], [with_libupsclient="no (upsclient.h not found)"])
1781
1772
 
1783
1774
fi
1784
1775
if test "x$with_libupsclient" = "xyes"
1785
1776
then
1786
 
        with_upsclient_libs=`$with_upsclient_config --libs 2>/dev/null`
1787
 
        upsclient_config_status=$?
1788
 
 
1789
 
        if test $upsclient_config_status -ne 0
1790
 
        then
1791
 
                with_libupsclient="no ($with_upsclient_config failed)"
1792
 
        fi
1793
 
fi
1794
 
if test "x$with_libupsclient" = "xyes"
1795
 
then
 
1777
        SAVE_CPPFLAGS="$CPPFLAGS"
 
1778
        SAVE_LDFLAGS="$LDFLAGS"
 
1779
 
 
1780
        CPPFLAGS="$CPPFLAGS $with_libupsclient_cflags"
 
1781
        LDFLAGS="$LDFLAGS $with_libupsclient_libs"
 
1782
 
1796
1783
        AC_CHECK_LIB(upsclient, upscli_connect,
1797
 
        [
1798
 
                BUILD_WITH_LIBUPSCLIENT_CFLAGS="$with_upsclient_cflags"
1799
 
                BUILD_WITH_LIBUPSCLIENT_LIBS="$with_upsclient_libs"
1800
 
                AC_SUBST(BUILD_WITH_LIBUPSCLIENT_CFLAGS)
1801
 
                AC_SUBST(BUILD_WITH_LIBUPSCLIENT_LIBS)
1802
 
        ],
1803
 
        [
1804
 
                with_libupsclient="no (symbol 'upscli_connect' not found)"
1805
 
        ], [$with_upsclient_libs])
 
1784
                     [with_libupsclient="yes"],
 
1785
                     [with_libupsclient="no (symbol upscli_connect not found)"])
 
1786
 
 
1787
        CPPFLAGS="$SAVE_CPPFLAGS"
 
1788
        LDFLAGS="$SAVE_LDFLAGS"
1806
1789
fi
1807
1790
if test "x$with_libupsclient" = "xyes"
1808
1791
then
1809
1792
        SAVE_CPPFLAGS="$CPPFLAGS"
1810
 
        CPPFLAGS="$CPPFLAGS $with_upsclient_cflags"
 
1793
        CPPFLAGS="$CPPFLAGS $with_libupsclient_cflags"
1811
1794
 
1812
1795
        AC_CHECK_TYPES([UPSCONN_t, UPSCONN], [], [],
1813
1796
[#include <stdlib.h>
1816
1799
 
1817
1800
        CPPFLAGS="$SAVE_CPPFLAGS"
1818
1801
fi
1819
 
AM_CONDITIONAL(BUILD_WITH_LIBUPSCLIENT, test "x$with_libupsclient" = "xyes")
 
1802
if test "x$with_libupsclient" = "xyes"
 
1803
then
 
1804
        BUILD_WITH_LIBUPSCLIENT_CFLAGS="$with_libupsclient_cflags"
 
1805
        BUILD_WITH_LIBUPSCLIENT_LIBS="$with_libupsclient_libs"
 
1806
        AC_SUBST(BUILD_WITH_LIBUPSCLIENT_CFLAGS)
 
1807
        AC_SUBST(BUILD_WITH_LIBUPSCLIENT_LIBS)
 
1808
fi
1820
1809
 
1821
1810
### BEGIN of check for libxmms ###
1822
1811
with_xmms_config="xmms-config"