72 lines
2.5 KiB
Plaintext
72 lines
2.5 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.22 2003/12/07 19:45:43 espie Exp $
|
|
--- configure.in.orig 2003-08-30 21:13:18.000000000 +0200
|
|
+++ configure.in 2003-12-07 19:43:19.000000000 +0100
|
|
@@ -492,9 +492,6 @@ CheckNASM()
|
|
win32)
|
|
NASMFLAGS="-f win32"
|
|
;;
|
|
- openbsd)
|
|
- NASMFLAGS="-f aoutb"
|
|
- ;;
|
|
*)
|
|
NASMFLAGS="-f elf"
|
|
;;
|
|
@@ -1030,9 +1027,6 @@ CheckOpenGL()
|
|
AC_MSG_RESULT($video_opengl)
|
|
if test x$video_opengl = xyes; then
|
|
CFLAGS="$CFLAGS -DHAVE_OPENGL"
|
|
- if test x$use_dlopen != xyes; then
|
|
- AC_CHECK_LIB(dl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -ldl")
|
|
- fi
|
|
fi
|
|
fi
|
|
}
|
|
@@ -1053,9 +1047,6 @@ CheckOpenGLQNX()
|
|
if test x$video_opengl = xyes; then
|
|
CFLAGS="$CFLAGS -DHAVE_OPENGL"
|
|
SYSTEM_LIBS="$SYSTEM_LIBS -lGL"
|
|
- if test x$use_dlopen != xyes; then
|
|
- AC_CHECK_LIB(c, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS", AC_CHECK_LIB(ltdl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -lltdl"))
|
|
- fi
|
|
fi
|
|
fi
|
|
}
|
|
@@ -1559,6 +1550,9 @@ CheckDLOPEN()
|
|
AC_ARG_ENABLE(dlopen,
|
|
[ --enable-dlopen use dlopen for shared object loading [default=no]],
|
|
, enable_dlopen=yes)
|
|
+ AC_ARG_ENABLE(ltdl,
|
|
+[ --enable-ltdl use libtool for shared object loading [default=no]],
|
|
+ , enable_ltdl=yes)
|
|
if test x$enable_dlopen = xyes; then
|
|
AC_MSG_CHECKING(for dlopen)
|
|
use_dlopen=no
|
|
@@ -1570,7 +1564,7 @@ CheckDLOPEN()
|
|
])
|
|
AC_MSG_RESULT($use_dlopen)
|
|
|
|
- if test x$use_dlopen = xyes; then
|
|
+ if test x$use_dlopen = xyes -a x$enable_ltdl = xyes; then
|
|
CFLAGS="$CFLAGS -DUSE_DLOPEN"
|
|
AC_CHECK_LIB(dl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -ldl", AC_CHECK_LIB(ltdl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -lltdl"))
|
|
fi
|
|
@@ -2549,6 +2543,9 @@ fi
|
|
if test $ARCH = solaris; then
|
|
SDL_RLD_FLAGS="-R\${exec_prefix}/lib"
|
|
fi
|
|
+if test $ARCH = openbsd -a x$enable_video_x11 = xyes; then
|
|
+ SDL_RLD_FLAGS="-L${X11BASE}/lib"
|
|
+fi
|
|
|
|
case "$ARCH" in
|
|
openbsd | netbsd | bsdi)
|
|
@@ -2571,7 +2568,7 @@ esac
|
|
STATIC_SYSTEM_LIBS="$SYSTEM_LIBS"
|
|
|
|
dnl Output the video drivers we use
|
|
-if test x$enable_video = xtrue; then
|
|
+if test x$enable_video = xyes; then
|
|
if test "$VIDEO_SUBDIRS" = ""; then
|
|
AC_MSG_ERROR(*** No video drivers are enabled!)
|
|
fi
|