Changelog:
* configure,
configure.ac,
dlls/winmm/winenas/Makefile.in
The NAS headers and libraries are sometimes stored in the X directories
(actually that's the default install location in the NAS sources)
--
Francois Gouget
fgouget@codeweavers.com
Index: configure
===================================================================
RCS file: /home/wine/wine/configure,v
retrieving revision 1.347
diff -u -r1.347 configure
--- configure 8 Oct 2002 02:03:41 -0000 1.347
+++ configure 9 Oct 2002 23:57:36 -0000
@@ -9385,6 +9385,8 @@
fi
+ac_save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
NASLIBS=""
@@ -9611,6 +9613,7 @@
done
+CPPFLAGS="$ac_save_CPPFLAGS"
AUDIOIOLIBS=""
Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.83
diff -u -r1.83 configure.ac
--- configure.ac 8 Oct 2002 00:40:06 -0000 1.83
+++ configure.ac 9 Oct 2002 23:57:36 -0000
@@ -605,6 +605,8 @@
fi
dnl **** Check for NAS ****
+ac_save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
AC_SUBST(NASLIBS,"")
AC_CHECK_HEADERS(audio/audiolib.h,
[AC_CHECK_HEADERS(audio/soundlib.h,,,[#include <audio/audiolib.h>])
@@ -612,6 +614,7 @@
[AC_DEFINE(HAVE_NAS,1,[Define if you have NAS including devel headers])
NASLIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS"],,
[-lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS])])
+CPPFLAGS="$ac_save_CPPFLAGS"
dnl **** Check for libaudioio (which can be used to get solaris audio support) ****
Index: dlls/winmm/winenas/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/winmm/winenas/Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 Makefile.in
--- dlls/winmm/winenas/Makefile.in 30 Jul 2002 02:44:20 -0000 1.1
+++ dlls/winmm/winenas/Makefile.in 9 Oct 2002 23:57:36 -0000
@@ -4,6 +4,7 @@
VPATH = @srcdir@
MODULE = winenas.drv
IMPORTS = winmm user32 kernel32
+EXTRAINCL = @X_CFLAGS@
EXTRALIBS = @NASLIBS@
LDDLLFLAGS = @LDDLLFLAGS@
