Commit 46237e9c authored by ross's avatar ross
Browse files

[project @ 2004-11-23 12:35:06 by ross]

Make the X11 and HGL packages more independent, and pass configuration
parameters to package.conf.in via header files.

Also removed residual traces of OpenGL/GLUT/OpenAL from mk/config.mk.in
parent 547c57b7
......@@ -1115,16 +1115,6 @@ dnl ** check for math library
AC_CHECK_LIB([m], [atan], [LIBS="-lm $LIBS"; LIBM="-lm"], [LIBM=])
AC_SUBST([LIBM])
dnl ** check for X Window System
AC_PATH_XTRA()
if test "$no_x" = yes; then
GhcLibsWithX11=NO
else
GhcLibsWithX11=YES
fi
AC_SUBST([GhcLibsWithX11])
dnl ################################################################
dnl Check for libraries
dnl ################################################################
......
......@@ -397,27 +397,6 @@ LIBM=@LIBM@
#
GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
# Build the Haskell OpenGL binding?
#
GhcLibsWithOpenGL=@GhcLibsWithOpenGL@
GLU_CFLAGS=@GLU_CFLAGS@
GLU_LIBS=@GLU_LIBS@
# Build the Haskell OpenAL binding?
#
GhcLibsWithOpenAL=@GhcLibsWithOpenAL@
# Build the Haskell GLUT binding?
#
GhcLibsWithGLUT=@GhcLibsWithGLUT@
GLUT_LIBS=@GLUT_LIBS@
# X11 stuff
#
GhcLibsWithX11=@GhcLibsWithX11@
X_CFLAGS=@X_CFLAGS@
X_LIBS=@X_LIBS@
# .NET interop support?
#
DotnetSupport=@DotnetSupport@
......
# -----------------------------------------------------------------------------
# $Id: package.mk,v 1.40 2004/11/03 12:31:42 ross Exp $
# $Id: package.mk,v 1.41 2004/11/23 12:35:12 ross Exp $
ifneq "$(PACKAGE)" ""
......@@ -17,9 +17,9 @@ endif
ifeq "$(way)" ""
ifeq "$(STANDALONE_PACKAGE)" "NO"
PKGCONF_CPP_EXTRA_OPTS = -I$(GHC_INCLUDE_DIR)
PKGCONF_CPP_EXTRA_OPTS = -I$(GHC_INCLUDE_DIR) -Iinclude
else
PKGCONF_CPP_EXTRA_OPTS =
PKGCONF_CPP_EXTRA_OPTS = -Iinclude
endif
package.conf.inplace : package.conf.in
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment