X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=e51bbd7a86bf01b2453df1ff7eb7a11166bb903a;hb=acc28b296c39e3d2e970f62331088e0868cf8998;hp=4da57fccac2e5f2f1b70a6308eeb9b5d56df2fa3;hpb=53bd9256920f01cc5b835639c7e7971979ed3350;p=collectd.git diff --git a/configure.in b/configure.in index 4da57fcc..e51bbd7a 100644 --- a/configure.in +++ b/configure.in @@ -57,7 +57,7 @@ AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_HEADER_DIRENT -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) +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) # For ping library AC_CHECK_HEADERS(netinet/in_systm.h, [], [], @@ -968,7 +968,8 @@ then fi AC_ARG_WITH(libpthread, [AS_HELP_STRING([--with-libpthread=@<:@=PREFIX@:>@], [Path to libpthread.])], -[ if test "x$withval" != "xno" -a "x$withval" != "xyes" +[ if test "x$withval" != "xno" \ + && test "x$withval" != "xyes" then LDFLAGS="$LDFLAGS -L$withval/lib" CPPFLAGS="$CPPFLAGS -I$withval/include" @@ -1517,7 +1518,8 @@ fi AC_SUBST(PERL, "$perl_interpreter") -if test "x$with_libperl" = "xyes" -a -n "$perl_interpreter" +if test "x$with_libperl" = "xyes" \ + && test -n "$perl_interpreter" then SAVE_CFLAGS=$CFLAGS SAVE_LDFLAGS=$LDFLAGS @@ -1789,7 +1791,8 @@ with_xmms_cflags="" with_xmms_libs="" AC_ARG_WITH(libxmms, [AS_HELP_STRING([--with-libxmms@<:@=PREFIX@:>@], [Path to libxmms.])], [ - if test "x$withval" != "xno" -a "x$withval" != "xyes" + if test "x$withval" != "xno" \ + && test "x$withval" != "xyes" then if test -f "$withval" && test -x "$withval"; then @@ -2381,7 +2384,8 @@ AC_PLUGIN([wireless], [$plugin_wireless], [Wireless statistics]) AC_PLUGIN([xmms], [$with_libxmms], [XMMS statistics]) dnl ip_vs.h -if test "x$ac_system" = "xLinux" -a "x$have_net_ip_vs_h$have_ip_vs_h" = "xnono" +if test "x$ac_system" = "xLinux" \ + && test "x$have_net_ip_vs_h$have_ip_vs_h" = "xnono" then enable_ipvs="$enable_ipvs (ip_vs.h not found)" fi @@ -2418,12 +2422,14 @@ AC_SUBST(PERL_BINDINGS_OPTIONS) AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/liboconfig/Makefile src/liboping/Makefile bindings/Makefile) -if test "x$with_rrdtool" = "xyes" -a "x$librrd_threadsafe" != "xyes" +if test "x$with_rrdtool" = "xyes" \ + && test "x$librrd_threadsafe" != "xyes" then with_rrdtool="yes (warning: librrd is not thread-safe)" fi -if test "x$with_liboping" = "xyes" -a "x$with_own_liboping" = "xyes" +if test "x$with_liboping" = "xyes" \ + && test "x$with_own_liboping" = "xyes" then with_liboping="yes (shipped version)" fi @@ -2435,7 +2441,8 @@ else enable_perl="no (needs libperl)" fi -if test "x$with_perl_bindings" = "xyes" -a "x$PERL_BINDINGS_OPTIONS" != "x" +if test "x$with_perl_bindings" = "xyes" \ + && test "x$PERL_BINDINGS_OPTIONS" != "x" then with_perl_bindings="yes ($PERL_BINDINGS_OPTIONS)" fi