Sophie

Sophie

distrib > Fedora > 13 > i386 > media > updates-src > by-pkgid > 4361c2925ff783f22b1cd52106de6c65 > files > 4

gambas-1.0.19-13.fc13.src.rpm

diff -up gambas-1.0.19/acinclude.m4.ltdl gambas-1.0.19/acinclude.m4
--- gambas-1.0.19/acinclude.m4.ltdl	2010-02-12 09:42:25.444764692 -0500
+++ gambas-1.0.19/acinclude.m4	2010-02-12 09:44:14.493639852 -0500
@@ -2365,7 +2365,7 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
   "") enable_ltdl_convenience=yes
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+  LIBLTDL="-ldl -lltdl"
   LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
   # For backwards non-gettext consistent compatibility...
   INCLTDL="$LTDLINCL"
diff -up gambas-1.0.19/configure.in.ltdl gambas-1.0.19/configure.in
--- gambas-1.0.19/configure.in.ltdl	2010-02-12 09:40:42.897763666 -0500
+++ gambas-1.0.19/configure.in	2010-02-12 09:40:42.908765485 -0500
@@ -11,8 +11,6 @@ AC_INIT(src/share/gambas.h)
 
 AM_MAINTAINER_MODE
 
-AC_CONFIG_SUBDIRS(libltdl)
-
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(gambas, 1.0.19)
 
@@ -91,6 +89,7 @@ dnl ---- Checks for libraries
 
 AC_CHECK_LIB(m, main, echo -n)
 AC_CHECK_LIB(z, main, echo -n)
+AC_CHECK_LIB(ltdl, main, echo -n)
 
 C_LIB=-lc
 
diff -up gambas-1.0.19/Makefile.am.ltdl gambas-1.0.19/Makefile.am
--- gambas-1.0.19/Makefile.am.ltdl	2010-02-12 09:40:42.886763871 -0500
+++ gambas-1.0.19/Makefile.am	2010-02-12 09:40:42.908765485 -0500
@@ -1,4 +1,4 @@
-SUBDIRS = libltdl src
+SUBDIRS = src
 EXTRA_DIST = TODO reconf app examples spec help debian README README.*
 ##AUTOMAKE_OPTIONS = dist-bzip2
 
diff -up gambas-1.0.19/reconf.ltdl gambas-1.0.19/reconf
--- gambas-1.0.19/reconf.ltdl	2003-12-29 08:16:04.000000000 -0500
+++ gambas-1.0.19/reconf	2010-02-12 09:40:42.908765485 -0500
@@ -8,11 +8,3 @@ autoconf
 #acconfig
 autoheader
 automake -a
-
-cd libltdl
-
-aclocal
-autoconf
-#acconfig
-autoheader
-automake -a
diff -up gambas-1.0.19/src/comp/gbi.c.ltdl gambas-1.0.19/src/comp/gbi.c
--- gambas-1.0.19/src/comp/gbi.c.ltdl	2010-02-12 09:40:42.906781084 -0500
+++ gambas-1.0.19/src/comp/gbi.c	2010-02-12 09:40:42.908765485 -0500
@@ -458,8 +458,6 @@ bool analyze(const char *path)
   if (_verbose)
     fprintf(stderr, "Loading: %s\n", path);
 
-  lt_dlopen_flag = RTLD_LAZY; /* | RTLD_GLOBAL;*/
-
   if (access(path, F_OK))
     error2(path, "not found");
   
diff -up gambas-1.0.19/src/exec/gbx_library.c.ltdl gambas-1.0.19/src/exec/gbx_library.c
--- gambas-1.0.19/src/exec/gbx_library.c.ltdl	2004-10-27 11:26:16.000000000 -0400
+++ gambas-1.0.19/src/exec/gbx_library.c	2010-02-12 09:40:42.908765485 -0500
@@ -500,7 +500,6 @@ PUBLIC void LIBRARY_load(LIBRARY *lib)
     return;
 
   #ifdef USE_LTDL
-    lt_dlopen_flag = RTLD_LAZY;
     lib->handle = lt_dlopenext(lib->path);
   #else
     lib->handle = dlopen(lib->path, RTLD_LAZY);
diff -up gambas-1.0.19/src/lib/net/doc/configure.in.ltdl gambas-1.0.19/src/lib/net/doc/configure.in