X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=545b8b1fc0bb8eef680bc3e50fa33c2d4cb0a85e;hb=f0554946600a7db68f9ef33d25646f17562bf284;hp=0c3b0b7e7cf27ca0c2ce37747facf8766f24f1ec;hpb=8d9c8554a53d3c22305558e6064a6a4873e83fe1;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 0c3b0b7e..545b8b1f 100644 --- a/configure.ac +++ b/configure.ac @@ -34,7 +34,7 @@ AC_CONFIG_MACRO_DIR([autostuff]) AC_CONFIG_AUX_DIR([autostuff]) # We require at least automake 1.11 (needed for 'silent rules'). -AM_INIT_AUTOMAKE([1.11 -Wall -Werror check-news color-tests]) +AM_INIT_AUTOMAKE([1.11 -Wall -Werror subdir-objects check-news color-tests]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) @@ -44,7 +44,8 @@ AH_BOTTOM([#endif /* SR_CONFIG_H */]) # Enable more compiler warnings via -Wall and -Wextra. Add -fvisibility=hidden # and enforce use of SR_API to explicitly mark all public API functions. -CFLAGS="$CFLAGS -Wall -Wextra -Wmissing-prototypes -fvisibility=hidden" +COMMON_FLAGS="$CFLAGS -Wall -Wextra -fvisibility=hidden" +CFLAGS="$COMMON_FLAGS -Wmissing-prototypes" # Checks for programs. AC_PROG_CC @@ -89,11 +90,6 @@ AC_ARG_ENABLE(agilent-dmm, AC_HELP_STRING([--enable-agilent-dmm], [HW_AGILENT_DMM="$enableval"], [HW_AGILENT_DMM=$HW_ENABLED_DEFAULT]) -AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa], - [enable ALSA driver support [default=yes]]), - [HW_ALSA="$enableval"], - [HW_ALSA=$HW_ENABLED_DEFAULT]) - AC_ARG_ENABLE(appa-55ii, AC_HELP_STRING([--enable-appa-55ii], [enable APPA 55II support [default=yes]]), [HW_APPA_55II="$enableval"], @@ -113,10 +109,6 @@ AC_ARG_ENABLE(brymen-bm86x, AC_HELP_STRING([--enable-brymen-bm86x], [enable Brymen BM86X support [default=yes]]), [HW_BRYMEN_BM86X="$enableval"], [HW_BRYMEN_BM86X=$HW_ENABLED_DEFAULT]) -AM_CONDITIONAL(HW_BRYMEN_BM86X, test x$HW_BRYMEN_BM86X = xyes) -if test "x$HW_BRYMEN_BM86X" = "xyes"; then - AC_DEFINE(HAVE_HW_BRYMEN_BM86X, 1, [Brymen BM86X support]) -fi AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm], [enable Brymen DMM support [default=yes]]), @@ -133,10 +125,10 @@ AC_ARG_ENABLE(center-3xx, AC_HELP_STRING([--enable-center-3xx], [HW_CENTER_3XX="$enableval"], [HW_CENTER_3XX=$HW_ENABLED_DEFAULT]) -AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8], - [enable ChronoVu LA8 support [default=yes]]), - [HW_CHRONOVU_LA8="$enableval"], - [HW_CHRONOVU_LA8=$HW_ENABLED_DEFAULT]) +AC_ARG_ENABLE(chronovu-la, AC_HELP_STRING([--enable-chronovu-la], + [enable ChronoVu LA support [default=yes]]), + [HW_CHRONOVU_LA="$enableval"], + [HW_CHRONOVU_LA=$HW_ENABLED_DEFAULT]) AC_ARG_ENABLE(colead-slm, AC_HELP_STRING([--enable-colead-slm], [enable Colead SLM support [default=yes]]), @@ -198,11 +190,6 @@ AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb], [HW_LASCAR_EL_USB="$enableval"], [HW_LASCAR_EL_USB=$HW_ENABLED_DEFAULT]) -AC_ARG_ENABLE(link-mso19, AC_HELP_STRING([--enable-link-mso19], - [enable Link Instruments MSO-19 support [default=no]]), - [HW_LINK_MSO19="$enableval"], - [HW_LINK_MSO19="no"]) - AC_ARG_ENABLE(mic-985xx, AC_HELP_STRING([--enable-mic-985xx], [enable MIC 985xx support [default=yes]]), [HW_MIC_985XX="$enableval"], @@ -301,23 +288,23 @@ AM_CONDITIONAL(NEED_RPC, test "x$have_rpc" != "x0") # Note: glib-2.0 is part of the libsigrok API (hard pkg-config requirement). # We require at least 2.32.0 due to e.g. g_variant_new_fixed_array(). AM_PATH_GLIB_2_0([2.32.0], - [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"]) + [LIB_CFLAGS="$LIB_CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"]) # libzip is always needed. Abort if it's not found. PKG_CHECK_MODULES([libzip], [libzip >= 0.10], - [CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS"; + [LIB_CFLAGS="$LIB_CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS"; SR_PKGLIBS="$SR_PKGLIBS libzip"]) # libserialport is only needed for some hardware drivers. Disable the # respective drivers if it is not found. PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0], - [have_libserialport="yes"; CFLAGS="$CFLAGS $libserialport_CFLAGS"; + [have_libserialport="yes"; LIB_CFLAGS="$LIB_CFLAGS $libserialport_CFLAGS"; LIBS="$LIBS $libserialport_LIBS"; SR_PKGLIBS="$SR_PKGLIBS libserialport"], [have_libserialport="no"; HW_AGILENT_DMM="no"; HW_APPA_55II="no"; HW_ATTEN_PPS3XXX="no"; HW_BRYMEN_DMM="no"; HW_CEM_DT_885X="no"; HW_CENTER_3XX="no"; HW_COLEAD_SLM="no"; HW_CONRAD_DIGI_35_CPU="no"; - HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no"; HW_HAMEG_HMO="no"; HW_LINK_MSO19="no"; + HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no"; HW_HAMEG_HMO="no"; HW_MIC_985XX="no"; HW_NORMA_DMM="no"; HW_OLS="no"; HW_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no"]) @@ -331,7 +318,7 @@ fi AM_CONDITIONAL(NEED_SERIAL, test "x$have_libserialport" != xno) PKG_CHECK_MODULES([librevisa], [librevisa >= 0.0.20130812], - [have_librevisa="yes"; CFLAGS="$CFLAGS $librevisa_CFLAGS"; + [have_librevisa="yes"; LIB_CFLAGS="$LIB_CFLAGS $librevisa_CFLAGS"; LIBS="$LIBS $librevisa_LIBS"; SR_PKGLIBS="$SR_PKGLIBS librevisa"], [have_librevisa="no"]) @@ -357,13 +344,14 @@ case "$host" in ;; *) PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.16], - [have_libusb1_0="yes"; CFLAGS="$CFLAGS $libusb_CFLAGS"; + [have_libusb1_0="yes"; LIB_CFLAGS="$LIB_CFLAGS $libusb_CFLAGS"; LIBS="$LIBS $libusb_LIBS"; SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"], - [have_libusb1_0="no"; HW_FX2LAFW="no"; HW_HANTEK_DSO="no"; - HW_IKALOGIC_SCANALOGIC2="no"; HW_KECHENG_KC_330B="no"; - HW_LASCAR_EL_USB="no"; HW_SYSCLK_LWLA="no"; - HW_UNI_T_DMM="no"; HW_UNI_T_UT32X="no"; HW_VICTOR_DMM="no"; + [have_libusb1_0="no"; HW_BRYMEN_BM86X="no"; HW_FX2LAFW="no"; + HW_HANTEK_DSO="no"; HW_IKALOGIC_SCANALOGIC2="no"; + HW_KECHENG_KC_330B="no"; HW_LASCAR_EL_USB="no"; + HW_SYSCLK_LWLA="no"; HW_UNI_T_DMM="no"; + HW_UNI_T_UT32X="no"; HW_VICTOR_DMM="no"; HW_ZEROPLUS_LOGIC_CUBE="no"; HW_SALEAE_LOGIC16="no"]) # Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0. @@ -379,26 +367,14 @@ AM_CONDITIONAL(NEED_USB, test "x$have_libusb1_0" != xno) # libftdi is only needed for some hardware drivers. Disable them if not found. PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16], - [CFLAGS="$CFLAGS $libftdi_CFLAGS"; + [LIB_CFLAGS="$LIB_CFLAGS $libftdi_CFLAGS"; LIBS="$LIBS $libftdi_LIBS"; SR_PKGLIBS="$SR_PKGLIBS libftdi"], - [HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA8="no"; HW_IKALOGIC_SCANAPLUS="no"]) - -# libudev is only needed for some hardware drivers. Disable them if not found. -PKG_CHECK_MODULES([libudev], [libudev >= 151], - [CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS"; - SR_PKGLIBS="$SR_PKGLIBS libudev"], - [HW_LINK_MSO19="no"]) - -# ALSA is only needed for some hardware drivers. Disable them if not found. -PKG_CHECK_MODULES([alsa], [alsa >= 1.0], - [CFLAGS="$CFLAGS $alsa_CFLAGS"; LIBS="$LIBS $alsa_LIBS"; - SR_PKGLIBS="$SR_PKGLIBS alsa"], - [HW_ALSA="no"]) + [HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA="no"; HW_IKALOGIC_SCANAPLUS="no"]) # The Check unit testing framework is optional. Disable if not found. PKG_CHECK_MODULES([check], [check >= 0.9.4], - [have_check="yes"; CFLAGS="$CFLAGS $check_CFLAGS"; + [have_check="yes"; LIB_CFLAGS="$LIB_CFLAGS $check_CFLAGS"; LIBS="$LIBS $check_LIBS"], [have_check="no"]) AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes") @@ -412,6 +388,8 @@ esac AC_SUBST(SR_PKGLIBS) +CFLAGS="$CFLAGS $LIB_CFLAGS" + # Now set AM_CONDITIONALs and AC_DEFINEs for the enabled/disabled drivers. AM_CONDITIONAL(HW_AGILENT_DMM, test x$HW_AGILENT_DMM = xyes) @@ -419,11 +397,6 @@ if test "x$HW_AGILENT_DMM" = "xyes"; then AC_DEFINE(HAVE_HW_AGILENT_DMM, 1, [Agilent DMM support]) fi -AM_CONDITIONAL(HW_ALSA, test x$HW_ALSA = xyes) -if test "x$HW_ALSA" = "xyes"; then - AC_DEFINE(HAVE_HW_ALSA, 1, [ALSA driver support]) -fi - AM_CONDITIONAL(HW_APPA_55II, test x$HW_APPA_55II = xyes) if test "x$HW_APPA_55II" = "xyes"; then AC_DEFINE(HAVE_HW_APPA_55II, 1, [APPA 55II support]) @@ -439,6 +412,11 @@ if test "x$HW_ATTEN_PPS3XXX" = "xyes"; then AC_DEFINE(HAVE_HW_ATTEN_PPS3XXX, 1, [Atten PPS3xxx support]) fi +AM_CONDITIONAL(HW_BRYMEN_BM86X, test x$HW_BRYMEN_BM86X = xyes) +if test "x$HW_BRYMEN_BM86X" = "xyes"; then + AC_DEFINE(HAVE_HW_BRYMEN_BM86X, 1, [Brymen BM86X support]) +fi + AM_CONDITIONAL(HW_BRYMEN_DMM, test x$HW_BRYMEN_DMM = xyes) if test "x$HW_BRYMEN_DMM" = "xyes"; then AC_DEFINE(HAVE_HW_BRYMEN_DMM, 1, [Brymen DMM support]) @@ -454,9 +432,9 @@ if test "x$HW_CENTER_3XX" = "xyes"; then AC_DEFINE(HAVE_HW_CENTER_3XX, 1, [Center 3xx support]) fi -AM_CONDITIONAL(HW_CHRONOVU_LA8, test x$HW_CHRONOVU_LA8 = xyes) -if test "x$HW_CHRONOVU_LA8" = "xyes"; then - AC_DEFINE(HAVE_HW_CHRONOVU_LA8, 1, [ChronoVu LA8 support]) +AM_CONDITIONAL(HW_CHRONOVU_LA, test x$HW_CHRONOVU_LA = xyes) +if test "x$HW_CHRONOVU_LA" = "xyes"; then + AC_DEFINE(HAVE_HW_CHRONOVU_LA, 1, [ChronoVu LA support]) fi AM_CONDITIONAL(HW_COLEAD_SLM, test x$HW_COLEAD_SLM = xyes) @@ -519,11 +497,6 @@ if test "x$HW_LASCAR_EL_USB" = "xyes"; then AC_DEFINE(HAVE_HW_LASCAR_EL_USB, 1, [Lascar EL-USB support]) fi -AM_CONDITIONAL(HW_LINK_MSO19, test x$HW_LINK_MSO19 = xyes) -if test "x$HW_LINK_MSO19" = "xyes"; then - AC_DEFINE(HAVE_HW_LINK_MSO19, 1, [Link Instruments MSO-19 support]) -fi - AM_CONDITIONAL(HW_MIC_985XX, test x$HW_MIC_985XX = xyes) if test "x$HW_MIC_985XX" = "xyes"; then AC_DEFINE(HAVE_HW_MIC_985XX, 1, [MIC 985xx support]) @@ -609,52 +582,7 @@ AC_SUBST(SR_PACKAGE_VERSION_MINOR) AC_SUBST(SR_PACKAGE_VERSION_MICRO) AC_SUBST(SR_PACKAGE_VERSION) -AC_CONFIG_FILES([Makefile version.h hardware/Makefile - hardware/agilent-dmm/Makefile - hardware/alsa/Makefile - hardware/appa-55ii/Makefile - hardware/asix-sigma/Makefile - hardware/atten-pps3xxx/Makefile - hardware/brymen-bm86x/Makefile - hardware/brymen-dmm/Makefile - hardware/cem-dt-885x/Makefile - hardware/center-3xx/Makefile - hardware/chronovu-la8/Makefile - hardware/colead-slm/Makefile - hardware/common/Makefile - hardware/conrad-digi-35-cpu/Makefile - hardware/gmc-mh-1x-2x/Makefile - hardware/hameg-hmo/Makefile - hardware/ikalogic-scanalogic2/Makefile - hardware/ikalogic-scanaplus/Makefile - hardware/kecheng-kc-330b/Makefile - hardware/lascar-el-usb/Makefile - hardware/mic-985xx/Makefile - hardware/rigol-ds/Makefile - hardware/saleae-logic16/Makefile - hardware/sysclk-lwla/Makefile - hardware/teleinfo/Makefile - hardware/tondaj-sl-814/Makefile - hardware/victor-dmm/Makefile - hardware/common/dmm/Makefile - hardware/demo/Makefile - hardware/fluke-dmm/Makefile - hardware/fx2lafw/Makefile - hardware/hantek-dso/Makefile - hardware/link-mso19/Makefile - hardware/norma-dmm/Makefile - hardware/openbench-logic-sniffer/Makefile - hardware/serial-dmm/Makefile - hardware/uni-t-dmm/Makefile - hardware/uni-t-ut32x/Makefile - hardware/zeroplus-logic-cube/Makefile - input/Makefile - output/Makefile - output/text/Makefile - libsigrok.pc - contrib/Makefile - tests/Makefile - ]) +AC_CONFIG_FILES([Makefile version.h libsigrok.pc]) AC_OUTPUT @@ -671,19 +599,21 @@ echo "Detected libraries:" echo # Note: This only works for libs with pkg-config integration. -for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libudev >= 151" "alsa >= 1.0" "check >= 0.9.4"; do +for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "check >= 0.9.4"; do + optional="OPTIONAL" + if test "x$lib" = "xglib-2.0 >= 2.32.0"; then optional="REQUIRED"; fi + if test "x$lib" = "xlibzip >= 0.10"; then optional="REQUIRED"; fi if `$PKG_CONFIG --exists $lib`; then ver=`$PKG_CONFIG --modversion $lib` answer="yes ($ver)" else answer="no" fi - echo " - $lib: $answer" + echo " - ($optional) $lib: $answer" done echo -e "\nEnabled hardware drivers:\n" echo " - agilent-dmm..................... $HW_AGILENT_DMM" -echo " - alsa............................ $HW_ALSA" echo " - appa-55ii....................... $HW_APPA_55II" echo " - asix-sigma...................... $HW_ASIX_SIGMA" echo " - atten-pps3xxx................... $HW_ATTEN_PPS3XXX" @@ -691,7 +621,7 @@ echo " - brymen-bm86x.................... $HW_BRYMEN_BM86X" echo " - brymen-dmm...................... $HW_BRYMEN_DMM" echo " - cem-dt-885x..................... $HW_CEM_DT_885X" echo " - center-3xx...................... $HW_CENTER_3XX" -echo " - chronovu-la8.................... $HW_CHRONOVU_LA8" +echo " - chronovu-la..................... $HW_CHRONOVU_LA" echo " - colead-slm...................... $HW_COLEAD_SLM" echo " - conrad-digi-35-cpu.............. $HW_CONRAD_DIGI_35_CPU" echo " - demo............................ $HW_DEMO" @@ -704,7 +634,6 @@ echo " - ikalogic-scanalogic2............ $HW_IKALOGIC_SCANALOGIC2" echo " - ikalogic-scanaplus.............. $HW_IKALOGIC_SCANAPLUS" echo " - kecheng-kc-330b................. $HW_KECHENG_KC_330B" echo " - lascar-el-usb................... $HW_LASCAR_EL_USB" -echo " - link-mso19 (EXPERIMENTAL)....... $HW_LINK_MSO19" echo " - mic-985xx....................... $HW_MIC_985XX" echo " - norma-dmm....................... $HW_NORMA_DMM" echo " - openbench-logic-sniffer......... $HW_OLS"