]> sigrok.org Git - libsigrok.git/blobdiff - configure.ac
output/ascii/bits/hex: Remove stray g_free().
[libsigrok.git] / configure.ac
index f3601b8e1af6da72a0247995ab3cd5b035ff3c74..f8db30c79ced39ef20ea6294f45282e40956ba50 100644 (file)
@@ -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])
 
@@ -89,11 +89,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"],
@@ -129,10 +124,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]]),
@@ -379,7 +374,7 @@ PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
        [CFLAGS="$CFLAGS $libftdi_CFLAGS";
        LIBS="$LIBS $libftdi_LIBS";
        SR_PKGLIBS="$SR_PKGLIBS libftdi"],
-       [HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA8="no"; HW_IKALOGIC_SCANAPLUS="no"])
+       [HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA="no"; HW_IKALOGIC_SCANAPLUS="no"])
 
 # libudev is only needed for some hardware drivers. Disable them if not found.
 PKG_CHECK_MODULES([libudev], [libudev >= 151],
@@ -387,12 +382,6 @@ PKG_CHECK_MODULES([libudev], [libudev >= 151],
        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"])
-
 # 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";
@@ -416,11 +405,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])
@@ -456,9 +440,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)
@@ -611,52 +595,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
 
@@ -673,19 +612,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" "libudev >= 151" "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"
@@ -693,7 +634,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"