BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure.ac: Drop gthread check, no longer used. 

We no longer use gthread (its only user was the 'demo' driver), so drop
the 'configure' check for it.

The libsigrok.pc pkg-config file is still correct, since the 'configure'
result propagates there automatically.
This commit is contained in:
Uwe Hermann 2013-01-16 01:31:46 +01:00
parent 3d6de074a4
commit 262dd3e47d
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -266,11 +266,6 @@ SR_PKGLIBS=""
AM_PATH_GLIB_2_0([2.28.0], AM_PATH_GLIB_2_0([2.28.0],
[CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"]) [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
# libgthread-2.0 is always needed (e.g. for the demo hardware driver).
PKG_CHECK_MODULES([gthread], [gthread-2.0 >= 2.22.0],
[CFLAGS="$CFLAGS $gthread_CFLAGS"; LIBS="$LIBS $gthread_LIBS";
SR_PKGLIBS="$SR_PKGLIBS gthread-2.0"])
# libusb-1.0 is only needed for some hardware drivers. # libusb-1.0 is only needed for some hardware drivers.
if test "x$LA_ASIX_SIGMA" != xno \ if test "x$LA_ASIX_SIGMA" != xno \
-o "x$LA_CHRONOVU_LA8" != xno \ -o "x$LA_CHRONOVU_LA8" != xno \
@ -419,7 +414,7 @@ echo "Detected libraries:"
echo echo
# Note: This only works for libs with pkg-config integration. # Note: This only works for libs with pkg-config integration.
for lib in "glib-2.0" "gthread-2.0" "libusb-1.0" "libzip" "libftdi" "libudev" "alsa"; do for lib in "glib-2.0" "libusb-1.0" "libzip" "libftdi" "libudev" "alsa"; do
if `$PKG_CONFIG --exists $lib`; then if `$PKG_CONFIG --exists $lib`; then
ver=`$PKG_CONFIG --modversion $lib` ver=`$PKG_CONFIG --modversion $lib`
answer="yes ($ver)" answer="yes ($ver)"