comparison configure @ 352:d59bb887e4d2

* Update build scripts again; SV now builds (perhaps some problems at runtime still though)
author Chris Cannam
date Wed, 22 Sep 2010 12:27:35 +0100
parents 41f3e8d56bac
children 518224ea73ca
comparison
equal deleted inserted replaced
351:41f3e8d56bac 352:d59bb887e4d2
6575 else 6575 else
6576 liblo_CFLAGS=$pkg_cv_liblo_CFLAGS 6576 liblo_CFLAGS=$pkg_cv_liblo_CFLAGS
6577 liblo_LIBS=$pkg_cv_liblo_LIBS 6577 liblo_LIBS=$pkg_cv_liblo_LIBS
6578 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 6578 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
6579 $as_echo "yes" >&6; } 6579 $as_echo "yes" >&6; }
6580 HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED="" 6580 HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $liblo_CFLAGS";LIBS="$LIBS $liblo_LIBS";SV_MODULE_FAILED=""
6581 fi 6581 fi
6582 fi 6582 fi
6583 if test -n "$SV_MODULE_FAILED"; then 6583 if test -n "$SV_MODULE_FAILED"; then
6584 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` 6584 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
6585 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" 6585 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
6721 else 6721 else
6722 JACK_CFLAGS=$pkg_cv_JACK_CFLAGS 6722 JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
6723 JACK_LIBS=$pkg_cv_JACK_LIBS 6723 JACK_LIBS=$pkg_cv_JACK_LIBS
6724 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 6724 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
6725 $as_echo "yes" >&6; } 6725 $as_echo "yes" >&6; }
6726 HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED="" 6726 HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $JACK_CFLAGS";LIBS="$LIBS $JACK_LIBS";SV_MODULE_FAILED=""
6727 fi 6727 fi
6728 fi 6728 fi
6729 if test -n "$SV_MODULE_FAILED"; then 6729 if test -n "$SV_MODULE_FAILED"; then
6730 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` 6730 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
6731 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" 6731 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
6867 else 6867 else
6868 libpulse_CFLAGS=$pkg_cv_libpulse_CFLAGS 6868 libpulse_CFLAGS=$pkg_cv_libpulse_CFLAGS
6869 libpulse_LIBS=$pkg_cv_libpulse_LIBS 6869 libpulse_LIBS=$pkg_cv_libpulse_LIBS
6870 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 6870 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
6871 $as_echo "yes" >&6; } 6871 $as_echo "yes" >&6; }
6872 HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED="" 6872 HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $libpulse_CFLAGS";LIBS="$LIBS $libpulse_LIBS";SV_MODULE_FAILED=""
6873 fi 6873 fi
6874 fi 6874 fi
6875 if test -n "$SV_MODULE_FAILED"; then 6875 if test -n "$SV_MODULE_FAILED"; then
6876 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` 6876 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
6877 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" 6877 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
7013 else 7013 else
7014 lrdf_CFLAGS=$pkg_cv_lrdf_CFLAGS 7014 lrdf_CFLAGS=$pkg_cv_lrdf_CFLAGS
7015 lrdf_LIBS=$pkg_cv_lrdf_LIBS 7015 lrdf_LIBS=$pkg_cv_lrdf_LIBS
7016 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 7016 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7017 $as_echo "yes" >&6; } 7017 $as_echo "yes" >&6; }
7018 HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED="" 7018 HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $lrdf_CFLAGS";LIBS="$LIBS $lrdf_LIBS";SV_MODULE_FAILED=""
7019 fi 7019 fi
7020 fi 7020 fi
7021 if test -n "$SV_MODULE_FAILED"; then 7021 if test -n "$SV_MODULE_FAILED"; then
7022 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` 7022 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
7023 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" 7023 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
7159 else 7159 else
7160 oggz_CFLAGS=$pkg_cv_oggz_CFLAGS 7160 oggz_CFLAGS=$pkg_cv_oggz_CFLAGS
7161 oggz_LIBS=$pkg_cv_oggz_LIBS 7161 oggz_LIBS=$pkg_cv_oggz_LIBS
7162 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 7162 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7163 $as_echo "yes" >&6; } 7163 $as_echo "yes" >&6; }
7164 HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED="" 7164 HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $oggz_CFLAGS";LIBS="$LIBS $oggz_LIBS";SV_MODULE_FAILED=""
7165 fi 7165 fi
7166 fi 7166 fi
7167 if test -n "$SV_MODULE_FAILED"; then 7167 if test -n "$SV_MODULE_FAILED"; then
7168 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` 7168 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
7169 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" 7169 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
7305 else 7305 else
7306 fishsound_CFLAGS=$pkg_cv_fishsound_CFLAGS 7306 fishsound_CFLAGS=$pkg_cv_fishsound_CFLAGS
7307 fishsound_LIBS=$pkg_cv_fishsound_LIBS 7307 fishsound_LIBS=$pkg_cv_fishsound_LIBS
7308 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 7308 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7309 $as_echo "yes" >&6; } 7309 $as_echo "yes" >&6; }
7310 HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED="" 7310 HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $fishsound_CFLAGS";LIBS="$LIBS $fishsound_LIBS";SV_MODULE_FAILED=""
7311 fi 7311 fi
7312 fi 7312 fi
7313 if test -n "$SV_MODULE_FAILED"; then 7313 if test -n "$SV_MODULE_FAILED"; then
7314 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` 7314 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
7315 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" 7315 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
7451 else 7451 else
7452 mad_CFLAGS=$pkg_cv_mad_CFLAGS 7452 mad_CFLAGS=$pkg_cv_mad_CFLAGS
7453 mad_LIBS=$pkg_cv_mad_LIBS 7453 mad_LIBS=$pkg_cv_mad_LIBS
7454 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 7454 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7455 $as_echo "yes" >&6; } 7455 $as_echo "yes" >&6; }
7456 HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED="" 7456 HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $mad_CFLAGS";LIBS="$LIBS $mad_LIBS";SV_MODULE_FAILED=""
7457 fi 7457 fi
7458 fi 7458 fi
7459 if test -n "$SV_MODULE_FAILED"; then 7459 if test -n "$SV_MODULE_FAILED"; then
7460 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` 7460 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
7461 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" 7461 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
7597 else 7597 else
7598 id3tag_CFLAGS=$pkg_cv_id3tag_CFLAGS 7598 id3tag_CFLAGS=$pkg_cv_id3tag_CFLAGS
7599 id3tag_LIBS=$pkg_cv_id3tag_LIBS 7599 id3tag_LIBS=$pkg_cv_id3tag_LIBS
7600 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 7600 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7601 $as_echo "yes" >&6; } 7601 $as_echo "yes" >&6; }
7602 HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED="" 7602 HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $id3tag_CFLAGS";LIBS="$LIBS $id3tag_LIBS";SV_MODULE_FAILED=""
7603 fi 7603 fi
7604 fi 7604 fi
7605 if test -n "$SV_MODULE_FAILED"; then 7605 if test -n "$SV_MODULE_FAILED"; then
7606 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` 7606 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
7607 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" 7607 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
10020 10020
10021 if ! $QMAKE -r; then 10021 if ! $QMAKE -r; then
10022 as_fn_error $? "qmake failed: Command was \"$QMAKE -r\"" "$LINENO" 5 10022 as_fn_error $? "qmake failed: Command was \"$QMAKE -r\"" "$LINENO" 5
10023 fi 10023 fi
10024 10024
10025 # qmake builds our static libraries, which is fine -- what we'd really
10026 # like to do afterwards is bundle them into a single .so with e.g.
10027
10028 # gcc -Wl,--whole-archive */*.a -Wl,--no-whole-archive -o libsvcore.so
10029
10030 # but how best to arrange this? if it's not possible, we'll presumably
10031 # just have to use a single (q)make(project)file instead.
10032
10033 { $as_echo "$as_me:${as_lineno-$LINENO}: 10025 { $as_echo "$as_me:${as_lineno-$LINENO}:
10034 10026
10035 Configuration complete. 10027 Configuration complete.
10036 Please check the above messages for any warnings that you 10028 Please check the above messages for any warnings that you
10037 might care about, and then run \"make\". 10029 might care about, and then run \"make\".