Skip to content

Commit e7b9a25

Browse files
committed
configure.ac: fixes/improvements
- missing test for bluefish444 - (Arch Linux) zfec default dir fix (in python-zfec package) - sage header build fix (but the library gets hardly compiled)
1 parent a7eaa86 commit e7b9a25

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

configure.ac

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -973,7 +973,7 @@ if test "$bluefish444_req" != no; then
973973
AC_CHECK_HEADERS([BlueVelvetC.h], [BLUE_H=yes], [BLUE_H=no])
974974
AC_CHECK_LIB($BLUEFISH444_LIB_NAME, bfcFactory, [BLUE_L=yes], [BLUE_L=no])
975975

976-
if test "${BLUE_H?}" = yes && "${BLUE_L?}" = yes
976+
if test "${BLUE_H?}" = yes && test "${BLUE_L?}" = yes
977977
then
978978
BLUEFISH444_LIB="$BLUEFISH444_LIB -l$BLUEFISH444_LIB_NAME"
979979
add_module vidcap_bluefish444 src/video_capture/bluefish444.o "$BLUEFISH444_LIB"
@@ -2628,7 +2628,9 @@ if test $sage_req != no; then
26282628
AC_CHECK_LIB(sail, main, FOUND_SAGE_L=yes, FOUND_SAGE_L=no, -lquanta -I${SAGE_INC} -L${SAGE_LIB})
26292629
fi
26302630

2631+
AC_LANG_PUSH(C++)
26312632
AC_CHECK_HEADERS(${SAGE_INC}/sail.h, FOUND_SAGE_H=yes, FOUND_SAGE_H=no)
2633+
AC_LANG_POP(C++)
26322634

26332635
if test $FOUND_SAGE_L = yes && test $FOUND_SAGE_H = yes
26342636
then
@@ -2744,7 +2746,8 @@ found_zfec=no
27442746
if test $cross_compile = no && test "$zfec_req" != no; then
27452747
AC_CHECK_FILES([$ZFEC_PREFIX/fec.c $ZFEC_PREFIX/fec.h], [found_zfec=yes])
27462748
if test $found_zfec = no; then
2747-
ZFEC_PREFIX=/usr/lib/python3/dist-packages/zfec
2749+
ZFEC_PREFIX=$(ls -d /usr/lib/python* 2>/dev/null |
2750+
tail -n 1)/dist-packages/zfec
27482751
if test ! -d "$ZFEC_PREFIX"; then
27492752
ZFEC_PREFIX=$(echo /usr/lib/python* | sed 's/.* \(@<:@^ @:>@*\)/\1/')/site-packages/zfec
27502753
fi

0 commit comments

Comments
 (0)