]>
Commit | Line | Data |
---|---|---|
175e972e | 1 | --- alsaplayer-0.99.60/configure.ac~ Fri May 3 22:13:21 2002 |
2 | +++ alsaplayer-0.99.60/configure.ac Fri May 3 22:13:13 2002 | |
3 | @@ -363,9 +363,10 @@ | |
4 | ||
5 | oldcflags=$CFLAGS | |
6 | CFLAGS="$CFLAGS -I$x_includes -L$x_libraries -lXt" | |
7 | -AC_CHECK_LIB(audio,AuStartFlow, [have_nas=yes NAS_LIB="-L$x_libraries -laudio -lXt"], have_nas=no) | |
8 | +AC_CHECK_LIB(audio,AuStartFlow, [have_nas=yes NAS_LIB="-L$x_libraries -laudio -lXt" NAS_CFLAGS="-I/usr/X11R6/include"], have_nas=no) | |
9 | CFLAGS=$oldcflags | |
10 | AC_SUBST(NAS_LIB) | |
11 | +AC_SUBST(NAS_CFLAGS) | |
12 | ||
13 | ||
14 | dnl ========== | |
15 | --- alsaplayer-0.99.60/output/nas/Makefile.am~ Mon Mar 25 16:43:12 2002 | |
16 | +++ alsaplayer-0.99.60/output/nas/Makefile.am Fri May 3 22:12:46 2002 | |
cb6721fe MM |
17 | @@ -1,17 +1,8 @@ |
18 | -if HAVE_NAS | |
19 | ||
20 | nas_outltlibs = libnas_out.la | |
21 | nas_outldflags = -export-dynamic -avoid-version | |
22 | nas_outsources = nas.c | |
23 | ||
24 | -else | |
25 | - | |
26 | -nas_outltlibs = | |
27 | -nas_outldflags = | |
28 | -nas_outsources = | |
29 | - | |
30 | -endif | |
31 | - | |
32 | EXTRA_DIST = nas.c | |
33 | ||
34 | lib_LTLIBRARIES = $(nas_outltlibs) | |
175e972e | 35 | @@ -17,7 +17,7 @@ |
36 | lib_LTLIBRARIES = $(nasltlibs) | |
37 | ||
38 | CFLAGS = -D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer \ | |
39 | - @ARCH_CFLAGS@ | |
cb6721fe | 40 | + @ARCH_CFLAGS@ @NAS_CFLAGS@ -I/usr/X11R6/include |
175e972e | 41 | |
42 | libdir = $(ADDON_DIR)/output | |
43 |