diff --git a/ChangeLog b/ChangeLog index 7ee47b308..bb0dffa8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-04-28 Adam Fedor + + * configure.ac: More complete check for portaudio + * Tools/gsnd/gsnd.m: Fix portaudio include + 2005-04-27 Adrian Robert * Headers/AppKit/NSApplication.h: Add app_is_launched ivar. * Source/NSApplication.m (-run): Only go through launch process diff --git a/Headers/Additions/GNUstepGUI/config.h.in b/Headers/Additions/GNUstepGUI/config.h.in index 1bf30c58c..40184d3d8 100644 --- a/Headers/Additions/GNUstepGUI/config.h.in +++ b/Headers/Additions/GNUstepGUI/config.h.in @@ -48,6 +48,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H +/* Define to 1 if you have the header file. */ +#undef HAVE_PORTAUDIO_H + /* Define to 1 if you have the `rint' function. */ #undef HAVE_RINT diff --git a/Tools/gsnd/gsnd.m b/Tools/gsnd/gsnd.m index f64d1fa43..991f3f4fe 100644 --- a/Tools/gsnd/gsnd.m +++ b/Tools/gsnd/gsnd.m @@ -21,7 +21,7 @@ */ #include -#include "portaudio/pa_common/portaudio.h" +#include #include #include #include diff --git a/Tools/gsnd/portaudio/index.html b/Tools/gsnd/portaudio/index.html deleted file mode 100644 index a2fe9679e..000000000 --- a/Tools/gsnd/portaudio/index.html +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - PortAudio Implementations for DirectSound - - -  -
- - - -
-
-

-PortAudio - Portable Audio Library

-
- -

Last updated 5/6/02. -

PortAudio is a cross platform, open-source, audio -I/O library proposed by Ross Bencina to the music-dsp -mailing list. It lets you write simple audio programs in 'C' that will -compile and run on Windows, Macintosh, Unix, BeOS. PortAudio is -intended to promote the exchange of audio synthesis software between developers -on different platforms. -

For complete information on PortAudio and to download the latest releases, -please visit "http://www.portaudio.com". -
  -
  -

-

-Click here for Documentation

- -

-

- -

-Contacts and E-Mail List

- -
    -
  • -If you are using or implementing PortAudio then please join the PortAudio -mail list generously administered by -Bill -Eldridge.
    • - -
  • -If you find bugs in one of these implementations, or have suggestions, -please e-mail them to Phil Burk.
    • - -
  • -If you make improvements to the library, please send them to us so we can -incorporate the improvements.
    • -
- -

-License

-PortAudio Portable Real-Time Audio Library -
Copyright (c) 1999-2000 Ross Bencina and Phil Burk -

Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the Software -is furnished to do so, subject to the following conditions: -

    -
  • -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software.
    • - -
  • -Any person wishing to distribute modifications to the Software is requested -to send the modifications to the original developer so that they can be -incorporated into the canonical version.
    • -
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND ON INFRINGEMENT. -
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT -OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -THE USE OR OTHER DEALINGS IN THE SOFTWARE. -
  - - diff --git a/configure b/configure index 75235da83..ef57494ed 100755 --- a/configure +++ b/configure @@ -5643,10 +5643,10 @@ if test "${enable_gsnd+set}" = set; then else enable_gsnd=yes fi; -audio_ok=no BUILD_GSND= - +# This is only for gsnd, so don't add it to LIBS +save_LIBS="$LIBS" echo "$as_me:$LINENO: checking for main in -lportaudio" >&5 echo $ECHO_N "checking for main in -lportaudio... $ECHO_C" >&6 if test "${ac_cv_lib_portaudio_main+set}" = set; then @@ -5706,14 +5706,13 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_portaudio_main" >&5 echo "${ECHO_T}$ac_cv_lib_portaudio_main" >&6 if test $ac_cv_lib_portaudio_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBPORTAUDIO 1 -_ACEOF - - LIBS="-lportaudio $LIBS" - + have_portaudio=yes +else + have_portaudio=no fi +LIBS="$save_LIBS" + echo "$as_me:$LINENO: checking for afGetVirtualFrameSize in -laudiofile" >&5 echo $ECHO_N "checking for afGetVirtualFrameSize in -laudiofile... $ECHO_C" >&6 @@ -5789,7 +5788,8 @@ _ACEOF fi -for ac_header in audiofile.h + +for ac_header in portaudio.h audiofile.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -5939,7 +5939,7 @@ fi done -if test $ac_cv_lib_portaudio_main = yes -a $enable_gsnd = yes; then +if test $ac_cv_header_portaudio_h = yes -a $have_portaudio = yes -a $enable_gsnd = yes; then BUILD_GSND=gsnd fi diff --git a/configure.ac b/configure.ac index 57b017936..afee3991f 100644 --- a/configure.ac +++ b/configure.ac @@ -305,11 +305,15 @@ AC_ARG_ENABLE(gsnd, enable_gsnd=yes) BUILD_GSND= +# This is only for gsnd, so don't add it to LIBS +save_LIBS="$LIBS" AC_CHECK_LIB(portaudio, main, have_portaudio=yes, have_portaudio=no) -AC_CHECK_LIB(audiofile, afGetVirtualFrameSize) -AC_CHECK_HEADERS(audiofile.h) +LIBS="$save_LIBS" -if test $have_portaudio = yes -a $enable_gsnd = yes; then +AC_CHECK_LIB(audiofile, afGetVirtualFrameSize) +AC_CHECK_HEADERS(portaudio.h audiofile.h) + +if test $ac_cv_header_portaudio_h = yes -a $have_portaudio = yes -a $enable_gsnd = yes; then BUILD_GSND=gsnd fi AC_SUBST(BUILD_GSND)