[xiph-cvs] cvs commit: ao/src ao_private.h

[Stan Seibert]

volsung     03/08/29 14:18:32

  Modified:    .        configure.in
               src      ao_private.h
  Log:
  Move dlopen flag settings from header file to configure script and add
  Solaris 2.7 as a targe which requires RTLD_LAZY to work.  Closes bug 240.

Revision  Changes    Path
1.46      +14 -0     ao/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ao/configure.in,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- configure.in	14 Jul 2003 02:57:45 -0000	1.45
+++ configure.in	29 Aug 2003 18:18:29 -0000	1.46
@@ -102,6 +102,20 @@
 dnl Checks for header files
 dnl ==============================
 
+dnl ==============================
+dnl Select proper dlopen flags
+dnl ==============================
+case $host in
+    
+    *openbsd* | *netbsd* | *hpux* | *solaris2.7)
+	DLOPEN_FLAG='(RTLD_LAZY)'
+	;;
+    *)
+	DLOPEN_FLAG='(RTLD_NOW | RTLD_GLOBAL)'
+	;;
+esac
+AC_DEFINE_UNQUOTED(DLOPEN_FLAG, $DLOPEN_FLAG)
+
 dnl --------------------------------------------------
 dnl Work around FHS stupidity
 dnl --------------------------------------------------

<p><p>1.8       +4 -4      ao/src/ao_private.h

Index: ao_private.h
===================================================================
RCS file: /usr/local/cvsroot/ao/src/ao_private.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ao_private.h	7 Aug 2003 15:53:21 -0000	1.7
+++ ao_private.h	29 Aug 2003 18:18:32 -0000	1.8
@@ -38,13 +38,13 @@
 #endif
 
 /* RTLD_NOW is the preferred symbol resolution behavior, but
- * some platforms do not support it. 
+ * some platforms do not support it.  The autoconf script will have
+ * already defined DLOPEN_FLAG if the default is unacceptable on the
+ * current platform.
  *
  * ALSA requires RTLD_GLOBAL.
  */
-#if defined(__OpenBSD__) || defined(hpux)
-#define DLOPEN_FLAG (RTLD_LAZY)
-#else
+#if !defined(DLOPEN_FLAG)
 #define DLOPEN_FLAG (RTLD_NOW | RTLD_GLOBAL)
 #endif
 

<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.