summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2007-02-08 20:14:30 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2007-02-08 20:14:30 +0000
commite173e7bec0961bbc5cc972b6fe1d3d9721c8c5b6 (patch)
tree9f76929aa3a11c17785a397176378ef7c87abe2c
parent7d64ba5ec865785f20c3f9576288adb034c9fdfb (diff)
Add header check for dlfcn.h.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5678 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--configh.in3
-rw-r--r--configure.in1
-rw-r--r--src/glut_compatability.cxx6
3 files changed, 6 insertions, 4 deletions
diff --git a/configh.in b/configh.in
index 0596dbc9f..4e73833dc 100644
--- a/configh.in
+++ b/configh.in
@@ -288,9 +288,10 @@
#endif /* !HAVE_STRTOLL */
/*
- * Do we have the dlsym() function?
+ * Do we have the dlsym() function and header?
*/
+#undef HAVE_DLFCN_H
#undef HAVE_DLSYM
/*
diff --git a/configure.in b/configure.in
index 1d9d576c6..de77c1fd7 100644
--- a/configure.in
+++ b/configure.in
@@ -440,6 +440,7 @@ AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL))
dnl Check for dlopen/dlsym...
AC_SEARCH_LIBS(dlsym, dl, AC_DEFINE(HAVE_DLSYM))
+AC_CHECK_HEADER(dlfcn.h, AC_DEFINE(HAVE_DLFCN_H))
dnl Check for audio libraries...
AUDIOLIBS=""
diff --git a/src/glut_compatability.cxx b/src/glut_compatability.cxx
index 47079905d..0f768a4dc 100644
--- a/src/glut_compatability.cxx
+++ b/src/glut_compatability.cxx
@@ -43,9 +43,9 @@
# define GLX_GLXEXT_LEGACY
# include <GL/glx.h>
# endif // HAVE_GLXGETPROCADDRESSARB
-# ifdef HAVE_DLSYM
+# ifdef HAVE_DLFCN_H
# include <dlfcn.h>
-# endif // HAVE_DLSYM
+# endif // HAVE_DLFCN_H
# define MAXWINDOWS 32
static Fl_Glut_Window *windows[MAXWINDOWS+1];
@@ -443,7 +443,7 @@ GLUTproc glutGetProcAddress(const char *procName) {
# ifdef WIN32
return (GLUTproc)wglGetProcAddress((LPCSTR)procName);
-# elif defined(HAVE_DLSYM)
+# elif defined(HAVE_DLSYM) && defined(HAVE_DLFCN_H)
char symbol[1024];
snprintf(symbol, sizeof(symbol), "_%s", procName);