X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=836048947f3a235e161fcf940c6e4a70191fbdd3;hb=bcc3694ff76ce61ab3754b4ad3e1a27bc8ea162b;hp=16056c2b0f525904d25886e78ae5e0a798cd4729;hpb=39cf2004dc389632cf5bbae9557ed0ee7c86f1e9;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 16056c2b..83604894 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,8 @@ 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 AC_PROG_CXX @@ -46,8 +48,11 @@ AC_PROG_LN_S # Required for per-target flags or subdir-objects with C sources. AM_PROG_CC_C_O +# 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. @@ -224,6 +229,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 +472,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