X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=d773d7f201cf674055f61195b6b27236fb7f8820;hb=56c8705e37314dafe35b680d2254b6f844e0ecc2;hp=c562d1b7abd080919f1033a026e30a9640267404;hpb=c1adbb1e235629d62be02e8b579478ed1594da44;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index c562d1b7..d773d7f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,9 +33,7 @@ AM_INIT_AUTOMAKE([1.11 -Wall -Werror no-define nostdinc subdir-objects check-new
 AM_SILENT_RULES([yes])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
-AH_TOP([#ifndef SR_CONFIG_H
-#define SR_CONFIG_H    /* To stop multiple inclusions. */])
-AH_BOTTOM([#endif /* SR_CONFIG_H */])
+AC_CANONICAL_HOST
 
 # Checks for programs.
 AC_PROG_CC
@@ -46,8 +44,17 @@ AC_PROG_LN_S
 # Required for per-target flags or subdir-objects with C sources.
 AM_PROG_CC_C_O
 
+# Set the standard the C library headers should conform to.
+AH_VERBATIM([_POSIX_C_SOURCE], [/* The targeted POSIX standard. */
+#ifndef _POSIX_C_SOURCE
+# define _POSIX_C_SOURCE 200112L
+#endif])
+
+# Get compiler versions.
+SR_PROG_VERSION([$CC], [sr_cc_version])
+SR_PROG_VERSION([$CXX], [sr_cxx_version])
+
 # Check for optional make features.
-SR_PROG_MAKE_NO_PRINT_DIRECTORY
 SR_PROG_MAKE_ORDER_ONLY
 
 # Initialize libtool.
@@ -114,7 +121,7 @@ SR_ARG_OPT_CHECK([libieee1284], [LIBIEEE1284],, [
 	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ieee1284.h>]],
 				[[(void) ieee1284_open(0, 0, 0);]])],
 		[sr_have_libieee1284=yes], [sr_have_libieee1284=no])
-	sr_save_LIBS=$LIBS
+	LIBS=$sr_save_LIBS
 ])
 AS_IF([test "x$sr_have_libieee1284" = xyes],
 	[SR_PREPEND([SR_EXTRA_LIBS], [-lieee1284])])
@@ -224,6 +231,7 @@ SR_DRIVER([fx2lafw], [fx2lafw], [libusb])
 SR_DRIVER([GMC MH 1x/2x], [gmc-mh-1x-2x], [libserialport])
 SR_DRIVER([Hameg HMO], [hameg-hmo], [libserialport])
 SR_DRIVER([Hantek DSO], [hantek-dso], [libusb])
+SR_DRIVER([Hung-Chang DSO-2100], [hung-chang-dso-2100], [libieee1284])
 SR_DRIVER([Ikalogic Scanalogic-2], [ikalogic-scanalogic2], [libusb])
 SR_DRIVER([Ikalogic Scanaplus], [ikalogic-scanaplus], [libftdi])
 SR_DRIVER([Kecheng KC-330B], [kecheng-kc-330b], [libusb])
@@ -466,11 +474,15 @@ libsigrok configuration summary:
  - Prefix.......................... $prefix
  - Building on..................... $build
  - Building for.................... $host
+
+Compile configuration:
  - C compiler...................... $CC
+ - C compiler version.............. $sr_cc_version
  - C compiler flags................ $CFLAGS
  - Additional C compiler flags..... $SR_EXTRA_CFLAGS
  - C compiler warnings............. $SR_WFLAGS
  - C++ compiler.................... $CXX
+ - C++ compiler version............ $sr_cxx_version
  - C++ compiler flags.............. $CXXFLAGS
  - C++ compiler warnings........... $SR_WXXFLAGS