[xiph-cvs] cvs commit: ao/src/plugins Makefile.am

[Stan Seibert]

volsung     03/07/13 22:57:46

  Modified:    .        configure.in
               src/plugins Makefile.am
  Log:
  NAS plugin from Antoine Mathys <Antoine.Mathys at unifr.ch>.

Revision  Changes    Path
1.45      +32 -1     ao/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ao/configure.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- configure.in	14 Jul 2003 01:55:46 -0000	1.44
+++ configure.in	14 Jul 2003 02:57:45 -0000	1.45
@@ -280,10 +280,41 @@
 AM_CONDITIONAL(HAVE_MACOSX,test "x$have_macosx" = xyes)
 
 
+dnl Check for NAS
+
+AC_ARG_ENABLE(nas, [  --enable-nas            include NAS output plugin ],
+[ BUILD_NAS="$enableval" ],[ BUILD_NAS="yes" ])
+
+have_nas="no"
+if test "$BUILD_NAS" = "yes"; then
+   AC_PATH_XTRA
+   AC_CHECK_LIB(Xau, XauFileName, have_nas=yes, have_nas=no, $X_LIBS)
+   AC_CHECK_LIB(audio, AuOpenServer, dummy="no-op", have_nas=no, -lXau $X_LIBS)
+   
+   ac_save_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   AC_CHECK_HEADER(audio/audiolib.h, dummy="no-op", have_nas=no)
+   CPPFLAGS="$ac_save_CPPFLAGS"
+fi
+
+AM_CONDITIONAL(HAVE_NAS,test "x$have_nas" = xyes)
+
+if test "x$have_nas" = xyes; then
+	NAS_CFLAGS="$X_CFLAGS"
+	NAS_LIBS="-laudio -lXau $X_LIBS"
+else
+	NAS_CFLAGS=""
+	NAS_LIBS=""
+fi
+AC_SUBST(NAS_CFLAGS)
+AC_SUBST(NAS_LIBS)
+
+
 dnl Orphaned driver.  We'll probably dump it soon.
 AM_CONDITIONAL(HAVE_SOLARIS,test "x$have_solaris" = xyes)
 
 dnl Plugins get special LDFLAGS
 AC_SUBST(PLUGIN_LDFLAGS)
 
-AC_OUTPUT(Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/alsa09/Makefile src/plugins/sun/Makefile src/plugins/irix/Makefile src/plugins/arts/Makefile src/plugins/macosx/Makefile debian/Makefile)
+
+AC_OUTPUT(Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/alsa09/Makefile src/plugins/sun/Makefile src/plugins/irix/Makefile src/plugins/arts/Makefile src/plugins/macosx/Makefile src/plugins/nas/Makefile debian/Makefile)

<p><p>1.7       +1 -1      ao/src/plugins/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am	26 Sep 2001 16:58:17 -0000	1.6
+++ Makefile.am	14 Jul 2003 02:57:46 -0000	1.7
@@ -1,4 +1,4 @@
 ## Process this file with automake to produce Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = oss esd arts alsa alsa09 sun irix macosx
+SUBDIRS = oss esd arts alsa alsa09 sun irix macosx nas

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.