*** configure.ac.orig	Thu Jul 24 14:22:38 2003
--- configure.ac	Thu Jul 24 15:11:54 2003
***************
*** 44,51 ****
  #--------------------------------------------------------------------
  # Add target OS directories as necessary
  #--------------------------------------------------------------------
- ADDITIONAL_INCLUDE_DIRS="$CPPFLAGS"
- ADDITIONAL_LIB_DIRS="$LDFLAGS"
  case "$target_os" in
    freebsd* | openbsd* )   
  	      CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--- 44,49 ----
***************
*** 53,58 ****
--- 51,58 ----
    netbsd*)    CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
                LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
  esac
+ ADDITIONAL_INCLUDE_DIRS="$CPPFLAGS"
+ ADDITIONAL_LIB_DIRS="$LDFLAGS"
  
  #--------------------------------------------------------------------
  # The following is so that headers and custom libraries
***************
*** 240,247 ****
  if test $audio_ok = yes -a $enable_gsnd = yes; then
    AC_CHECK_HEADERS(audiofile.h)
    ADDITIONAL_DEPENDS="$ADDITIONAL_DEPENDS -laudiofile"
!   ADDITIONAL_INCLUDE_DIRS="$GRAPHIC_CFLAGS ${with_audiofile_include}"
!   ADDITIONAL_LIB_DIRS="$GRAPHIC_LFLAGS ${with_audiofile_library}"
    BUILD_GSND=gsnd
  fi
  AC_SUBST(BUILD_GSND)
--- 240,247 ----
  if test $audio_ok = yes -a $enable_gsnd = yes; then
    AC_CHECK_HEADERS(audiofile.h)
    ADDITIONAL_DEPENDS="$ADDITIONAL_DEPENDS -laudiofile"
!   ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS $GRAPHIC_CFLAGS ${with_audiofile_include}"
!   ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS $GRAPHIC_LFLAGS ${with_audiofile_library}"
    BUILD_GSND=gsnd
  fi
  AC_SUBST(BUILD_GSND)