a quick hack to make dynamic loading work (underscore should be prefixed to

the symbol name only on a.out arches); plugins now work
This commit is contained in:
pvalchev 2002-04-06 19:09:06 +00:00
parent 7f72bce6ae
commit 59d43c3e3f

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.4 2002/02/05 04:07:57 pvalchev Exp $
--- configure.in.orig Tue Jan 8 12:04:42 2002
+++ configure.in Mon Jan 21 06:05:09 2002
@@ -15,6 +15,10 @@
$OpenBSD: patch-configure_in,v 1.5 2002/04/06 19:09:06 pvalchev Exp $
--- configure.in.orig Mon Mar 4 14:50:26 2002
+++ configure.in Sat Apr 6 11:49:37 2002
@@ -15,6 +15,10 @@ AC_ARG_ENABLE( user-plugin-dir,
[ --disable-user-plugin-dir disable per-user plugin dir],,
enable_user_plugin_dir="yes")
@ -12,7 +12,7 @@ $OpenBSD: patch-configure_in,v 1.4 2002/02/05 04:07:57 pvalchev Exp $
AC_ARG_WITH(dev-dsp,
[ --with-dev-dsp=path Path to OSS DSP data pipe, default is /dev/dsp.],
dev_dsp="$withval", dev_dsp="/dev/dsp")
@@ -54,7 +58,7 @@
@@ -54,7 +58,7 @@ AM_PROG_LIBTOOL
AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([*** POSIX thread support not installed - please install first ***]))
AM_PATH_GLIB(1.2.2,,AC_MSG_ERROR([*** GLIB >= 1.2.2 not installed - please install first ***]))
@ -21,7 +21,7 @@ $OpenBSD: patch-configure_in,v 1.4 2002/02/05 04:07:57 pvalchev Exp $
AC_PATH_PROG(XMMS_PATH,xmms,no)
LIBS_save=$LIBS
@@ -84,7 +88,7 @@
@@ -84,7 +88,7 @@ AC_SUBST(VM_LIBS)
PTHREAD_LIBS=error
AC_MSG_CHECKING(for old style FreeBSD -pthread flag)
AC_EGREP_CPP(yes,
@ -30,7 +30,7 @@ $OpenBSD: patch-configure_in,v 1.4 2002/02/05 04:07:57 pvalchev Exp $
yes
#endif
], AC_MSG_RESULT(yes)
@@ -117,7 +121,7 @@
@@ -117,7 +121,7 @@ AC_ARG_ENABLE( opengl,
if test "x$enable_opengl" = xyes; then
LIBS_save=$LIBS
@ -39,7 +39,7 @@ $OpenBSD: patch-configure_in,v 1.4 2002/02/05 04:07:57 pvalchev Exp $
OPENGL_LIBS=error
AC_CHECK_LIB(GL, glBegin, OPENGL_LIBS="-lGL")
@@ -126,7 +130,7 @@
@@ -126,7 +130,7 @@ if test "x$enable_opengl" = xyes; then
fi
CPPFLAGS_save=$CPPFLAGS
@ -48,7 +48,7 @@ $OpenBSD: patch-configure_in,v 1.4 2002/02/05 04:07:57 pvalchev Exp $
have_opengl_headers=yes
AC_CHECK_HEADERS(GL/gl.h GL/glx.h,,have_opengl_headers=no)
@@ -439,10 +443,12 @@
@@ -473,11 +477,15 @@ fi
arch_type=other
have_solaris=no
@ -56,13 +56,16 @@ $OpenBSD: patch-configure_in,v 1.4 2002/02/05 04:07:57 pvalchev Exp $
ARCH_DEFINES=""
case "$host" in
- *-*-openbsd* | *-*-netbsd* | *-*darwin*)
+ *-*-openbsd*)
+ i386|sparc|m68k-*-openbsd*)
AC_DEFINE(SYMBOL_PREFIX, "_", [Define to symbol prefix, if any])
+ have_sun=yes
;;
+ *-*-openbsd*)
+ have_sun=yes
+ ;;
i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
ARCH_DEFINES="-DI386_ASSEM"
@@ -463,6 +469,7 @@
arch_type=ix86
@@ -497,6 +505,7 @@ AC_SUBST(ARCH_DEFINES)
AM_CONDITIONAL(ARCH_X86, test "x$arch_type" = "xix86")
AM_CONDITIONAL(ARCH_PPC, test "x$arch_type" = "xppc")
AM_CONDITIONAL(HAVE_SOLARIS, test "x$have_solaris" = xyes)
@ -70,7 +73,7 @@ $OpenBSD: patch-configure_in,v 1.4 2002/02/05 04:07:57 pvalchev Exp $
plugindir=$libdir/xmms
AC_SUBST(plugindir)
@@ -490,7 +497,7 @@
@@ -524,7 +533,7 @@ AC_SUBST(GENERAL_PLUGIN_DIR)
AC_SUBST(VISUALIZATION_PLUGIN_DIR)
AC_SUBST(pluginsubs)
@ -79,7 +82,7 @@ $OpenBSD: patch-configure_in,v 1.4 2002/02/05 04:07:57 pvalchev Exp $
if test "x$enable_user_plugin_dir" = "xno"; then
AC_DEFINE(DISABLE_USER_PLUGIN_DIR,, [Define to disable per user plugin directory])
@@ -520,6 +527,7 @@
@@ -554,6 +563,7 @@ Output/OSS/Makefile
Output/esd/Makefile
Output/disk_writer/Makefile
Output/solaris/Makefile
@ -87,7 +90,7 @@ $OpenBSD: patch-configure_in,v 1.4 2002/02/05 04:07:57 pvalchev Exp $
Input/Makefile
Input/wav/Makefile
Input/mpg123/Makefile
@@ -562,6 +570,7 @@
@@ -591,6 +601,7 @@ echo " Build esd plugin: $hav
echo " Build mikmod plugin: $have_mikmod"
echo " Build Ogg Vorbis plugin: $have_oggvorbis"
echo " Build Solaris plugin: $have_solaris"