On Wednesday 18 April 2001  1:25 am, Matthew Schalit wrote:
> Hi Folks,

Hi Matt,

Sorry for the slow response.

> On SCO UnixWare 7.1.1, the header file <dl.h> is
> found as <sys/dl.h>.
>
> I just checked out CVS libtool today, and it looks like
> I'll have to change a few files:
>
> $ find . | xargs fgrep -l "dl.h"
> ./ChangeLog.0
> ./ChangeLog
> ./ltdl.m4
> ./doc/libtool.texi
> ./libltdl
> ./libltdl/CVS/Entries
> ./libltdl/Makefile.am
> ./libltdl/ltdl.c
> ./libltdl/ltdl.h
> ./mail/c++
> ./mdemo/Makefile.am
> ./mdemo/main.c
>
>
>
> Should I just do that, or is there a better way?

Nearly all of those are false matches against ltdl.h.  Assuming that UW7 uses 
the dlopen API, the attached patch should do the trick.  If it uses a 
different API, moving the include block to the relevant loader section in 
ltdl.c is all that should be required.

Once again, a prompt reply gets your fix into libtool-1.4 tomorrow...

> Thanks,
> Matt

Cheers,
        Gary.
-- 
  ___              _   ___   __              _         mailto: [EMAIL PROTECTED]
 / __|__ _ _ ___ _| | / / | / /_ _ _  _ __ _| |_  __ _ ___       [EMAIL PROTECTED]
| (_ / _` | '_|// / |/ /| |/ / _` | || / _` | ' \/ _` | _ \
 \___\__,_|_|\_, /|___(_)___/\__,_|\_,_\__, |_||_\__,_|//_/
home page:  /___/                      /___/                  gpg public key:
http://www.oranda.demon.co.uk           http://www.oranda.demon.co.uk/key.asc
Index: ChangeLog
from  Gary V. Vaughan  <[EMAIL PROTECTED]>

	* ltdl.m4 (AC_CHECK_HEADERS): UW7 has sys/dl.h, so we must
	check for that here.
	* libltdl/ltdl.c (HAVE_SYS_DL_H):  Include it if necessary for
	the dlopen loader.

Index: ltdl.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/ltdl.m4,v
retrieving revision 1.18
diff -u -r1.18 ltdl.m4
--- ltdl.m4 2001/02/05 00:24:55 1.18
+++ ltdl.m4 2001/04/21 15:42:17
@@ -35,7 +35,7 @@
 AC_REQUIRE([AC_HEADER_STDC])dnl
 AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
 
-AC_CHECK_HEADERS(malloc.h memory.h stdlib.h stdio.h ctype.h dl.h dld.h)
+AC_CHECK_HEADERS(malloc.h memory.h stdlib.h stdio.h ctype.h dl.h sys/dl.h dld.h)
 AC_CHECK_HEADERS(string.h strings.h, break)
 AC_CHECK_FUNCS(strchr index, break)
 AC_CHECK_FUNCS(strrchr rindex, break)
Index: libltdl/ltdl.c
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/ltdl.c,v
retrieving revision 1.131
diff -u -r1.131 ltdl.c
--- libltdl/ltdl.c 2001/04/16 20:39:44 1.131
+++ libltdl/ltdl.c 2001/04/21 15:42:21
@@ -530,6 +530,10 @@
 #  include <dlfcn.h>
 #endif
 
+#if HAVE_SYS_DL_H
+#  include <sys/dl.h>
+#endif
+
 #ifdef RTLD_GLOBAL
 #  define LT_GLOBAL		RTLD_GLOBAL
 #else

Reply via email to