Changeset 306

Show
Ignore:
Timestamp:
01/16/06 10:47:13 (3 years ago)
Author:
kickback
Message:

sweep:configure.ac: make missing alsa requisites cause a configure error. fixes ticket:11 in the trac

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sweep/trunk/configure.ac

    r291 r306  
    369369if test "x${ac_enable_alsa}" != xno ; then 
    370370 
    371   AC_CHECK_HEADERS(alsa/asoundlib.h) 
    372   if test "x${ac_cv_header_alsa_asoundlib_h}" = xyes ; then 
    373     AC_DEFINE([DRIVER_ALSA], [], [Define if we have and want alsa.]) 
    374     LIBS="$LIBS -lasound" 
    375   fi 
    376  
     371  PKG_CHECK_MODULES(ALSA, alsa >= 1.0.0, 
     372                  HAVE_ALSA="yes", sweep_config_ok="no") 
     373  AC_SUBST(ALSA_CFLAGS) 
     374  AC_SUBST(ALSA_LIBS) 
     375  if test "x$HAVE_ALSA" != xyes ; then 
     376    AC_CHECK_LIB(asound, snd_seq_open, HAVE_ALSA="maybe", sweep_config_ok="no") 
     377  fi     
    377378  sweep_config_driver="ALSA" 
    378379fi 
    …… 
    540541if test "x$HAVE_LIBSNDFILE0" = xyes ; then 
    541542    AC_MSG_RESULT([ 
    542       Incorrect version: Your system appears to have an old 
     543      Development files missing: Your system appears to have an old 
    543544      version of libsndfile (below 1.0.0) installed. 
    544545]) 
    545546fi 
    546547 
    547 if test "x$HAVE_VORBIS" != xyes ; then 
     548if test "x$HAVE_ALSA" = xmaybe ; then 
    548549    AC_MSG_RESULT([ 
    549 *** Ogg Vorbis libraries, available from  http://www.xiph.org/ogg/vorbis/ 
    550 ]) 
    551 fi 
     550      Development files missing: alsa-lib 1.0.0 or greater seems to exist 
     551      on your system, however the pkg-config tool cannot find the 
     552      build information. 
     553]) 
     554fi 
     555 
     556if test "x$HAVE_ALSA" != xyes ; then 
     557  AC_MSG_RESULT([ 
     558*** alsa-lib version 1.0.0 or greater, available from 
     559*** http://alsa-project.org/ 
     560]) 
     561fi 
     562 
    552563if test "x$HAVE_VORBIS" = xmaybe ; then 
    553564    AC_MSG_RESULT([ 
    …… 
    556567      a test program failed. 
    557568]) 
    558 fi  
     569fi 
     570 
     571if test "x$HAVE_VORBIS" != xyes ; then 
     572    AC_MSG_RESULT([ 
     573*** Ogg Vorbis libraries, available from  http://www.xiph.org/ogg/vorbis/ 
     574]) 
     575fi 
     576 
    559577if test "x$HAVE_VORBIS" != xyes ; then 
    560578    AC_MSG_RESULT([ 
    …… 
    567585if test "x$HAVE_GLIB" = xmaybe || test "x$HAVE_GTK" = xmaybe || 
    568586   test "x$HAVE_LIBSNDFILE1" = xmaybe || test "x$HAVE_TDB" = xmaybe || 
    569    test "x$HAVE_GTHREADS" = xmaybe || 
     587   test "x$HAVE_GTHREADS" = xmaybe || test "x$HAVE_ALSA" = xmaybe || 
    570588   test "x$HAVE_OGG" = xmaybe || test "x$HAVE_VORBIS" = xmaybe ; then 
    571589  AC_MSG_RESULT([