Remove SR_OK_CONTINUE.

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c75de749a058657e0d55b61e038aa8620e0a23ac..aa5cdad554acff0437e98997b2741208bf5a5375 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_CONFIG_HEADERS([config.h include/libsigrok/version.h])
 
 # We require at least automake 1.11 (needed for 'silent rules').
 AM_INIT_AUTOMAKE([1.11 -Wall -Werror no-define nostdinc subdir-objects check-news color-tests])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_SILENT_RULES([yes])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
 AH_TOP([#ifndef SR_CONFIG_H
@@ -115,6 +115,7 @@ SR_CHECK_COMPILE_FLAGS([SR_EXTRA_CFLAGS], [visibility], [-fvisibility=hidden])
 SR_ARG_ENABLE_WARNINGS([SR_WFLAGS], [-Wall], [-Wall -Wextra -Wmissing-prototypes])
 
 # Check host characteristics.
+AC_SYS_LARGEFILE
 AC_C_BIGENDIAN
 
 AC_CHECK_HEADERS([sys/mman.h], [SR_APPEND([sr_deps_avail], [sys_mman_h])])
@@ -127,6 +128,25 @@ AS_CASE([$host], [*-mingw*], [SR_EXTRA_LIBS='-lws2_32'], [SR_EXTRA_LIBS=])
 # libm (the standard math library) is always needed.
 SR_SEARCH_LIBS([SR_EXTRA_LIBS], [pow], [m])
 
+AC_ARG_WITH([libieee1284], [AS_HELP_STRING([--without-libieee1284],
+                               [disable libieee1284 support [default=detect]])])
+sr_have_libieee1284=no
+AS_IF([test "x$with_libieee1284" != xno], [
+       AC_CHECK_HEADER([ieee1284.h], [
+               SR_SEARCH_LIBS([SR_EXTRA_LIBS], [ieee1284_open], [ieee1284], [
+                       sr_have_libieee1284=yes
+                       SR_APPEND([sr_deps_avail], [libieee1284])
+                       sr_pkg_check_summary_append "libieee1284" yes
+               ])
+       ])
+       AS_IF([test "$sr_have_libieee1284" = no], [
+               AS_IF([test "x$with_libieee1284" = xyes], [
+                       AC_MSG_ERROR([libieee1284 support requested, but it was not found.])
+               ])
+               sr_pkg_check_summary_append "libieee1284" no
+       ])
+])
+
 # RPC is only needed for VXI support.
 AC_CACHE_CHECK([for RPC support], [sr_cv_have_rpc],
        [AC_LINK_IFELSE([AC_LANG_PROGRAM(