[Commit] nickle ChangeLog, 1.116, 1.117 Makefile.am, 1.63, 1.64 builtin-foreign.c, 1.1, 1.2 configure.in, 1.39, 1.40

[Keith Packard]

Committed by: keithp

Update of /local/src/CVS/nickle
In directory home.keithp.com:/tmp/cvs-serv29916

Modified Files:
	ChangeLog Makefile.am builtin-foreign.c configure.in 
Log Message:
2004-12-18  Keith Packard  <keithp at keithp.com>

	* Makefile.am:
	* builtin-foreign.c: (do_Foreign_load):
	* configure.in:
	Look for -ldl, but don't depend on that, instead look
	for dlopen et al directly.  Makes it build on FreeBSD


Index: ChangeLog
===================================================================
RCS file: /local/src/CVS/nickle/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- ChangeLog	18 Dec 2004 07:12:40 -0000	1.116
+++ ChangeLog	19 Dec 2004 03:01:01 -0000	1.117
@@ -1,3 +1,11 @@
+2004-12-18  Keith Packard  <keithp at keithp.com>
+
+	* Makefile.am:
+	* builtin-foreign.c: (do_Foreign_load):
+	* configure.in:
+	Look for -ldl, but don't depend on that, instead look
+	for dlopen et al directly.  Makes it build on FreeBSD
+
 2004-12-17  Keith Packard  <keithp at keithp.com>
 
 	* array.c: (BuildArrayType):

Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/nickle/Makefile.am,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- Makefile.am	11 Dec 2004 06:02:23 -0000	1.63
+++ Makefile.am	19 Dec 2004 03:01:01 -0000	1.64
@@ -61,6 +61,7 @@
 	-Wnested-externs -fno-strict-aliasing
 
 USES_GRAM_H = \
+	array.o \
 	compile.o \
 	error.o \
 	expr.o \

Index: builtin-foreign.c
===================================================================
RCS file: /local/src/CVS/nickle/builtin-foreign.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- builtin-foreign.c	11 Dec 2004 17:42:18 -0000	1.1
+++ builtin-foreign.c	19 Dec 2004 03:01:01 -0000	1.2
@@ -15,7 +15,7 @@
 
 #if HAVE_EXTERN_SYMS
 
-#if HAVE_DLFCN_H && HAVE_LIBDL
+#if HAVE_DLFCN_H && HAVE_DLOPEN && HAVE_DLSYM
 #define HAVE_FOREIGN_LOAD 1
 #include	<dlfcn.h>
 
@@ -34,7 +34,10 @@
     lib = dlopen (name, RTLD_NOW);
     if (!lib)
     {
-	char	*err = dlerror ();
+	char	*err = 0;
+#if HAVE_DLERROR
+	err = dlerror ();
+#endif
 	if (!err)
 	    err = "cannot open";
 	RaiseStandardException (exception_invalid_argument,
@@ -45,12 +48,17 @@
     init = (Value (*) (void)) dlsym (lib, "nickle_init");
     if (!init)
     {
-	char	*err = dlerror ();
+	char	*err = 0;
+#if HAVE_DLERROR
+	err = dlerror ();
+#endif
 	if (!err)
 	    err = "missing nickle_init";
 	RaiseStandardException (exception_invalid_argument,
 				err, 2, NewInt (0), av);
+#if HAVE_DLCLOSE
 	dlclose (lib);
+#endif
 	RETURN (Void);
     }
     ret = (*init) ();

Index: configure.in
===================================================================
RCS file: /local/src/CVS/nickle/configure.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- configure.in	11 Dec 2004 06:02:23 -0000	1.39
+++ configure.in	19 Dec 2004 03:01:01 -0000	1.40
@@ -104,6 +104,7 @@
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(unsetenv setenv putenv gettimeofday hstrerror select)
 AC_CHECK_FUNCS(sigaction sigrelse sigignore setrlimit getrlimit)
+AC_CHECK_FUNCS(dlopen dlsym dlerror dlclose)
 
 AC_FUNC_GETPGRP