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

Build: Use commas to separate missing dependencies 

Beautify the output. Also fix the PyGObject test.
This commit is contained in:
Daniel Elstner 2015-08-23 23:53:01 +02:00
parent be21d81a15
commit 26b67f1141
1 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
configure.ac
View File

@ -147,7 +147,7 @@ sr_check_driver_deps() {
for sr_dep for sr_dep
do do
AS_CASE([" $sr_deps_avail "], [*" $sr_dep "*],, AS_CASE([" $sr_deps_avail "], [*" $sr_dep "*],,
[sr_deps_missing="$sr_deps_missing $sr_dep"]) [SR_APPEND([sr_deps_missing], [', '], [$sr_dep])])
done done
} }
@ -255,20 +255,24 @@ sr_cxx_missing=
m4_ifdef([AX_CXX_COMPILE_STDCXX_11], m4_ifdef([AX_CXX_COMPILE_STDCXX_11],
[AX_CXX_COMPILE_STDCXX_11(, [optional])], [AX_CXX_COMPILE_STDCXX_11(, [optional])],
[m4_warn([unsupported], [Missing macro AX_CXX_COMPILE_STDCXX_11: no C++11 check possible])]) [m4_warn([unsupported], [Missing macro AX_CXX_COMPILE_STDCXX_11: no C++11 check possible])])
test "x$HAVE_CXX11" = x1 || sr_cxx_missing="$sr_cxx_missing C++11" AS_IF([test "x$HAVE_CXX11" != x1],
[SR_APPEND([sr_cxx_missing], [', '], ['C++11'])])
# The C++ bindings need glibmm. # The C++ bindings need glibmm.
SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [glibmm-2.4 >= 2.32.0]) SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [glibmm-2.4 >= 2.32.0])
test "x$sr_have_glibmm" = xyes || sr_cxx_missing="$sr_cxx_missing glibmm" AS_IF([test "x$sr_have_glibmm" != xyes],
[SR_APPEND([sr_cxx_missing], [', '], [glibmm])])
# The C++ bindings use Doxygen to parse libsigrok symbols. # The C++ bindings use Doxygen to parse libsigrok symbols.
AC_CHECK_PROG([HAVE_DOXYGEN], [doxygen], [yes], [no]) AC_CHECK_PROG([HAVE_DOXYGEN], [doxygen], [yes], [no])
test "x$HAVE_DOXYGEN" = xyes || sr_cxx_missing="$sr_cxx_missing Doxygen" AS_IF([test "x$HAVE_DOXYGEN" != xyes],
[SR_APPEND([sr_cxx_missing], [', '], [Doxygen])])
# Python is needed for the C++ bindings. # Python is needed for the C++ bindings.
AM_PATH_PYTHON([2.7], AM_PATH_PYTHON([2.7],
[HAVE_PYTHON=yes], [HAVE_PYTHON=yes],
[HAVE_PYTHON=no sr_cxx_missing="$sr_cxx_missing Python"]) [HAVE_PYTHON=no
SR_APPEND([sr_cxx_missing], [', '], [Python])])
AS_IF([test -z "$sr_cxx_missing"], AS_IF([test -z "$sr_cxx_missing"],
[BINDINGS_CXX=$enable_cxx], [BINDINGS_CXX=no]) [BINDINGS_CXX=$enable_cxx], [BINDINGS_CXX=no])
@ -289,19 +293,20 @@ AM_COND_IF([BINDINGS_CXX], [
## Python bindings ## ## Python bindings ##
####################### #######################
sr_python_missing= AS_IF([test "x$BINDINGS_CXX" = xyes],
test "x$BINDINGS_CXX" = xyes || sr_python_missing=" C++ bindings" [sr_python_missing=],
[sr_python_missing='C++ bindings'])
# The Python bindings need Python development files. # The Python bindings need Python development files.
SR_PKG_CHECK([python_dev], [SR_PKGLIBS_PYTHON], SR_PKG_CHECK([python_dev], [SR_PKGLIBS_PYTHON],
[python >= 2.7], [python2 >= 2.7], [python27 >= 2.7]) [python >= 2.7], [python2 >= 2.7], [python27 >= 2.7])
test "x$sr_have_python_dev" = xyes \ AS_IF([test "x$sr_have_python_dev" != xyes],
|| sr_python_missing="$sr_python_missing Headers" [SR_APPEND([sr_python_missing], [', '], [Headers])])
# PyGObject is needed for the Python bindings. # PyGObject is needed for the Python bindings.
SR_PKG_CHECK([pygobject], [SR_PKGLIBS_PYTHON], [pygobject-3.0 >= 3.0.0]) SR_PKG_CHECK([pygobject], [SR_PKGLIBS_PYTHON], [pygobject-3.0 >= 3.0.0])
test "x$sr_have_python_dev" = xyes \ AS_IF([test "x$sr_have_pygobject" != xyes],
|| sr_python_missing="$sr_python_missing PyGObject" [SR_APPEND([sr_python_missing], [', '], [PyGObject])])
PKG_CHECK_EXISTS([pygobject-3.0 < 3.7.91], PKG_CHECK_EXISTS([pygobject-3.0 < 3.7.91],
[AC_DEFINE([PYGOBJECT_FLAGS_SIGNED], [1], [AC_DEFINE([PYGOBJECT_FLAGS_SIGNED], [1],
@ -314,12 +319,13 @@ HAVE_PYMOD_SETUPTOOLS=yes
m4_ifdef([AX_PYTHON_MODULE], m4_ifdef([AX_PYTHON_MODULE],
[AX_PYTHON_MODULE([setuptools])], [AX_PYTHON_MODULE([setuptools])],
[m4_warn([unsupported], [Missing macro AX_PYTHON_MODULE: no setuptools check])]) [m4_warn([unsupported], [Missing macro AX_PYTHON_MODULE: no setuptools check])])
test "x$HAVE_PYMOD_SETUPTOOLS" = xyes \ AS_IF([test "x$HAVE_PYMOD_SETUPTOOLS" != xyes],
|| sr_python_missing="$sr_python_missing Setuptools" [SR_APPEND([sr_python_missing], [', '], [setuptools])])
# The Python bindings use SWIG to generate code. # The Python bindings use SWIG to generate code.
AC_CHECK_PROGS([SWIG], [swig swig2.0 swig3.0], [no]) AC_CHECK_PROGS([SWIG], [swig swig2.0 swig3.0])
test "x$SWIG" != xno || sr_python_missing="$sr_python_missing SWIG" AS_IF([test "x$SWIG" = x],
[SR_APPEND([sr_python_missing], [', '], [SWIG])])
AS_IF([test -z "$sr_python_missing"], AS_IF([test -z "$sr_python_missing"],
[BINDINGS_PYTHON=$enable_python], [BINDINGS_PYTHON=no]) [BINDINGS_PYTHON=$enable_python], [BINDINGS_PYTHON=no])
@ -329,15 +335,18 @@ AM_CONDITIONAL([BINDINGS_PYTHON], [test "x$BINDINGS_PYTHON" = xyes])
## Java bindings ## ## Java bindings ##
#################### ####################
sr_java_missing= AS_IF([test "x$BINDINGS_CXX" = xyes],
test "x$BINDINGS_CXX" = xyes || sr_java_missing=" C++ bindings" [sr_java_missing=],
[sr_java_missing='C++ bindings'])
# The Java bindings use SWIG to generate code. # The Java bindings use SWIG to generate code.
test "x$SWIG" != xno || sr_java_missing="$sr_java_missing SWIG" AS_IF([test "x$SWIG" = x],
[SR_APPEND([sr_java_missing], [', '], [SWIG])])
# Find Java compiler and JNI includes for Java bindings. # Find Java compiler and JNI includes for Java bindings.
AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no]) AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no])
test "x$HAVE_JAVAC" = xyes || sr_java_missing="$sr_java_missing JavaC" AS_IF([test "x$HAVE_JAVAC" = xno],
[SR_APPEND([sr_java_missing], [', '], [JavaC])])
AC_ARG_WITH([jni-include-path], AC_ARG_WITH([jni-include-path],
[AS_HELP_STRING([[--with-jni-include-path=DIR-LIST (space-separated)]], [AS_HELP_STRING([[--with-jni-include-path=DIR-LIST (space-separated)]],
@ -358,13 +367,14 @@ AS_IF([test "x$enable_java$HAVE_JAVAC" = xyesyes], [
]) ])
for sr_dir in $JNI_INCLUDE_DIRS for sr_dir in $JNI_INCLUDE_DIRS
do do
JNI_CPPFLAGS="$JNI_CPPFLAGS -I$sr_dir" SR_APPEND([JNI_CPPFLAGS], ["-I$sr_dir"])
done done
AC_SUBST([JNI_CPPFLAGS]) AC_SUBST([JNI_CPPFLAGS])
sr_save_cppflags=$CPPFLAGS sr_save_cppflags=$CPPFLAGS
CPPFLAGS=$CPPFLAGS$JNI_CPPFLAGS SR_APPEND([CPPFLAGS], [$JNI_CPPFLAGS])
AC_CHECK_HEADER([jni.h],, [sr_java_missing="$sr_java_missing JNI headers"]) AC_CHECK_HEADER([jni.h],,
[SR_APPEND([sr_java_missing], [', '], ['JNI headers'])])
CPPFLAGS=$sr_save_cppflags CPPFLAGS=$sr_save_cppflags
AS_IF([test -z "$sr_java_missing"], AS_IF([test -z "$sr_java_missing"],
@ -376,7 +386,7 @@ AM_CONDITIONAL([BINDINGS_JAVA], [test "x$BINDINGS_JAVA" = xyes])
############################## ##############################
# Add mandatory dependencies to module list. # Add mandatory dependencies to module list.
SR_PKGLIBS="$SR_PKGLIBS${SR_PKGLIBS:+ }libzip >= 0.10" SR_APPEND([SR_PKGLIBS], ['libzip >= 0.10'])
AC_SUBST([SR_PKGLIBS]) AC_SUBST([SR_PKGLIBS])
# Retrieve the compile and link flags for all modules combined. # Retrieve the compile and link flags for all modules combined.