comparison configure.ac @ 2454:2c8bb51ba9cd

Minor shellscript consistency cleanups, always test strings in style of 'test "x$foo" = "xbar"'.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 14 Mar 2008 15:13:40 +0200
parents 76464124f697
children 77af181204e7 073c6eac0390
comparison
equal deleted inserted replaced
2453:e3225b9b3e59 2454:2c8bb51ba9cd
21 if test -d "/usr/X11R6/include"; then 21 if test -d "/usr/X11R6/include"; then
22 CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include" 22 CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
23 fi 23 fi
24 24
25 dnl append audacious header path to CPPFLAGS when --prefix is specified. 25 dnl append audacious header path to CPPFLAGS when --prefix is specified.
26 if test "$prefix" != "NONE" ; then 26 if test "x$prefix" != "xNONE" ; then
27 CPPFLAGS="$CPPFLAGS -I${includedir}" 27 CPPFLAGS="$CPPFLAGS -I${includedir}"
28 fi 28 fi
29 29
30 dnl OMK bootstrap 30 dnl OMK bootstrap
31 AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME]) 31 AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])
39 AC_PROG_CC 39 AC_PROG_CC
40 AC_PROG_CXX 40 AC_PROG_CXX
41 AC_ISC_POSIX 41 AC_ISC_POSIX
42 AC_C_BIGENDIAN 42 AC_C_BIGENDIAN
43 43
44 if test x"$GCC" = x"yes"; then 44 if test "x$GCC" = "xyes"; then
45 CFLAGS="$CFLAGS -pipe -Wall" 45 CFLAGS="$CFLAGS -pipe -Wall"
46 CXXFLAGS="$CXXFLAGS -pipe -Wall" 46 CXXFLAGS="$CXXFLAGS -pipe -Wall"
47 fi 47 fi
48 48
49 dnl Locate a program and check that its version is acceptable. 49 dnl Locate a program and check that its version is acceptable.
174 dnl IPv6 support 174 dnl IPv6 support
175 dnl ======================== 175 dnl ========================
176 AC_ARG_ENABLE(ipv6, 176 AC_ARG_ENABLE(ipv6,
177 [ --enable-ipv6 enable IPv6 support (default=no)], 177 [ --enable-ipv6 enable IPv6 support (default=no)],
178 enable_ipv6=$enableval, enable_ipv6=no) 178 enable_ipv6=$enableval, enable_ipv6=no)
179 if test "x$enable_ipv6" = xyes; then 179 if test "x$enable_ipv6" = "xyes"; then
180 AC_DEFINE(USE_IPV6,, [Define if building with IPv6 support] ) 180 AC_DEFINE(USE_IPV6,, [Define if building with IPv6 support] )
181 fi 181 fi
182 AM_CONDITIONAL(USE_IPV6,test "x$enable_ipv6" = xyes) 182 AM_CONDITIONAL(USE_IPV6,test "x$enable_ipv6" = "xyes")
183 AC_SUBST(USE_IPV6) 183 AC_SUBST(USE_IPV6)
184 184
185 dnl chardet support 185 dnl chardet support
186 dnl ======================== 186 dnl ========================
187 AC_ARG_ENABLE(chardet, 187 AC_ARG_ENABLE(chardet,
188 [ --enable-chardet enable character set detection support (default=no)], 188 [ --enable-chardet enable character set detection support (default=no)],
189 enable_chardet=$enableval, enable_chardet=no) 189 enable_chardet=$enableval, enable_chardet=no)
190 if test "x$enable_chardet" = xyes; then 190 if test "x$enable_chardet" = "xyes"; then
191 AC_DEFINE(USE_CHARDET, 1, [Define if character set detection enabled] ) 191 AC_DEFINE(USE_CHARDET, 1, [Define if character set detection enabled] )
192 fi 192 fi
193 AM_CONDITIONAL(USE_CHARDET,test "x$enable_chardet" = xyes) 193 AM_CONDITIONAL(USE_CHARDET,test "x$enable_chardet" = "xyes")
194 AC_SUBST(USE_CHARDET) 194 AC_SUBST(USE_CHARDET)
195 195
196 dnl plugin stuff 196 dnl plugin stuff
197 dnl ======================== 197 dnl ========================
198 198
199 BUILDSYS_SHARED_LIB 199 BUILDSYS_SHARED_LIB
200 BUILDSYS_PROG_IMPLIB 200 BUILDSYS_PROG_IMPLIB
201 test x"$PROG_IMPLIB_NEEDED" = x"yes" && LIBS="$LIBS -L\${libdir} -laudacious.exe" 201 test "x$PROG_IMPLIB_NEEDED" = "xyes" && LIBS="$LIBS -L\${libdir} -laudacious.exe"
202 202
203 dnl Ok, first we find out what flags we need to use. 203 dnl Ok, first we find out what flags we need to use.
204 AC_MSG_CHECKING([for what extension and flags to use for plugin compilation]) 204 AC_MSG_CHECKING([for what extension and flags to use for plugin compilation])
205 case "$target" in 205 case "$target" in
206 *-apple-*) 206 *-apple-*)
245 [ --disable-esd disable esound output plugin [default=enabled]], 245 [ --disable-esd disable esound output plugin [default=enabled]],
246 [enable_esd=$enableval], 246 [enable_esd=$enableval],
247 [enable_esd="yes"] 247 [enable_esd="yes"]
248 ) 248 )
249 249
250 if test "$enable_esd" = "yes"; then 250 if test "x$enable_esd" = "xyes"; then
251 PKG_CHECK_MODULES(ESD, [esound >= 0.2], 251 PKG_CHECK_MODULES(ESD, [esound >= 0.2],
252 [have_esd=yes 252 [have_esd=yes
253 OUTPUT_PLUGINS="$OUTPUT_PLUGINS esd"], 253 OUTPUT_PLUGINS="$OUTPUT_PLUGINS esd"],
254 [have_esd=no] 254 [have_esd=no]
255 ) 255 )
264 [ --disable-pulse disable PulseAudio output plugin [default=enabled]], 264 [ --disable-pulse disable PulseAudio output plugin [default=enabled]],
265 [enable_pulse=$enableval], 265 [enable_pulse=$enableval],
266 [enable_pulse="yes"] 266 [enable_pulse="yes"]
267 ) 267 )
268 268
269 if test "$enable_pulse" = "yes"; then 269 if test "x$enable_pulse" = "xyes"; then
270 PKG_CHECK_MODULES(PULSE, [libpulse >= 0.9.9], 270 PKG_CHECK_MODULES(PULSE, [libpulse >= 0.9.9],
271 [have_pulse=yes 271 [have_pulse=yes
272 OUTPUT_PLUGINS="$OUTPUT_PLUGINS pulse_audio"], 272 OUTPUT_PLUGINS="$OUTPUT_PLUGINS pulse_audio"],
273 [have_pulse=no] 273 [have_pulse=no]
274 ) 274 )
283 [ --disable-coreaudio disable CoreAudio output plugin (default=enabled)], 283 [ --disable-coreaudio disable CoreAudio output plugin (default=enabled)],
284 [enable_coreaudio=$enableval], 284 [enable_coreaudio=$enableval],
285 [enable_coreaudio="yes"] 285 [enable_coreaudio="yes"]
286 ) 286 )
287 287
288 if test "$enable_coreaudio" = "yes"; then 288 if test "x$enable_coreaudio" = "xyes"; then
289 AC_CHECK_HEADERS([CoreServices/CoreServices.h], 289 AC_CHECK_HEADERS([CoreServices/CoreServices.h],
290 [have_coreaudio=yes 290 [have_coreaudio=yes
291 OUTPUT_PLUGINS="$OUTPUT_PLUGINS CoreAudio"], 291 OUTPUT_PLUGINS="$OUTPUT_PLUGINS CoreAudio"],
292 [have_coreaudio=no]) 292 [have_coreaudio=no])
293 else 293 else
301 [ --disable-dockalbumart disable MacOS dock albumart plugin (default=guess)], 301 [ --disable-dockalbumart disable MacOS dock albumart plugin (default=guess)],
302 [enable_dockalbumart=$enableval], 302 [enable_dockalbumart=$enableval],
303 [enable_dockalbumart="yes"] 303 [enable_dockalbumart="yes"]
304 ) 304 )
305 305
306 if test "$enable_dockalbumart" = "yes"; then 306 if test "x$enable_dockalbumart" = "xyes"; then
307 AC_CHECK_HEADERS([Carbon/Carbon.h], 307 AC_CHECK_HEADERS([Carbon/Carbon.h],
308 [have_dockalbumart=yes 308 [have_dockalbumart=yes
309 GENERAL_PLUGINS="$GENERAL_PLUGINS dockalbumart"], 309 GENERAL_PLUGINS="$GENERAL_PLUGINS dockalbumart"],
310 [have_dockalbumart=no]) 310 [have_dockalbumart=no])
311 else 311 else
367 [ --disable-mp3 disable mp3 plugin. (default=enabled) ], 367 [ --disable-mp3 disable mp3 plugin. (default=enabled) ],
368 [enable_mp3=$enableval], 368 [enable_mp3=$enableval],
369 [enable_mp3=yes] 369 [enable_mp3=yes]
370 ) 370 )
371 371
372 if test "$enable_mp3" = "yes"; then 372 if test "x$enable_mp3" = "xyes"; then
373 AM_PATH_LIBMAD([enable_mp3=yes], 373 AM_PATH_LIBMAD([enable_mp3=yes],
374 [AC_MSG_WARN([*** Cannot find libmad, mp3 plugin will not be built ***]) 374 [AC_MSG_WARN([*** Cannot find libmad, mp3 plugin will not be built ***])
375 enable_mp3=no] 375 enable_mp3=no]
376 ) 376 )
377 else 377 else
378 AC_MSG_RESULT([*** mp3 plugin disabled per user request ***]) 378 AC_MSG_RESULT([*** mp3 plugin disabled per user request ***])
379 enable_mp3=no 379 enable_mp3=no
380 fi 380 fi
381 381
382 if test "$enable_mp3" = "yes"; then 382 if test "x$enable_mp3" = "xyes"; then
383 AC_MSG_CHECKING(mad.h suitability) 383 AC_MSG_CHECKING(mad.h suitability)
384 ac_save_CFLAGS="$CFLAGS" 384 ac_save_CFLAGS="$CFLAGS"
385 CFLAGS="$CFLAGS $MAD_CFLAGS $AUDACIOUS_CFLAGS" 385 CFLAGS="$CFLAGS $MAD_CFLAGS $AUDACIOUS_CFLAGS"
386 AC_TRY_RUN( 386 AC_TRY_RUN(
387 [ 387 [
399 ], 399 ],
400 ) 400 )
401 CFLAGS="$ac_save_CFLAGS" 401 CFLAGS="$ac_save_CFLAGS"
402 fi 402 fi
403 403
404 if test "$enable_mp3" = "yes"; then 404 if test "x$enable_mp3" = "xyes"; then
405 INPUT_PLUGINS="$INPUT_PLUGINS madplug" 405 INPUT_PLUGINS="$INPUT_PLUGINS madplug"
406 fi 406 fi
407 407
408 AC_SUBST(MAD_CFLAGS) 408 AC_SUBST(MAD_CFLAGS)
409 AC_SUBST(MAD_LIBS) 409 AC_SUBST(MAD_LIBS)
414 AS_HELP_STRING([--disable-rocklight], [disable Rocklight vis plugin (default=enabled)]), 414 AS_HELP_STRING([--disable-rocklight], [disable Rocklight vis plugin (default=enabled)]),
415 [enable_rocklight="$enableval"], 415 [enable_rocklight="$enableval"],
416 [enable_rocklight="yes"] 416 [enable_rocklight="yes"]
417 ) 417 )
418 418
419 if test "$enable_rocklight" = "yes"; then 419 if test "x$enable_rocklight" = "xyes"; then
420 VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS rocklight" 420 VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS rocklight"
421 fi 421 fi
422 422
423 dnl *** LIRC client libraries 423 dnl *** LIRC client libraries
424 424
426 [ --disable-lirc disable LIRC plugin (default=enabled)], 426 [ --disable-lirc disable LIRC plugin (default=enabled)],
427 [enable_lirc=$enableval], 427 [enable_lirc=$enableval],
428 [enable_lirc="yes"] 428 [enable_lirc="yes"]
429 ) 429 )
430 430
431 if test "$enable_lirc" = "yes"; then 431 if test "x$enable_lirc" = "xyes"; then
432 AC_CHECK_LIB([lirc_client],[lirc_init],[have_lirc=yes],[have_lirc=no]) 432 AC_CHECK_LIB([lirc_client],[lirc_init],[have_lirc=yes],[have_lirc=no])
433 else 433 else
434 AC_MSG_RESULT([*** LIRC plugin disabled per user request ***]) 434 AC_MSG_RESULT([*** LIRC plugin disabled per user request ***])
435 have_lirc="no" 435 have_lirc="no"
436 fi 436 fi
437 437
438 if test "$have_lirc" = "yes"; then 438 if test "x$have_lirc" = "xyes"; then
439 GENERAL_PLUGINS="$GENERAL_PLUGINS lirc" 439 GENERAL_PLUGINS="$GENERAL_PLUGINS lirc"
440 fi 440 fi
441 441
442 dnl *** EvDev-Plug general plugin (only built on Linux) 442 dnl *** EvDev-Plug general plugin (only built on Linux)
443 443
624 [ --disable-adplug disable AdPlug plugin (default=enabled)], 624 [ --disable-adplug disable AdPlug plugin (default=enabled)],
625 [enable_adplug=$enableval], 625 [enable_adplug=$enableval],
626 [enable_adplug="yes"] 626 [enable_adplug="yes"]
627 ) 627 )
628 628
629 if test "$enable_adplug" = "yes"; then 629 if test "x$enable_adplug" = "xyes"; then
630 have_adplug="yes" 630 have_adplug="yes"
631 PKG_CHECK_MODULES(BINIO,[libbinio >= 1.4],,[have_adplug=no]) 631 PKG_CHECK_MODULES(BINIO,[libbinio >= 1.4],,[have_adplug=no])
632 else 632 else
633 AC_MSG_RESULT([*** AdPlug plugin disabled per user request ***]) 633 AC_MSG_RESULT([*** AdPlug plugin disabled per user request ***])
634 have_adplug="no" 634 have_adplug="no"
635 fi 635 fi
636 636
637 if test "$have_adplug" = "yes"; then 637 if test "x$have_adplug" = "xyes"; then
638 INPUT_PLUGINS="$INPUT_PLUGINS adplug" 638 INPUT_PLUGINS="$INPUT_PLUGINS adplug"
639 AC_SUBST(BINIO_CFLAGS) 639 AC_SUBST(BINIO_CFLAGS)
640 fi 640 fi
641 641
642 dnl *** Ogg Vorbis 642 dnl *** Ogg Vorbis
645 [ --disable-vorbis disable Ogg Vorbis input plugin (default=enabled)], 645 [ --disable-vorbis disable Ogg Vorbis input plugin (default=enabled)],
646 [enable_vorbis=$enableval], 646 [enable_vorbis=$enableval],
647 [enable_vorbis="yes"] 647 [enable_vorbis="yes"]
648 ) 648 )
649 649
650 if test "$enable_vorbis" = "yes"; then 650 if test "x$enable_vorbis" = "xyes"; then
651 PKG_CHECK_MODULES(OGG_VORBIS, [ogg >= 1.0 vorbis >= 1.2 vorbisfile >= 1.2], 651 PKG_CHECK_MODULES(OGG_VORBIS, [ogg >= 1.0 vorbis >= 1.2 vorbisfile >= 1.2],
652 [have_oggvorbis=yes], 652 [have_oggvorbis=yes],
653 [AC_MSG_WARN([*** Cannot find libogg/libvorbis, Ogg Vorbis support will not be built ***]) 653 [AC_MSG_WARN([*** Cannot find libogg/libvorbis, Ogg Vorbis support will not be built ***])
654 have_oggvorbis=no] 654 have_oggvorbis=no]
655 ) 655 )
656 else 656 else
657 AC_MSG_RESULT([*** Ogg Vorbis plugin disabled per user request ***]) 657 AC_MSG_RESULT([*** Ogg Vorbis plugin disabled per user request ***])
658 have_oggvorbis=no 658 have_oggvorbis=no
659 fi 659 fi
660 660
661 if test "$have_oggvorbis" = "yes"; then 661 if test "x$have_oggvorbis" = "xyes"; then
662 INPUT_PLUGINS="$INPUT_PLUGINS vorbis" 662 INPUT_PLUGINS="$INPUT_PLUGINS vorbis"
663 fi 663 fi
664 664
665 dnl *** FLACng (in progress replacement to XMMS-flac port) 665 dnl *** FLACng (in progress replacement to XMMS-flac port)
666 666
668 [ --disable-flacng disable flac input plugin (default=enabled)], 668 [ --disable-flacng disable flac input plugin (default=enabled)],
669 [enable_flacng=$enableval], 669 [enable_flacng=$enableval],
670 [enable_flacng="yes"] 670 [enable_flacng="yes"]
671 ) 671 )
672 672
673 if test "$enable_flacng" = "yes"; then 673 if test "x$enable_flacng" = "xyes"; then
674 AM_PATH_LIBFLAC([have_flacng=yes], 674 AM_PATH_LIBFLAC([have_flacng=yes],
675 [AC_MSG_WARN([*** Cannot find libFLAC, FLACng will not be built ***]) 675 [AC_MSG_WARN([*** Cannot find libFLAC, FLACng will not be built ***])
676 have_flacng=no] 676 have_flacng=no]
677 ) 677 )
678 else 678 else
679 AC_MSG_RESULT([*** FLACng plugin disabled per user request ***]) 679 AC_MSG_RESULT([*** FLACng plugin disabled per user request ***])
680 have_flacng=no 680 have_flacng=no
681 fi 681 fi
682 682
683 if test "$have_flacng" = "yes"; then 683 if test "x$have_flacng" = "xyes"; then
684 INPUT_PLUGINS="$INPUT_PLUGINS flacng" 684 INPUT_PLUGINS="$INPUT_PLUGINS flacng"
685 fi 685 fi
686 686
687 dnl *** WavPack 4.31 support 687 dnl *** WavPack 4.31 support
688 688
690 [ --disable-wavpack disable WavPack input plugin (default=enabled)], 690 [ --disable-wavpack disable WavPack input plugin (default=enabled)],
691 [enable_wavpack=$enableval], 691 [enable_wavpack=$enableval],
692 [enable_wavpack="yes"] 692 [enable_wavpack="yes"]
693 ) 693 )
694 694
695 if test "$enable_wavpack" = "yes"; then 695 if test "x$enable_wavpack" = "xyes"; then
696 PKG_CHECK_MODULES(WAVPACK, [wavpack >= 4.31], 696 PKG_CHECK_MODULES(WAVPACK, [wavpack >= 4.31],
697 [have_wavpack=yes], 697 [have_wavpack=yes],
698 [AC_MSG_WARN([*** Cannot find WavPack 4.31+, WavPack support will not be built ***]) 698 [AC_MSG_WARN([*** Cannot find WavPack 4.31+, WavPack support will not be built ***])
699 have_wavpack=no] 699 have_wavpack=no]
700 ) 700 )
701 else 701 else
702 AC_MSG_RESULT([*** WavPack plugin disabled per user request ***]) 702 AC_MSG_RESULT([*** WavPack plugin disabled per user request ***])
703 have_wavpack=no 703 have_wavpack=no
704 fi 704 fi
705 705
706 if test "$have_wavpack" = "yes"; then 706 if test "x$have_wavpack" = "xyes"; then
707 INPUT_PLUGINS="$INPUT_PLUGINS wavpack" 707 INPUT_PLUGINS="$INPUT_PLUGINS wavpack"
708 fi 708 fi
709 709
710 dnl *** AAC 710 dnl *** AAC
711 711
713 [ --disable-aac disable aac plugin (default=enabled) ], 713 [ --disable-aac disable aac plugin (default=enabled) ],
714 [enable_aac=$enableval], 714 [enable_aac=$enableval],
715 [enable_aac=yes] 715 [enable_aac=yes]
716 ) 716 )
717 717
718 if test "$enable_aac" = "yes"; then 718 if test "x$enable_aac" = "xyes"; then
719 INPUT_PLUGINS="$INPUT_PLUGINS aac" 719 INPUT_PLUGINS="$INPUT_PLUGINS aac"
720 fi 720 fi
721 721
722 dnl *** sndfile 722 dnl *** sndfile
723 723
725 [ --disable-sndfile disable sndfile extensions. [default=enabled] ], 725 [ --disable-sndfile disable sndfile extensions. [default=enabled] ],
726 [enable_sndfile=$enableval], 726 [enable_sndfile=$enableval],
727 [enable_sndfile=yes] 727 [enable_sndfile=yes]
728 ) 728 )
729 729
730 if test "$enable_sndfile" = "yes"; then 730 if test "x$enable_sndfile" = "xyes"; then
731 PKG_CHECK_MODULES(SNDFILE, [sndfile >= 0.19], 731 PKG_CHECK_MODULES(SNDFILE, [sndfile >= 0.19],
732 [enable_sndfile=yes], 732 [enable_sndfile=yes],
733 [enable_sndfile=no] 733 [enable_sndfile=no]
734 ) 734 )
735 else 735 else
736 AC_MSG_RESULT([*** libsndfile extensions disabled per user request ***]) 736 AC_MSG_RESULT([*** libsndfile extensions disabled per user request ***])
737 enable_sndfile=no 737 enable_sndfile=no
738 fi 738 fi
739 739
740 if test "$enable_sndfile" = "yes"; then 740 if test "x$enable_sndfile" = "xyes"; then
741 INPUT_PLUGINS="$INPUT_PLUGINS sndfile" 741 INPUT_PLUGINS="$INPUT_PLUGINS sndfile"
742 fi 742 fi
743 743
744 dnl *** modplug 744 dnl *** modplug
745 745
747 [ --disable-modplug disable ModPlug plugin (default=enabled)], 747 [ --disable-modplug disable ModPlug plugin (default=enabled)],
748 [enable_modplug=$enableval], 748 [enable_modplug=$enableval],
749 [enable_modplug="yes"] 749 [enable_modplug="yes"]
750 ) 750 )
751 751
752 if test "$enable_modplug" = "yes"; then 752 if test "x$enable_modplug" = "xyes"; then
753 INPUT_PLUGINS="$INPUT_PLUGINS modplug" 753 INPUT_PLUGINS="$INPUT_PLUGINS modplug"
754 have_modplug="yes" 754 have_modplug="yes"
755 else 755 else
756 AC_MSG_RESULT([*** ModPlug plugin disabled per user request ***]) 756 AC_MSG_RESULT([*** ModPlug plugin disabled per user request ***])
757 have_modplug="no" 757 have_modplug="no"
763 [ --disable-musepack disable musepack input plugin (default=enabled)], 763 [ --disable-musepack disable musepack input plugin (default=enabled)],
764 [enable_musepack=$enableval], 764 [enable_musepack=$enableval],
765 [enable_musepack="yes"] 765 [enable_musepack="yes"]
766 ) 766 )
767 767
768 if test "$enable_musepack" = "yes"; then 768 if test "x$enable_musepack" = "xyes"; then
769 PKG_CHECK_MODULES(TAGLIB, [taglib >= 1.4], [ 769 PKG_CHECK_MODULES(TAGLIB, [taglib >= 1.4], [
770 AC_CHECK_HEADERS(mpcdec/config_types.h,, [ 770 AC_CHECK_HEADERS(mpcdec/config_types.h,, [
771 enable_musepack=no 771 enable_musepack=no
772 ]) 772 ])
773 ], [enable_musepack=no]) 773 ], [enable_musepack=no])
774 else 774 else
775 AC_MSG_RESULT([*** Musepack plugin disabled per user request ***]) 775 AC_MSG_RESULT([*** Musepack plugin disabled per user request ***])
776 enable_musepack=no 776 enable_musepack=no
777 fi 777 fi
778 778
779 if test "$enable_musepack" = "yes"; then 779 if test "x$enable_musepack" = "xyes"; then
780 INPUT_PLUGINS="$INPUT_PLUGINS musepack" 780 INPUT_PLUGINS="$INPUT_PLUGINS musepack"
781 AC_SUBST(TAGLIB_CFLAGS) 781 AC_SUBST(TAGLIB_CFLAGS)
782 fi 782 fi
783 783
784 dnl *** WMA 784 dnl *** WMA
787 [ --disable-wma disable wma plugin. (default=enabled)], 787 [ --disable-wma disable wma plugin. (default=enabled)],
788 [enable_wma=$enableval], 788 [enable_wma=$enableval],
789 [enable_wma=yes] 789 [enable_wma=yes]
790 ) 790 )
791 791
792 if test "$enable_wma" = "yes"; then 792 if test "x$enable_wma" = "xyes"; then
793 INPUT_PLUGINS="$INPUT_PLUGINS wma" 793 INPUT_PLUGINS="$INPUT_PLUGINS wma"
794 fi 794 fi
795 795
796 dnl *** Monkey's Audio 796 dnl *** Monkey's Audio
797 797
799 [ --disable-ape disable Monkey's Audio plugin. (default=enabled)], 799 [ --disable-ape disable Monkey's Audio plugin. (default=enabled)],
800 [enable_ape=$enableval], 800 [enable_ape=$enableval],
801 [enable_ape=yes] 801 [enable_ape=yes]
802 ) 802 )
803 803
804 if test "$enable_ape" = "yes"; then 804 if test "x$enable_ape" = "xyes"; then
805 INPUT_PLUGINS="$INPUT_PLUGINS demac" 805 INPUT_PLUGINS="$INPUT_PLUGINS demac"
806 fi 806 fi
807 807
808 dnl *** jack output plugin 808 dnl *** jack output plugin
809 AC_ARG_ENABLE( jack, 809 AC_ARG_ENABLE( jack,
810 [ --disable-jack disable jack output plugin (default=enabled)], [enable_jack=$enableval], 810 [ --disable-jack disable jack output plugin (default=enabled)], [enable_jack=$enableval],
811 [enable_jack="yes"]) 811 [enable_jack="yes"])
812 812
813 if test "x$enable_jack" = xyes; then 813 if test "x$enable_jack" = "xyes"; then
814 AM_PATH_JACK(have_jack=yes, have_jack=no) 814 AM_PATH_JACK(have_jack=yes, have_jack=no)
815 else 815 else
816 AC_MSG_RESULT([*** jack plugin disabled per user request ***]) 816 AC_MSG_RESULT([*** jack plugin disabled per user request ***])
817 have_jack=no 817 have_jack=no
818 fi 818 fi
819 819
820 if test "$have_jack" = yes; then 820 if test "x$have_jack" = "xyes"; then
821 OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack" 821 OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
822 fi 822 fi
823 823
824 dnl *** arts output plugin 824 dnl *** arts output plugin
825 AC_ARG_ENABLE( arts, 825 AC_ARG_ENABLE( arts,
826 [ --disable-arts disable arts output plugin (default=enabled)],, 826 [ --disable-arts disable arts output plugin (default=enabled)],,
827 enable_arts="yes") 827 enable_arts="yes")
828 828
829 if test "x$enable_arts" = xyes; then 829 if test "x$enable_arts" = "xyes"; then
830 AM_PATH_ARTSC(0.9.5, have_arts=yes, have_arts=no) 830 AM_PATH_ARTSC(0.9.5, have_arts=yes, have_arts=no)
831 else 831 else
832 AC_MSG_RESULT([*** arts plugin disabled per user request ***]) 832 AC_MSG_RESULT([*** arts plugin disabled per user request ***])
833 have_arts=no 833 have_arts=no
834 fi 834 fi
835 835
836 if test "$have_arts" = yes; then 836 if test "x$have_arts" = "xyes"; then
837 OUTPUT_PLUGINS="$OUTPUT_PLUGINS arts" 837 OUTPUT_PLUGINS="$OUTPUT_PLUGINS arts"
838 fi 838 fi
839 839
840 dnl *** sid 840 dnl *** sid
841 AC_ARG_ENABLE( sid, 841 AC_ARG_ENABLE( sid,
842 [ --disable-sid disable sid input plugin (default=enabled)],, 842 [ --disable-sid disable SID input plugin (default=enabled)],,
843 enable_sid="yes") 843 enable_sid="yes")
844 844
845 if test "x$enable_sid" = xyes; then 845 if test "x$enable_sid" = "xyes"; then
846 AM_PATH_SIDPLAY(have_sidplay=yes, have_sidplay=no) 846 AM_PATH_SIDPLAY(have_sidplay=yes, have_sidplay=no)
847 else 847 else
848 AC_MSG_RESULT([*** sid plugin disabled per user request ***]) 848 AC_MSG_RESULT([*** SID plugin disabled per user request ***])
849 have_sidplay=no 849 have_sidplay=no
850 fi 850 fi
851 851
852 if test "$have_sidplay" = yes; then 852 if test "x$have_sidplay" = "xyes"; then
853 INPUT_PLUGINS="$INPUT_PLUGINS sid" 853 INPUT_PLUGINS="$INPUT_PLUGINS sid"
854 fi 854 fi
855 855
856 dnl *** OSS output 856 dnl *** OSS output
857 857
860 [enable_oss=$enableval], 860 [enable_oss=$enableval],
861 [enable_oss=yes] 861 [enable_oss=yes]
862 ) 862 )
863 863
864 have_oss=no 864 have_oss=no
865 if test "$enable_oss" = "yes"; then 865 if test "x$enable_oss" = "xyes"; then
866 AC_MSG_CHECKING(for OSS include dir) 866 AC_MSG_CHECKING(for OSS include dir)
867 OSS_CFLAGS="" 867 OSS_CFLAGS=""
868 if test -f "/etc/oss.conf" ; then 868 if test -f "/etc/oss.conf" ; then
869 for i in `cat /etc/oss.conf`; do 869 for i in `cat /etc/oss.conf`; do
870 t=`echo $i | sed -e 's/OSSLIBDIR=//'` 870 t=`echo $i | sed -e 's/OSSLIBDIR=//'`
871 if test "$i" != "$t" ; then 871 if test "x$i" != "x$t" ; then
872 if test -f "$t/include/sys/soundcard.h" -o -f "$i/include/soundcard.h" ; then 872 if test -f "$t/include/sys/soundcard.h" -o -f "$i/include/soundcard.h" ; then
873 OSS_CFLAGS="-I$t/include" 873 OSS_CFLAGS="-I$t/include"
874 fi 874 fi
875 fi 875 fi
876 done 876 done
885 AC_CHECK_HEADERS(soundcard.h) 885 AC_CHECK_HEADERS(soundcard.h)
886 AC_CHECK_HEADERS(sys/soundcard.h) 886 AC_CHECK_HEADERS(sys/soundcard.h)
887 AC_CHECK_HEADERS(machine/soundcard.h) 887 AC_CHECK_HEADERS(machine/soundcard.h)
888 CFLAGS=$CFLAGS_save 888 CFLAGS=$CFLAGS_save
889 889
890 if test "${ac_cv_header_soundcard_h}" = "yes" || test "${ac_cv_header_sys_soundcard_h}" = "yes" || test "${ac_cv_header_machine_soundcard_h}" = "yes"; then 890 if test "x${ac_cv_header_soundcard_h}" = "xyes" || test "x${ac_cv_header_sys_soundcard_h}" = "xyes" || test "x${ac_cv_header_machine_soundcard_h}" = "xyes"; then
891 have_oss=yes 891 have_oss=yes
892 fi 892 fi
893 893
894 if test "${have_oss}" = "yes"; then 894 if test "x${have_oss}" = "xyes"; then
895 AC_MSG_CHECKING(whether we need -lossaudio) 895 AC_MSG_CHECKING(whether we need -lossaudio)
896 AC_TRY_LINK([ 896 AC_TRY_LINK([
897 #include <sys/ioctl.h> 897 #include <sys/ioctl.h>
898 #ifdef HAVE_SYS_SOUNDCARD_H 898 #ifdef HAVE_SYS_SOUNDCARD_H
899 #include <sys/soundcard.h> 899 #include <sys/soundcard.h>
908 AC_MSG_RESULT(yes) 908 AC_MSG_RESULT(yes)
909 ]) 909 ])
910 fi 910 fi
911 fi 911 fi
912 912
913 if test "$have_oss" = "yes"; then 913 if test "x$have_oss" = "xyes"; then
914 AC_DEFINE(HAVE_OSS, 1, [Define if the OSS output plugin should be built]) 914 AC_DEFINE(HAVE_OSS, 1, [Define if the OSS output plugin should be built])
915 else 915 else
916 have_oss=no 916 have_oss=no
917 fi 917 fi
918 918
919 if test "$have_oss" = "yes"; then 919 if test "x$have_oss" = "xyes"; then
920 OUTPUT_PLUGINS="$OUTPUT_PLUGINS OSS" 920 OUTPUT_PLUGINS="$OUTPUT_PLUGINS OSS"
921 fi 921 fi
922 922
923 AC_SUBST(OSS_LIBS) 923 AC_SUBST(OSS_LIBS)
924 924
930 [enable_oss4=$enableval], 930 [enable_oss4=$enableval],
931 [enable_oss4=no] 931 [enable_oss4=no]
932 ) 932 )
933 933
934 have_oss4=no 934 have_oss4=no
935 if test "$enable_oss4" = "yes"; then 935 if test "x$enable_oss4" = "xyes"; then
936 AC_MSG_CHECKING(for OSS4 include dir) 936 AC_MSG_CHECKING(for OSS4 include dir)
937 OSS4_CFLAGS="" 937 OSS4_CFLAGS=""
938 if test -f "/etc/oss.conf" ; then 938 if test -f "/etc/oss.conf" ; then
939 for i in `cat /etc/oss.conf`; do 939 for i in `cat /etc/oss.conf`; do
940 t=`echo $i | sed -e 's/OSSLIBDIR=//'` 940 t=`echo $i | sed -e 's/OSSLIBDIR=//'`
941 if test "$i" != "$t" ; then 941 if test "x$i" != "x$t" ; then
942 if test -f "$t/include/sys/soundcard.h" -o -f "$i/include/soundcard.h" ; then 942 if test -f "$t/include/sys/soundcard.h" -o -f "$i/include/soundcard.h" ; then
943 OSS4_CFLAGS="-I$t/include" 943 OSS4_CFLAGS="-I$t/include"
944 fi 944 fi
945 fi 945 fi
946 done 946 done
955 AC_CHECK_HEADERS(soundcard.h) 955 AC_CHECK_HEADERS(soundcard.h)
956 AC_CHECK_HEADERS(sys/soundcard.h) 956 AC_CHECK_HEADERS(sys/soundcard.h)
957 AC_CHECK_HEADERS(machine/soundcard.h) 957 AC_CHECK_HEADERS(machine/soundcard.h)
958 CFLAGS=$CFLAGS_save 958 CFLAGS=$CFLAGS_save
959 959
960 if test "${ac_cv_header_soundcard_h}" = "yes" || test "${ac_cv_header_sys_soundcard_h}" = "yes" || test "${ac_cv_header_machine_soundcard_h}" = "yes"; then 960 if test "x${ac_cv_header_soundcard_h}" = "xyes" || test "x${ac_cv_header_sys_soundcard_h}" = "xyes" || test "x${ac_cv_header_machine_soundcard_h}" = "xyes"; then
961 have_oss4=yes 961 have_oss4=yes
962 fi 962 fi
963 963
964 if test "${have_oss4}" = "yes"; then 964 if test "x${have_oss4}" = "xyes"; then
965 AC_MSG_CHECKING(whether we need -lossaudio) 965 AC_MSG_CHECKING(whether we need -lossaudio)
966 AC_TRY_LINK([ 966 AC_TRY_LINK([
967 #include <sys/ioctl.h> 967 #include <sys/ioctl.h>
968 #ifdef HAVE_SYS_SOUNDCARD_H 968 #ifdef HAVE_SYS_SOUNDCARD_H
969 #include <sys/soundcard.h> 969 #include <sys/soundcard.h>
978 AC_MSG_RESULT(yes) 978 AC_MSG_RESULT(yes)
979 ]) 979 ])
980 fi 980 fi
981 fi 981 fi
982 982
983 if test "$have_oss4" = "yes"; then 983 if test "x$have_oss4" = "xyes"; then
984 AC_DEFINE(HAVE_OSS4, 1, [Define if the OSS4 output plugin should be built]) 984 AC_DEFINE(HAVE_OSS4, 1, [Define if the OSS4 output plugin should be built])
985 else 985 else
986 have_oss4=no 986 have_oss4=no
987 fi 987 fi
988 988
989 if test "$have_oss4" = "yes"; then 989 if test "x$have_oss4" = "xyes"; then
990 OUTPUT_PLUGINS="$OUTPUT_PLUGINS OSS4" 990 OUTPUT_PLUGINS="$OUTPUT_PLUGINS OSS4"
991 fi 991 fi
992 992
993 AC_SUBST(OSS_LIBS) 993 AC_SUBST(OSS_LIBS)
994 994
998 [ --disable-alsa disable ALSA input plugin (default=enabled)], 998 [ --disable-alsa disable ALSA input plugin (default=enabled)],
999 [enable_alsa=$enableval], 999 [enable_alsa=$enableval],
1000 [enable_alsa=yes] 1000 [enable_alsa=yes]
1001 ) 1001 )
1002 1002
1003 if test "$enable_alsa" = "yes"; then 1003 if test "x$enable_alsa" = "xyes"; then
1004 PKG_CHECK_MODULES(ALSA, [alsa >= 1.0], 1004 PKG_CHECK_MODULES(ALSA, [alsa >= 1.0],
1005 [ 1005 [
1006 have_alsa=yes 1006 have_alsa=yes
1007 alsalib_available=yes 1007 alsalib_available=yes
1008 ], 1008 ],
1015 AC_MSG_RESULT([*** ALSA output plugin disabled per user request ***]) 1015 AC_MSG_RESULT([*** ALSA output plugin disabled per user request ***])
1016 have_alsa=no 1016 have_alsa=no
1017 alsalib_available=check 1017 alsalib_available=check
1018 fi 1018 fi
1019 1019
1020 if test "$have_alsa" = "yes"; then 1020 if test "x$have_alsa" = "xyes"; then
1021 OUTPUT_PLUGINS="$OUTPUT_PLUGINS alsa" 1021 OUTPUT_PLUGINS="$OUTPUT_PLUGINS alsa"
1022 fi 1022 fi
1023 1023
1024 1024
1025 dnl *** amidi-plug (note: to avoid checking twice ALSA, this should appear somewhere after the alsa output plugin check) 1025 dnl *** amidi-plug (note: to avoid checking twice ALSA, this should appear somewhere after the alsa output plugin check)
1156 enable_timidity=yes 1156 enable_timidity=yes
1157 fi 1157 fi
1158 ] 1158 ]
1159 ) 1159 )
1160 1160
1161 if test "$enable_timidity" = "yes"; then 1161 if test "x$enable_timidity" = "xyes"; then
1162 INPUT_PLUGINS="$INPUT_PLUGINS timidity" 1162 INPUT_PLUGINS="$INPUT_PLUGINS timidity"
1163 fi 1163 fi
1164 1164
1165 dnl FreeBSD newpcm driver detection 1165 dnl FreeBSD newpcm driver detection
1166 1166
1175 else 1175 else
1176 beep_cv_newpcm_driver="no" 1176 beep_cv_newpcm_driver="no"
1177 fi 1177 fi
1178 ) 1178 )
1179 1179
1180 if test "$beep_cv_newpcm_driver" = "yes"; then 1180 if test "x$beep_cv_newpcm_driver" = "xyes"; then
1181 AC_DEFINE(HAVE_NEWPCM, 1, [Define if you have the FreeBSD newpcm driver]) 1181 AC_DEFINE(HAVE_NEWPCM, 1, [Define if you have the FreeBSD newpcm driver])
1182 fi 1182 fi
1183 1183
1184 1184
1185 AC_CHECK_HEADERS(linux/joystick.h) 1185 AC_CHECK_HEADERS(linux/joystick.h)
1398 AC_MSG_WARN([*** libxml2 is not installed. Paranormal nor XSPF support will not be built. ***]) 1398 AC_MSG_WARN([*** libxml2 is not installed. Paranormal nor XSPF support will not be built. ***])
1399 have_paranormal="no" 1399 have_paranormal="no"
1400 have_xspf="no" 1400 have_xspf="no"
1401 ]) 1401 ])
1402 1402
1403 if test "$have_paranormal" = "yes"; then 1403 if test "x$have_paranormal" = "xyes"; then
1404 VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS paranormal" 1404 VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS paranormal"
1405 fi 1405 fi
1406 1406
1407 if test "$have_xspf" = "yes"; then 1407 if test "x$have_xspf" = "xyes"; then
1408 CONTAINER_PLUGINS="$CONTAINER_PLUGINS xspf" 1408 CONTAINER_PLUGINS="$CONTAINER_PLUGINS xspf"
1409 fi 1409 fi
1410 1410
1411 dnl *** projectM (GL Milkdrop port) 1411 dnl *** projectM (GL Milkdrop port)
1412 1412
1413 AC_ARG_ENABLE(projectm, 1413 AC_ARG_ENABLE(projectm,
1414 [ --disable-projectm disable projectM vis plugin. (default=enabled)], 1414 [ --disable-projectm disable projectM vis plugin. (default=enabled)],
1415 [have_projectm=$enableval], 1415 [have_projectm=$enableval],
1416 [have_projectm=yes]) 1416 [have_projectm=yes])
1417 1417
1418 if test "$have_projectm" = "yes"; then 1418 if test "x$have_projectm" = "xyes"; then
1419 PKG_CHECK_MODULES(LIBPROJECTM, libprojectM < 1.0, [have_projectm="yes"], [have_projectm="no"]) 1419 PKG_CHECK_MODULES(LIBPROJECTM, libprojectM < 1.0, [have_projectm="yes"], [have_projectm="no"])
1420 AM_PATH_SDL(1.2.5, , [ 1420 AM_PATH_SDL(1.2.5, , [
1421 AC_MSG_WARN([*** SDL is not installed. projectM will not be built. ***]) 1421 AC_MSG_WARN([*** SDL is not installed. projectM will not be built. ***])
1422 have_projectm="no" 1422 have_projectm="no"
1423 ]) 1423 ])
1424 if test x$libprjM = xno; then 1424 if test "x$libprjM" = "xno"; then
1425 AC_MSG_WARN([*** libprojectM not found. 1425 AC_MSG_WARN([*** libprojectM not found.
1426 libprojectM is needed to build this package. 1426 libprojectM is needed to build this package.
1427 You can download libprojectM at http://projectm.sf.net/]) 1427 You can download libprojectM at http://projectm.sf.net/])
1428 fi 1428 fi
1429 LIBPROJECTM_datadir=`pkg-config --variable=pkgdatadir libprojectM`; 1429 LIBPROJECTM_datadir=`pkg-config --variable=pkgdatadir libprojectM`;
1431 LIBPROJECTM_CFLAGS="$LIBPROJECTM_CFLAGS -DPROJECTM_DATADIR=\\\"$LIBPROJECTM_datadir\\\" -DPROJECTM_SYSCONFDIR=\\\"$LIBPROJECTM_sysconfdir\\\""; 1431 LIBPROJECTM_CFLAGS="$LIBPROJECTM_CFLAGS -DPROJECTM_DATADIR=\\\"$LIBPROJECTM_datadir\\\" -DPROJECTM_SYSCONFDIR=\\\"$LIBPROJECTM_sysconfdir\\\"";
1432 fi 1432 fi
1433 AC_SUBST(LIBPROJECTM_LIBS) 1433 AC_SUBST(LIBPROJECTM_LIBS)
1434 AC_SUBST(LIBPROJECTM_CFLAGS) 1434 AC_SUBST(LIBPROJECTM_CFLAGS)
1435 1435
1436 if test "$have_projectm" = "yes"; then 1436 if test "x$have_projectm" = "xyes"; then
1437 VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS projectm" 1437 VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS projectm"
1438 fi 1438 fi
1439 1439
1440 dnl *** projectM (GL Milkdrop port) 1440 dnl *** projectM (GL Milkdrop port)
1441 1441
1442 AC_ARG_ENABLE(projectm-1.0, 1442 AC_ARG_ENABLE(projectm-1.0,
1443 [ --disable-projectm-1.0 disable projectM 1.0+ vis plugin. (default=enabled)], 1443 [ --disable-projectm-1.0 disable projectM 1.0+ vis plugin. (default=enabled)],
1444 [have_projectm1=$enableval], 1444 [have_projectm1=$enableval],
1445 [have_projectm1=yes]) 1445 [have_projectm1=yes])
1446 1446
1447 if test "$have_projectm1" = "yes"; then 1447 if test "x$have_projectm1" = "xyes"; then
1448 PKG_CHECK_MODULES(GTKGLEXT, [gtkglext-1.0 >= 1.2.0], [have_projectm1="yes"], [have_projectm1="no"]) 1448 PKG_CHECK_MODULES(GTKGLEXT, [gtkglext-1.0 >= 1.2.0], [have_projectm1="yes"], [have_projectm1="no"])
1449 fi 1449 fi
1450 1450
1451 if test "$have_projectm1" = "yes"; then 1451 if test "x$have_projectm1" = "xyes"; then
1452 PKG_CHECK_MODULES(LIBPROJECTM1, [libprojectM < 1.1], [have_projectm1="yes"], [have_projectm1="no"]) 1452 PKG_CHECK_MODULES(LIBPROJECTM1, [libprojectM < 1.1], [have_projectm1="yes"], [have_projectm1="no"])
1453 if test x$libprjM = xno; then 1453 if test "x$libprjM" = "xno"; then
1454 AC_MSG_WARN([*** libprojectM not found. 1454 AC_MSG_WARN([*** libprojectM not found.
1455 libprojectM is needed to build this package. 1455 libprojectM is needed to build this package.
1456 You can download libprojectM at http://projectm.sf.net/]) 1456 You can download libprojectM at http://projectm.sf.net/])
1457 fi 1457 fi
1458 LIBPROJECTM1_datadir=`pkg-config --variable=pkgdatadir libprojectM`; 1458 LIBPROJECTM1_datadir=`pkg-config --variable=pkgdatadir libprojectM`;
1463 AC_SUBST(LIBPROJECTM1_LIBS) 1463 AC_SUBST(LIBPROJECTM1_LIBS)
1464 AC_SUBST(LIBPROJECTM1_CFLAGS) 1464 AC_SUBST(LIBPROJECTM1_CFLAGS)
1465 AC_SUBST(GTKGLEXT_LIBS) 1465 AC_SUBST(GTKGLEXT_LIBS)
1466 AC_SUBST(GTKGLEXT_CFLAGS) 1466 AC_SUBST(GTKGLEXT_CFLAGS)
1467 1467
1468 if test "$have_projectm1" = "yes"; then 1468 if test "x$have_projectm1" = "xyes"; then
1469 VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS projectm-1.0" 1469 VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS projectm-1.0"
1470 fi 1470 fi
1471 1471
1472 dnl *** TTA 1472 dnl *** TTA
1473 1473
1475 [ --disable-tta disable TrueAudio plugin (default=enabled) ], 1475 [ --disable-tta disable TrueAudio plugin (default=enabled) ],
1476 [enable_tta=$enableval], 1476 [enable_tta=$enableval],
1477 [enable_tta=yes] 1477 [enable_tta=yes]
1478 ) 1478 )
1479 1479
1480 if test "$enable_tta" = "yes"; then 1480 if test "x$enable_tta" = "xyes"; then
1481 INPUT_PLUGINS="$INPUT_PLUGINS tta" 1481 INPUT_PLUGINS="$INPUT_PLUGINS tta"
1482 fi 1482 fi
1483 1483
1484 dnl *** FileWriter 1484 dnl *** FileWriter
1485 1485
1487 [ --disable-filewriter disable FileWriter output plugin (default=enabled) ], 1487 [ --disable-filewriter disable FileWriter output plugin (default=enabled) ],
1488 [enable_filewriter=$enableval], 1488 [enable_filewriter=$enableval],
1489 [enable_filewriter=yes] 1489 [enable_filewriter=yes]
1490 ) 1490 )
1491 1491
1492 if test "$enable_filewriter" = "yes"; then 1492 if test "x$enable_filewriter" = "xyes"; then
1493 OUTPUT_PLUGINS="$OUTPUT_PLUGINS filewriter" 1493 OUTPUT_PLUGINS="$OUTPUT_PLUGINS filewriter"
1494 fi 1494 fi
1495 1495
1496 1496
1497 AC_ARG_ENABLE(filewriter_mp3, 1497 AC_ARG_ENABLE(filewriter_mp3,
1498 [ --disable-filewriter_mp3 disable FileWriter MP3 output part (default=enabled) ], 1498 [ --disable-filewriter_mp3 disable FileWriter MP3 output part (default=enabled) ],
1499 [enable_filewriter_mp3=$enableval], [enable_filewriter_mp3=yes] 1499 [enable_filewriter_mp3=$enableval], [enable_filewriter_mp3=yes]
1500 ) 1500 )
1501 1501
1502 if test "$enable_filewriter_mp3" = "yes"; then 1502 if test "x$enable_filewriter_mp3" = "xyes"; then
1503 AC_CHECK_LIB(mp3lame -lm, lame_init, [have_lame=yes], [have_lame=no]) 1503 AC_CHECK_LIB(mp3lame -lm, lame_init, [have_lame=yes], [have_lame=no])
1504 if test "$have_lame" = yes; then 1504 if test "x$have_lame" = "xyes"; then
1505 AC_DEFINE(FILEWRITER_MP3, 1, [Define if MP3 output part should be built]) 1505 AC_DEFINE(FILEWRITER_MP3, 1, [Define if MP3 output part should be built])
1506 FILEWRITER_LIBS="$FILEWRITER_LIBS -lmp3lame" 1506 FILEWRITER_LIBS="$FILEWRITER_LIBS -lmp3lame"
1507 fi 1507 fi
1508 fi 1508 fi
1509 1509
1511 AC_ARG_ENABLE(filewriter_vorbis, 1511 AC_ARG_ENABLE(filewriter_vorbis,
1512 [ --disable-filewriter_vorbis disable FileWriter Vorbis output part (default=enabled) ], 1512 [ --disable-filewriter_vorbis disable FileWriter Vorbis output part (default=enabled) ],
1513 [enable_filewriter_vorbis=$enableval], [enable_filewriter_vorbis=yes] 1513 [enable_filewriter_vorbis=$enableval], [enable_filewriter_vorbis=yes]
1514 ) 1514 )
1515 1515
1516 if test "$enable_filewriter_vorbis" = "yes"; then 1516 if test "x$enable_filewriter_vorbis" = "xyes"; then
1517 PKG_CHECK_MODULES(OGG_VORBIS, [ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0], 1517 PKG_CHECK_MODULES(OGG_VORBIS, [ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0],
1518 [have_vorbisenc=yes], [have_vorbisenc=no]) 1518 [have_vorbisenc=yes], [have_vorbisenc=no])
1519 if test "$have_vorbisenc" = yes; then 1519 if test "x$have_vorbisenc" = "xyes"; then
1520 AC_DEFINE(FILEWRITER_VORBIS, 1, [Define if Vorbis output part should be built]) 1520 AC_DEFINE(FILEWRITER_VORBIS, 1, [Define if Vorbis output part should be built])
1521 FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS `pkg-config --cflags vorbisenc`" 1521 FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS `pkg-config --cflags vorbisenc`"
1522 FILEWRITER_LIBS="$FILEWRITER_LIBS `pkg-config --libs vorbisenc`" 1522 FILEWRITER_LIBS="$FILEWRITER_LIBS `pkg-config --libs vorbisenc`"
1523 fi 1523 fi
1524 fi 1524 fi
1527 AC_ARG_ENABLE(filewriter_flac, 1527 AC_ARG_ENABLE(filewriter_flac,
1528 [ --disable-filewriter_flac disable FileWriter FLAC output part (default=enabled) ], 1528 [ --disable-filewriter_flac disable FileWriter FLAC output part (default=enabled) ],
1529 [enable_filewriter_flac=$enableval], [enable_filewriter_flac=yes] 1529 [enable_filewriter_flac=$enableval], [enable_filewriter_flac=yes]
1530 ) 1530 )
1531 1531
1532 if test "$enable_filewriter_flac" = "yes"; then 1532 if test "x$enable_filewriter_flac" = "xyes"; then
1533 PKG_CHECK_MODULES(FLAC, [flac >= 1.1.2], 1533 PKG_CHECK_MODULES(FLAC, [flac >= 1.1.2],
1534 [have_writer_flac=yes], [have_writer_flac=no] 1534 [have_writer_flac=yes], [have_writer_flac=no]
1535 ) 1535 )
1536 if test "$have_writer_flac" = yes; then 1536 if test "x$have_writer_flac" = "xyes"; then
1537 AC_DEFINE(FILEWRITER_FLAC, 1, [Define if FLAC output part should be built]) 1537 AC_DEFINE(FILEWRITER_FLAC, 1, [Define if FLAC output part should be built])
1538 FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS `pkg-config --cflags flac`" 1538 FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS `pkg-config --cflags flac`"
1539 FILEWRITER_LIBS="$FILEWRITER_LIBS `pkg-config --libs flac`" 1539 FILEWRITER_LIBS="$FILEWRITER_LIBS `pkg-config --libs flac`"
1540 fi 1540 fi
1541 fi 1541 fi
1542 1542
1543 if test "$enable_filewriter" != yes; then 1543 if test "x$enable_filewriter" != "xyes"; then
1544 have_lame=no 1544 have_lame=no
1545 have_vorbisenc=no 1545 have_vorbisenc=no
1546 have_writer_flac=no 1546 have_writer_flac=no
1547 FILEWRITER_LIBS="" 1547 FILEWRITER_LIBS=""
1548 fi 1548 fi
1580 AC_SUBST(CONTAINER_PLUGIN_DIR) 1580 AC_SUBST(CONTAINER_PLUGIN_DIR)
1581 AC_SUBST(TRANSPORT_PLUGIN_DIR) 1581 AC_SUBST(TRANSPORT_PLUGIN_DIR)
1582 AC_SUBST(pluginsubs) 1582 AC_SUBST(pluginsubs)
1583 1583
1584 dnl XXX Work around some autoconf bugs. 1584 dnl XXX Work around some autoconf bugs.
1585 if test "$prefix" = "NONE"; then 1585 if test "x$prefix" = "xNONE"; then
1586 prefix="${ac_default_prefix}" 1586 prefix="${ac_default_prefix}"
1587 fi 1587 fi
1588 1588
1589 if test -z "$datadir"; then 1589 if test -z "$datadir"; then
1590 datadir="${prefix}/share" 1590 datadir="${prefix}/share"
1594 AC_SUBST(localedir) 1594 AC_SUBST(localedir)
1595 1595
1596 BEEP_DEFINES="$CFLAGS -DDATA_DIR=\\\"$datadir/audacious\\\" -DPLUGIN_DIR=\\\"$plugindir\\\" -DPLUGINSUBS=$pluginsubs -DLOCALEDIR=\\\"$localedir\\\"" 1596 BEEP_DEFINES="$CFLAGS -DDATA_DIR=\\\"$datadir/audacious\\\" -DPLUGIN_DIR=\\\"$plugindir\\\" -DPLUGINSUBS=$pluginsubs -DLOCALEDIR=\\\"$localedir\\\""
1597 CFLAGS="$CFLAGS $EXTRA_CFLAGS" 1597 CFLAGS="$CFLAGS $EXTRA_CFLAGS"
1598 1598
1599 if test "$enable_user_plugin_dir" = "no"; then 1599 if test "x$enable_user_plugin_dir" = "xno"; then
1600 AC_DEFINE(DISABLE_USER_PLUGIN_DIR,, [Define to disable per user plugin directory]) 1600 AC_DEFINE(DISABLE_USER_PLUGIN_DIR,, [Define to disable per user plugin directory])
1601 fi 1601 fi
1602 1602
1603 AC_DEFINE(BMP_RCPATH, ".audacious", [Config dir to use]) 1603 AC_DEFINE(BMP_RCPATH, ".audacious", [Config dir to use])
1604 1604