Changeset 317

Show
Ignore:
Timestamp:
01/25/06 05:05:54 (3 years ago)
Author:
kickback
Message:

sweep: reinsert ommited DRIVER_ALSA definition in configure.ac when selecting alsa and add the cflags and libs to Makefile.am now that we use pkg-config.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • sweep/trunk/configure.ac

    r306 r317  
    373373  AC_SUBST(ALSA_CFLAGS) 
    374374  AC_SUBST(ALSA_LIBS) 
     375  AC_DEFINE([DRIVER_ALSA], [], [Define if we have and want alsa.])  
    375376  if test "x$HAVE_ALSA" != xyes ; then 
    376377    AC_CHECK_LIB(asound, snd_seq_open, HAVE_ALSA="maybe", sweep_config_ok="no") 
  • sweep/trunk/src/Makefile.am

    r274 r317  
    1212        @GTK_CFLAGS@ \ 
    1313        @GLIB_CFLAGS@ \ 
    14         @GTHREADS_CFLAGS@ 
     14        @GTHREADS_CFLAGS@ \ 
     15        @ALSA_CFLAGS@ 
     16 
    1517TDB_LIBS = $(top_builddir)/src/tdb/libtdb.a 
    1618 
     
    7476        $(MAD_LIBS) $(SPEEX_LIBS) \ 
    7577        $(SAMPLERATE_LIBS) \ 
    76         @GLIB_LIBS@ @GTHREADS_LIBS@ 
     78        @GLIB_LIBS@ @GTHREADS_LIBS@ \ 
     79        @ALSA_LIBS@ 
    7780 
    7881sweep_LDFLAGS = @EXPORT_DYNAMIC_FLAGS@