From: panne <unknown>
Date: Tue, 2 Dec 2003 19:16:44 +0000 (+0000)
Subject: [project @ 2003-12-02 19:16:41 by panne]
X-Git-Tag: Approx_11550_changesets_converted~219
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=e3dc3922399305df9c8320586c9add3b33f846d8;p=ghc-hetmet.git

[project @ 2003-12-02 19:16:41 by panne]
Added the first pieces of an OpenAL binding which has been of my disk for quite
a while. Note that it is built by default when a usable OpenAL library is found,
but this could be disabled via --disable-openal on the configure commandline.
Similar behaviour should probably be the default for all optional libraries.
Note that I have created a new hierarchy rooted at "Sound", the existing
hierarchies didn't fit.
---

diff --git a/configure.ac b/configure.ac
index c2b79d6..7bc993f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -619,7 +619,7 @@ AC_ARG_ENABLE(objectio,
 )
 AC_SUBST(GhcLibsWithObjectIO)
 
-dnl ** Enable the building of the OpenGL/GLUT binding in hslibs?
+dnl ** Enable the building of the OpenGL/GLUT binding?
 dnl --------------------------------------------------------------
 AC_ARG_ENABLE(hopengl,
 [  --enable-hopengl
@@ -642,6 +642,19 @@ fi
 AC_SUBST([GhcLibsWithOpenGL])
 AC_SUBST([GhcLibsWithGLUT])
 
+dnl ** Enable the building of the OpenAL binding?
+dnl --------------------------------------------------------------
+AC_ARG_ENABLE([openal],
+  AC_HELP_STRING([--enable-openal],
+                 [Build OpenAL binding [[default=autodetect]]]),
+  [GhcLibsWithOpenAL=$enableval],
+  [GhcLibsWithOpenAL=yes])
+
+# This is silly! Alas, "YES" and "NO" are currently our standard...
+GhcLibsWithOpenAL=`echo $GhcLibsWithOpenGL | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+
+AC_SUBST([GhcLibsWithOpenAL])
+
 dnl ** .NET interop support?
 dnl --------------------------------------------------------------
 AC_ARG_ENABLE(dotnet,
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 7aa1976..daf0b4d 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -397,6 +397,10 @@ GhcLibsWithOpenGL=@GhcLibsWithOpenGL@
 GL_CFLAGS=@GL_CFLAGS@
 GL_LIBS=@GL_LIBS@
 
+# Build the Haskell OpenAL binding?
+#
+GhcLibsWithOpenAL=@GhcLibsWithOpenAL@
+
 # Build the Haskell GLUT binding?
 #
 GhcLibsWithGLUT=@GhcLibsWithGLUT@