From b668feb62b0b3b4b712bb649a2f7bb3e1d814add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Mon, 20 Apr 2015 15:19:30 +0000 Subject: libsndfile on w32 is called libsndfile-1 svn path=/trunk/externals/iem/iemmatrix/; revision=17452 --- configure.ac | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index e955548..160ef3d 100644 --- a/configure.ac +++ b/configure.ac @@ -167,12 +167,13 @@ AS_IF([test "xno" != "x${with_fftw}" ],[ have_fftw="no" have_fftw3="no" AC_CHECK_LIB([fftw3],[fftw_execute]) -AS_IF([test "x$ac_cv_lib_fftw3_fftw_execute" != "xyes"],[ + AS_IF([test "x$ac_cv_lib_fftw3_fftw_execute" != "xyes"],[ AC_CHECK_LIB([fftw3-3],[fftw_execute]) ac_cv_lib_fftw3_fftw_execute=$ac_cv_lib_fftw3_3_fftw_execute - ]) -AS_IF([test "x$ac_cv_lib_fftw3_fftw_execute" = "xyes"], - [AC_CHECK_HEADER([fftw3.h], [have_fftw3="yes"])]) + ]) + AS_IF([test "x$ac_cv_lib_fftw3_fftw_execute" = "xyes"],[ + AC_CHECK_HEADERS([fftw3.h], [have_fftw3="yes"]) + ]) ]) AS_IF([test "xyes" = "x${have_fftw3}"],[ have_fftw="yes" @@ -187,13 +188,21 @@ AM_CONDITIONAL(HAVE_FFTW, [test "x${have_fftw}" = "xyes"]) dnl for soundfile reading (and writing, if we do that...) AC_ARG_WITH([sndfile], AC_HELP_STRING([--without-sndfile], [compile without libsndfile support])) +have_sndfile="no" AS_IF([test "xno" != "x${with_sndfile}"],[ AC_CHECK_LIB([sndfile], [sf_close]) + AS_IF([test "x$ac_cv_lib_sndfile_sf_close" != "xyes"],[ + AC_CHECK_LIB([sndfile-1],[sf_close]) + ac_cv_lib_sndfile_sf_close=$ac_cv_lib_sndfile_1_sf_close + ]) + AS_IF([test "x$ac_cv_lib_sndfile_sf_close" = "xyes"],[ + AC_CHECK_HEADERS([sndfile.h], [have_sndfile="yes"]) + ]) ]) -AS_IF([test "xyes" = "x${ac_cv_lib_sndfile_sf_close}"],[ +AS_IF([test "xyes" = "x${have_sndfile}"],[ AC_DEFINE(HAVE_LIBSNDFILE,1,[Define to 1 if you have the `sndfile' library (-lsndfile).]) ]) -AM_CONDITIONAL(HAVE_SNDFILE, [test "xyes" = "x${ac_cv_lib_sndfile_sf_close}"]) +AM_CONDITIONAL(HAVE_SNDFILE, [test "xyes" = "x${have_sndfile}"]) dnl for gnu scientific library -lgsl: -- cgit v1.2.1