From: Christian H. <ch...@us...> - 2002-11-27 22:09:01
|
Update of /cvsroot/gaim/gaim In directory sc8-pr-cvs1:/tmp/cvs-serv17063 Modified Files: configure.ac configure.in Log Message: Now that we call the arts binaries instead of using the libs (due to evil lib issues, from what I understand), we no longer need to check for the prescence of these libs. Index: configure.ac =================================================================== RCS file: /cvsroot/gaim/gaim/configure.ac,v retrieving revision 1.88 retrieving revision 1.89 diff -u -d -r1.88 -r1.89 --- configure.ac 8 Nov 2002 18:08:41 -0000 1.88 +++ configure.ac 27 Nov 2002 22:08:58 -0000 1.89 @@ -115,7 +115,6 @@ AC_ARG_ENABLE(esd, [ --disable-esd Turn off ESD (default=auto)],,enable_esd=yes) AC_ARG_ENABLE(nas, [ --enable-nas Enable NAS (Network Audio System) support],,enable_nas=no) -AC_ARG_ENABLE(artsc, [ --disable-artsc Turn off ArtsC (default=auto)],,enable_artsc=yes) AC_ARG_ENABLE(plugins, [ --disable-plugins compile without plugin support],,enable_plugins=yes) AC_ARG_ENABLE(perl, [ --disable-perl compile without perl scripting],,enable_perl=yes) @@ -257,24 +256,6 @@ enable_esd=no fi fi -if test "x$enable_artsc" = "xyes"; then - AM_PATH_ARTSC - if test "x$no_artsc" != "xyes" ; then - old_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $ARTSC_CFLAGS" - AC_TRY_COMPILE(,[#include <artsc.h>], - [ - AC_DEFINE(ARTSC_SOUND, 1, [Define if we have artsc sound support.]) - SOUND_LIBS="$SOUND_LIBS $ARTSC_LIBS" - ],[ - enable_artsc=no - CFLAGS="$old_CFLAGS" - ]) - else - enable_artsc=no - fi -fi -AC_SUBST(SOUND_LIBS) if test "$ac_cv_cygwin" = yes ; then LDADD="$LDADD -static" @@ -413,7 +394,6 @@ echo echo Build with ESD................ : $enable_esd echo Build with NAS................ : $enable_nas -echo Build with ArtsC.............. : $enable_artsc echo echo Print debugging messages...... : $enable_debug echo Index: configure.in =================================================================== RCS file: /cvsroot/gaim/gaim/configure.in,v retrieving revision 1.135 retrieving revision 1.136 diff -u -d -r1.135 -r1.136 --- configure.in 26 Oct 2002 06:41:12 -0000 1.135 +++ configure.in 27 Nov 2002 22:08:58 -0000 1.136 @@ -114,7 +114,6 @@ AC_ARG_ENABLE(esd, [ --disable-esd Turn off ESD (default=auto)],,enable_esd=yes) AC_ARG_ENABLE(nas, [ --enable-nas Enable NAS (Network Audio System) support],,enable_nas=no) -AC_ARG_ENABLE(artsc, [ --disable-artsc Turn off ArtsC (default=auto)],,enable_artsc=yes) AC_ARG_ENABLE(plugins, [ --disable-plugins compile without plugin support],,enable_plugins=yes) AC_ARG_ENABLE(perl, [ --disable-perl compile without perl scripting],,enable_perl=yes) @@ -241,24 +240,6 @@ enable_esd=no fi fi -if test "x$enable_artsc" = "xyes"; then - AM_PATH_ARTSC - if test "x$no_artsc" != "xyes" ; then - old_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $ARTSC_CFLAGS" - AC_TRY_COMPILE(,[#include <artsc.h>], - [ - AC_DEFINE(ARTSC_SOUND, 1, [Define if we have artsc sound support.]) - SOUND_LIBS="$SOUND_LIBS $ARTSC_LIBS" - ],[ - enable_artsc=no - CFLAGS="$old_CFLAGS" - ]) - else - enable_artsc=no - fi -fi -AC_SUBST(SOUND_LIBS) if test "$ac_cv_cygwin" = yes ; then LDADD="$LDADD -static" @@ -397,7 +378,6 @@ echo echo Build with ESD................ : $enable_esd echo Build with NAS................ : $enable_nas -echo Build with ArtsC.............. : $enable_artsc echo echo Print debugging messages...... : $enable_debug echo |