KDE 2.x and lt_dlopen_flag

[Nick Hudson]

The KDE guys have added a patch simliar to the following to their
version of libltdl. Can this be integrated into libtool cvs.

Diff is against the MLB branch

Thanks,
Nick

? libltdl/libtool.diff
Index: libltdl/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/Makefile.am,v
retrieving revision 1.33.2.3
diff -c -r1.33.2.3 Makefile.am
*** libltdl/Makefile.am 2001/01/29 02:02:05     1.33.2.3
--- libltdl/Makefile.am 2001/06/04 21:01:36
***************
*** 18,24 ****
  CLEANFILES = libltdl.la libltdlc.la
  
  libltdl_la_SOURCES = ltdl.c
! libltdl_la_LDFLAGS = -no-undefined -version-info 3:0:0
  libltdl_la_LIBADD = $(LIBADD_DL)
  
  libltdlc_la_SOURCES = ltdl.c
--- 18,24 ----
  CLEANFILES = libltdl.la libltdlc.la
  
  libltdl_la_SOURCES = ltdl.c
! libltdl_la_LDFLAGS = -no-undefined -version-info 3:1:0
  libltdl_la_LIBADD = $(LIBADD_DL)
  
  libltdlc_la_SOURCES = ltdl.c
Index: libltdl/ltdl.c
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/ltdl.c,v
retrieving revision 1.82.2.27
diff -c -r1.82.2.27 ltdl.c
*** libltdl/ltdl.c      2001/04/24 23:03:33     1.82.2.27
--- libltdl/ltdl.c      2001/06/04 21:01:38
***************
*** 575,586 ****
  #  define DLERROR(arg)        LT_DLSTRERROR (arg)
  #endif
  
  static lt_module
  sys_dl_open (loader_data, filename)
       lt_user_data loader_data;
       const char *filename;
  {
!   lt_module   module   = dlopen (filename, LT_GLOBAL | LT_LAZY_OR_NOW);
  
    if (!module)
      {
--- 575,588 ----
  #  define DLERROR(arg)        LT_DLSTRERROR (arg)
  #endif
  
+ int lt_dlopen_flag = LT_LAZY_OR_NOW;
+ 
  static lt_module
  sys_dl_open (loader_data, filename)
       lt_user_data loader_data;
       const char *filename;
  {
!   lt_module   module   = dlopen (filename, lt_dlopen_flag);
  
    if (!module)
      {
***************
*** 630,637 ****
      0,
  #  endif
      sys_dl_open, sys_dl_close, sys_dl_sym, 0, 0 };
- 
  
  #endif /* HAVE_LIBDL */
  
  
--- 632,640 ----
      0,
  #  endif
      sys_dl_open, sys_dl_close, sys_dl_sym, 0, 0 };
  
+ #else
+ int lt_dlopen_flag = 0;
  #endif /* HAVE_LIBDL */
  
  
Index: libltdl/ltdl.h
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/ltdl.h,v
retrieving revision 1.24.2.12
diff -c -r1.24.2.12 ltdl.h
*** libltdl/ltdl.h      2001/03/05 20:47:28     1.24.2.12
--- libltdl/ltdl.h      2001/06/04 21:01:38
***************
*** 151,156 ****
--- 151,159 ----
  extern        int         lt_dlsetsearchpath  LT_PARAMS((const char 
*search_path));
  extern        const char *lt_dlgetsearchpath  LT_PARAMS((void));
  
+ /* dlopen mode flag */
+ extern  int         lt_dlopen_flag;
+ 
  /* Portable libltdl versions of the system dlopen() API. */
  extern        lt_dlhandle lt_dlopen           LT_PARAMS((const char 
*filename));
  extern        lt_dlhandle lt_dlopenext        LT_PARAMS((const char 
*filename));