Index: ChangeLog 2004-11-23 Peter O'Gorman Do not require that libtoolize --ltdl=/some/path end in libltdl. Move most libltdl headers to libtldl/libltdl to allow #include to always work. * libltdl/Makefile.am, libltdl/loaders/Makefile.am: Look for includes in the new location. * libltdl/libltdl/lt__alloc.h, libltdl/libltdl/lt__dirent.h, libltdl/libltdl/lt__glibc.h, libltdl/libltdl/lt__private.h, libltdl/libltdl/lt_dlloader.h, libltdl/libltdl/lt_error.h, libltdl/libltdl/lt_system.h, libltdl/libltdl/ltdl.h, libltdl/libltdl/slist.h: Added files, moved from libtdl/. * libltdl/lt__alloc.h, libltdl/lt__dirent.h, libltdl/lt__glibc.h, libltdl/lt__private.h, libltdl/lt_dlloader.h, libltdl/lt_error.h, libltdl/lt_system.h, libltdl/ltdl.h, libltdl/slist.h: Removed, moved to libltdl/libltdl. from Ralf Wildenhues Index: libltdl/Makefile.am =================================================================== RCS file: /cvsroot/libtool/libtool/libltdl/Makefile.am,v retrieving revision 1.65 diff -u -3 -p -u -r1.65 Makefile.am --- libltdl/Makefile.am 15 Nov 2004 01:03:14 -0000 1.65 +++ libltdl/Makefile.am 23 Nov 2004 12:10:43 -0000 @@ -27,26 +27,27 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 DEFS = -DHAVE_CONFIG_H="<$(CONFIG_H)>" -DLTDL -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) +AM_CPPFLAGS = -I$(builddir) -I$(srcdir) -I$(srcdir)/libltdl AM_LDFLAGS = -no-undefined VERSION_INFO = -version-info 6:0:0 pkgincludedir = $(includedir)/libltdl lib_LTLIBRARIES = libdlloader.la -libdlloader_la_SOURCES = lt_error.h lt_error.c \ - lt__private.h lt_system.h \ - lt__alloc.h lt__alloc.c \ - lt__glibc.h \ - lt__dirent.h \ - slist.h slist.c +libdlloader_la_SOURCES = libltdl/lt_error.h lt_error.c \ + libltdl/lt__private.h libltdl/lt_system.h \ + libltdl/lt__alloc.h lt__alloc.c \ + libltdl/lt__glibc.h \ + libltdl/lt__dirent.h \ + libltdl/slist.h slist.c libdlloader_la_LDFLAGS = $(VERSION_INFO) libdlloader_la_LIBADD = $(LTLIBOBJS) ## Libltdl brings it all together: if INSTALL_LTDL -include_HEADERS = ltdl.h -pkginclude_HEADERS = lt_system.h lt_error.h lt_dlloader.h +include_HEADERS = libltdl/ltdl.h +pkginclude_HEADERS = libltdl/lt_system.h libltdl/lt_error.h \ + libltdl/lt_dlloader.h lib_LTLIBRARIES += libltdl.la endif @@ -54,8 +55,8 @@ if CONVENIENCE_LTDL noinst_LTLIBRARIES = libltdlc.la endif -libltdl_la_SOURCES = ltdl.h ltdl.c \ - lt_dlloader.h lt_dlloader.c loaders/preopen.c +libltdl_la_SOURCES = libltdl/ltdl.h ltdl.c \ + libltdl/lt_dlloader.h lt_dlloader.c loaders/preopen.c libltdl_la_CPPFLAGS = -DLTDLOPEN=libltdl $(AM_CPPFLAGS) libltdl_la_LDFLAGS = $(VERSION_INFO) $(LT_DLPREOPEN) libltdl_la_LIBADD = libdlloader.la @@ -70,7 +71,8 @@ libltdlc_la_LIBADD = $(libdlloader_la_LI ltdldatadir = $(pkgvdatadir)/libltdl nobase_ltdldata_DATA = COPYING.LIB Makefile.am README configure.ac \ $(libltdl_la_SOURCES) $(libdlloader_la_SOURCES) \ - lt__dirent.c lt__dirent.h argz_.h argz.c + lt__dirent.c libltdl/lt__dirent.h \ + argz_.h argz.c ## Make sure these will be cleaned even when they're not built by default: CLEANFILES = libltdl.la libltdlc.la libdlloader.la Index: libltdl/lt__alloc.h =================================================================== RCS file: libltdl/lt__alloc.h diff -N libltdl/lt__alloc.h --- libltdl/lt__alloc.h 3 Oct 2004 17:22:50 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,57 +0,0 @@ -/* lt__alloc.h -- internal memory management interface - Copyright (C) 2004 Free Software Foundation, Inc. - Originally by Gary V. Vaughan - - NOTE: The canonical source of this file is maintained with the - GNU Libtool package. Report bugs to bug-libtool@gnu.org. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -As a special exception to the GNU Lesser General Public License, -if you distribute this file as part of a program or library that -is built using GNU libtool, you may include it under the same -distribution terms that you use for the rest of that program. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA - -*/ - -#if !defined(LT__ALLOC_H) -#define LT__ALLOC_H 1 - -#include "lt_system.h" - -LT_BEGIN_C_DECLS - -#define MALLOC(tp, n) (tp*) lt__malloc((n) * sizeof(tp)) -#define REALLOC(tp, mem, n) (tp*) lt__realloc((mem), (n) * sizeof(tp)) -#define FREE(mem) LT_STMT_START { \ - if (mem) (mem) = (free (mem), (void *) 0); } LT_STMT_END -#define MEMREASSIGN(p, q) LT_STMT_START { \ - if ((p) != (q)) { if (p) free (p); (p) = (q); (q) = 0; } \ - } LT_STMT_END - -/* If set, this function is called when memory allocation has failed. */ -LT_SCOPE void (*lt__alloc_die) (void); - -LT_SCOPE void *lt__malloc (size_t n); -LT_SCOPE void *lt__zalloc (size_t n); -LT_SCOPE void *lt__realloc (void *mem, size_t n); -LT_SCOPE void *lt__memdup (void const *mem, size_t n); - -LT_SCOPE char *lt__strdup (const char *string); - -LT_END_C_DECLS - -#endif /*!defined(LT__ALLOC_H)*/ Index: libltdl/lt__dirent.h =================================================================== RCS file: libltdl/lt__dirent.h diff -N libltdl/lt__dirent.h --- libltdl/lt__dirent.h 3 Oct 2004 13:50:10 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,97 +0,0 @@ -/* lt__dirent.h -- internal directory entry scanning interface - Copyright (C) 2001, 2004 Free Software Foundation, Inc. - Originally by Bob Friesenhahn - - NOTE: The canonical source of this file is maintained with the - GNU Libtool package. Report bugs to bug-libtool@gnu.org. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -As a special exception to the GNU Lesser General Public License, -if you distribute this file as part of a program or library that -is built using GNU libtool, you may include it under the same -distribution terms that you use for the rest of that program. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA - -*/ - -#if !defined(LT__DIRENT_H) -#define LT__DIRENT_H 1 - -#if defined(HAVE_CONFIG_H) -# include HAVE_CONFIG_H -#endif - -#include "lt_system.h" - -#if defined(HAVE_CLOSEDIR) && defined(HAVE_OPENDIR) && defined(HAVE_READDIR) && defined(HAVE_DIRENT_H) -/* We have a fully operational dirent subsystem. */ -# include -# define D_NAMLEN(dirent) (strlen((dirent)->d_name)) - -#elif !defined(__WINDOWS__) -/* We are not on windows, so we can get the same functionality from the - `direct' API. */ -# define dirent direct -# define D_NAMLEN(dirent) ((dirent)->d_namlen) -# if defined(HAVE_SYS_NDIR_H) -# include -# endif -# if defined(HAVE_SYS_DIR_H) -# include -# endif -# if defined(HAVE_NDIR_H) -# include -# endif - -#else /* __WINDOWS__ */ -/* Use some wrapper code to emulate dirent on windows.. */ -# define WINDOWS_DIRENT_EMULATION 1 - -# include - -# define D_NAMLEN(dirent) (strlen((dirent)->d_name)) -# define dirent lt__dirent -# define DIR lt__DIR -# define opendir lt__opendir -# define readdir lt__readdir -# define closedir lt__closedir - -LT_BEGIN_C_DECLS - -struct dirent -{ - char d_name[LT_FILENAME_MAX]; - int d_namlen; -}; - -typedef struct -{ - HANDLE hSearch; - WIN32_FIND_DATA Win32FindData; - BOOL firsttime; - struct dirent file_info; -} DIR; - - -LT_SCOPE DIR * opendir (const char *path); -LT_SCOPE struct dirent *readdir (DIR *entry); -LT_SCOPE void closedir (DIR *entry); - -LT_END_C_DECLS - -#endif /*!defined(__WINDOWS__)*/ - -#endif /*!defined(LT__DIRENT_H)*/ Index: libltdl/lt__glibc.h =================================================================== RCS file: libltdl/lt__glibc.h diff -N libltdl/lt__glibc.h --- libltdl/lt__glibc.h 22 Apr 2004 22:47:20 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,56 +0,0 @@ -/* lt__glibc.h -- support for non glibc environments - Copyright (C) 2004 Free Software Foundation, Inc. - Originally by Gary V. Vaughan - - NOTE: The canonical source of this file is maintained with the - GNU Libtool package. Report bugs to bug-libtool@gnu.org. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -As a special exception to the GNU Lesser General Public License, -if you distribute this file as part of a program or library that -is built using GNU libtool, you may include it under the same -distribution terms that you use for the rest of that program. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA - -*/ - -#if !defined(LT__GLIBC_H) -#define LT__GLIBC_H 1 - -#if defined(HAVE_CONFIG_H) -# include HAVE_CONFIG_H -#endif - -#if !defined(HAVE_ARGZ_H) -/* Redefine any glibc symbols we reimplement to import the - implementations into our lt__ namespace so we don't ever - clash with the system library if our clients use argz_* - from there in addition to libltdl. */ -# undef argz_append -# define argz_append lt__argz_append -# undef argz_create_sep -# define argz_create_sep lt__argz_create_sep -# undef argz_insert -# define argz_insert lt__argz_insert -# undef argz_next -# define argz_next lt__argz_next -# undef argz_stringify -# define argz_stringify lt__argz_stringify -#endif - -#include - -#endif /*!defined(LT__GLIBC_H)*/ Index: libltdl/lt__private.h =================================================================== RCS file: libltdl/lt__private.h diff -N libltdl/lt__private.h --- libltdl/lt__private.h 15 Jul 2004 12:37:15 -0000 1.11 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,133 +0,0 @@ -/* lt__private.h -- internal apis for libltdl - Copyright (C) 2004 Free Software Foundation, Inc. - Originally by Gary V. Vaughan - - NOTE: The canonical source of this file is maintained with the - GNU Libtool package. Report bugs to bug-libtool@gnu.org. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -As a special exception to the GNU Lesser General Public License, -if you distribute this file as part of a program or library that -is built using GNU libtool, you may include it under the same -distribution terms that you use for the rest of that program. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA - -*/ - -#if !defined(LT__PRIVATE_H) -#define LT__PRIVATE_H 1 - -#if defined(HAVE_CONFIG_H) -# include HAVE_CONFIG_H -#endif - -#include -#include -#include -#include - -#if defined(HAVE_UNISTD_H) -# include -#endif - -#if defined(HAVE_STRING_H) -# include -#else -# if defined(HAVE_STRINGS_H) -# include -# endif -#endif -#if defined(HAVE_MEMORY_H) -# include -#endif - -/* Import internal interfaces... */ -#include "lt__alloc.h" -#include "lt__dirent.h" -#include "lt__glibc.h" -#include "slist.h" - -/* ...and all exported interfaces. */ -#include "ltdl.h" - -#if defined(WITH_DMALLOC) -# include -#endif - -#if defined(DLL_EXPORT) -# define LT_GLOBAL_DATA __declspec(dllexport) -#else -# define LT_GLOBAL_DATA -#endif - - -LT_BEGIN_C_DECLS - -#if !defined(errno) -extern int errno; -#endif - -LT_SCOPE void lt__alloc_die_callback (void); - - -/* For readability: */ -#define strneq(s1, s2) (strcmp((s1), (s2)) != 0) -#define streq(s1, s2) (!strcmp((s1), (s2))) - - - -/* --- OPAQUE STRUCTURES DECLARED IN LTDL.H --- */ - -/* This type is used for the array of caller data sets in each handler. */ -typedef struct { - lt_dlcaller_id key; - void * data; -} lt_caller_data; - -typedef struct lt__handle lt__handle; - -struct lt__handle { - lt__handle * next; - const lt_dlvtable * vtable; /* dlopening interface */ - lt_dlinfo info; /* user visible fields */ - int depcount; /* number of dependencies */ - lt_dlhandle * deplibs; /* dependencies */ - lt_module module; /* system module handle */ - void * system; /* system specific data */ - lt_caller_data * caller_data; /* per caller associated data */ - int flags; /* various boolean stats */ -}; - - - -/* --- ERROR HANDLING --- */ - -/* Extract the diagnostic strings from the error table macro in the same - order as the enumerated indices in lt_error.h. */ - -LT_SCOPE const char *lt__error_strings[]; - -#define LT__STRERROR(name) lt__error_strings[LT_CONC(LT_ERROR_,name)] - -#define LT__GETERROR(lvalue) (lvalue) = lt__last_error; -#define LT__SETERRORSTR(errormsg) lt__last_error = (errormsg) -#define LT__SETERROR(errorcode) LT__SETERRORSTR(LT__STRERROR(errorcode)) - -LT_SCOPE const char *lt__last_error; - -LT_END_C_DECLS - -#endif /*!defined(LT__PRIVATE_H)*/ Index: libltdl/lt_dlloader.h =================================================================== RCS file: libltdl/lt_dlloader.h diff -N libltdl/lt_dlloader.h --- libltdl/lt_dlloader.h 2 Sep 2004 12:55:31 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,83 +0,0 @@ -/* lt_dlloader.h -- dynamic library loader interface - Copyright (C) 2004 Free Software Foundation, Inc. - Originally by Gary V. Vaughan - - NOTE: The canonical source of this file is maintained with the - GNU Libtool package. Report bugs to bug-libtool@gnu.org. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -As a special exception to the GNU Lesser General Public License, -if you distribute this file as part of a program or library that -is built using GNU libtool, you may include it under the same -distribution terms that you use for the rest of that program. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA - -*/ - -#if !defined(LT_DLLOADER_H) -#define LT_DLLOADER_H 1 - -#include - -LT_BEGIN_C_DECLS - -typedef void * lt_dlloader; -typedef void * lt_module; -typedef void * lt_user_data; - -/* Function pointer types for module loader vtable entries: */ -typedef lt_module lt_module_open (lt_user_data data, - const char *filename); -typedef int lt_module_close (lt_user_data data, - lt_module module); -typedef void * lt_find_sym (lt_user_data data, lt_module module, - const char *symbolname); -typedef int lt_dlloader_init (lt_user_data data); -typedef int lt_dlloader_exit (lt_user_data data); - -/* Default priority is LT_DLLOADER_PREPEND if none is explicitly given. */ -typedef enum { - LT_DLLOADER_PREPEND = 0, LT_DLLOADER_APPEND -} lt_dlloader_priority; - -/* This structure defines a module loader, as populated by the get_vtable - entry point of each loader. */ -typedef struct { - const char * name; - const char * sym_prefix; - lt_module_open * module_open; - lt_module_close * module_close; - lt_find_sym * find_sym; - lt_dlloader_init * dlloader_init; - lt_dlloader_exit * dlloader_exit; - lt_user_data dlloader_data; - lt_dlloader_priority priority; -} lt_dlvtable; - -LT_SCOPE int lt_dlloader_add (const lt_dlvtable *vtable); -LT_SCOPE lt_dlloader lt_dlloader_next (const lt_dlloader loader); - -LT_SCOPE lt_dlvtable * lt_dlloader_remove (char *name); -LT_SCOPE const lt_dlvtable *lt_dlloader_find (char *name); -LT_SCOPE const lt_dlvtable *lt_dlloader_get (lt_dlloader loader); - - -/* Type of a function to get a loader's vtable: */ -typedef const lt_dlvtable *lt_get_vtable (lt_user_data data); - -LT_END_C_DECLS - -#endif /*!defined(LT_DLLOADER_H)*/ Index: libltdl/lt_error.h =================================================================== RCS file: libltdl/lt_error.h diff -N libltdl/lt_error.h --- libltdl/lt_error.h 22 Oct 2004 13:07:44 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,78 +0,0 @@ -/* lt_error.h -- error propogation interface - Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc. - Originally by Thomas Tanner - - NOTE: The canonical source of this file is maintained with the - GNU Libtool package. Report bugs to bug-libtool@gnu.org. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -As a special exception to the GNU Lesser General Public License, -if you distribute this file as part of a program or library that -is built using GNU libtool, you may include it under the same -distribution terms that you use for the rest of that program. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free -Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA -*/ - -/* Only include this header file once. */ -#if !defined(LT_ERROR_H) -#define LT_ERROR_H 1 - -#include - -LT_BEGIN_C_DECLS - -/* Defining error strings alongside their symbolic names in a macro in - this way allows us to expand the macro in different contexts with - confidence that the enumeration of symbolic names will map correctly - onto the table of error strings. */ -#define lt_dlerror_table \ - LT_ERROR(UNKNOWN, "unknown error") \ - LT_ERROR(DLOPEN_NOT_SUPPORTED, "dlopen support not available") \ - LT_ERROR(INVALID_LOADER, "invalid loader") \ - LT_ERROR(INIT_LOADER, "loader initialization failed") \ - LT_ERROR(REMOVE_LOADER, "loader removal failed") \ - LT_ERROR(FILE_NOT_FOUND, "file not found") \ - LT_ERROR(DEPLIB_NOT_FOUND, "dependency library not found") \ - LT_ERROR(NO_SYMBOLS, "no symbols defined") \ - LT_ERROR(CANNOT_OPEN, "can't open the module") \ - LT_ERROR(CANNOT_CLOSE, "can't close the module") \ - LT_ERROR(SYMBOL_NOT_FOUND, "symbol not found") \ - LT_ERROR(NO_MEMORY, "not enough memory") \ - LT_ERROR(INVALID_HANDLE, "invalid module handle") \ - LT_ERROR(BUFFER_OVERFLOW, "internal buffer overflow") \ - LT_ERROR(INVALID_ERRORCODE, "invalid errorcode") \ - LT_ERROR(SHUTDOWN, "library already shutdown") \ - LT_ERROR(CLOSE_RESIDENT_MODULE, "can't close resident module") \ - LT_ERROR(INVALID_MUTEX_ARGS, "internal error (code withdrawn)") \ - LT_ERROR(INVALID_POSITION, "invalid search path insert position") - -/* Enumerate the symbolic error names. */ -enum { -#define LT_ERROR(name, diagnostic) LT_CONC(LT_ERROR_, name), - lt_dlerror_table -#undef LT_ERROR - - LT_ERROR_MAX -}; - -/* These functions are only useful from inside custom module loaders. */ -LT_SCOPE int lt_dladderror (const char *diagnostic); -LT_SCOPE int lt_dlseterror (int errorcode); - - -LT_END_C_DECLS - -#endif /*!defined(LT_ERROR_H)*/ Index: libltdl/lt_system.h =================================================================== RCS file: libltdl/lt_system.h diff -N libltdl/lt_system.h --- libltdl/lt_system.h 15 Jul 2004 12:14:47 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,151 +0,0 @@ -/* lt_system.h -- system portability abstraction layer - Copyright (C) 2004 Free Software Foundation, Inc. - Originally by Gary V. Vaughan - - NOTE: The canonical source of this file is maintained with the - GNU Libtool package. Report bugs to bug-libtool@gnu.org. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -As a special exception to the GNU Lesser General Public License, -if you distribute this file as part of a program or library that -is built using GNU libtool, you may include it under the same -distribution terms that you use for the rest of that program. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free -Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA -*/ - -#if !defined(LT_SYSTEM_H) -#define LT_SYSTEM_H 1 - -#include -#include -#include - -/* Some systems do not define EXIT_*, even with STDC_HEADERS. */ -#if !defined(EXIT_SUCCESS) -# define EXIT_SUCCESS 0 -#endif -#if !defined(EXIT_FAILURE) -# define EXIT_FAILURE 1 -#endif - -/* Just pick a big number... */ -#define LT_FILENAME_MAX 2048 - - -/* Saves on those hard to debug '\0' typos.... */ -#define LT_EOS_CHAR '\0' - -/* LTDL_BEGIN_C_DECLS should be used at the beginning of your declarations, - so that C++ compilers don't mangle their names. Use LTDL_END_C_DECLS at - the end of C declarations. */ -#if defined(__cplusplus) -# define LT_BEGIN_C_DECLS extern "C" { -# define LT_END_C_DECLS } -#else -# define LT_BEGIN_C_DECLS /* empty */ -# define LT_END_C_DECLS /* empty */ -#endif - -/* LT_STMT_START/END are used to create macros which expand to a - a single compound statement in a portable way. */ -#if defined (__GNUC__) && !defined (__STRICT_ANSI__) && !defined (__cplusplus) -# define LT_STMT_START (void)( -# define LT_STMT_END ) -#else -# if (defined (sun) || defined (__sun__)) -# define LT_STMT_START if (1) -# define LT_STMT_END else (void)0 -# else -# define LT_STMT_START do -# define LT_STMT_END while (0) -# endif -#endif - -/* Canonicalise Windows and Cygwin recognition macros. - To match the values set by recent Cygwin compilers, make sure that if - __CYGWIN__ is defined (after canonicalisation), __WINDOWS__ is NOT! */ -#if defined(__CYGWIN32__) && !defined(__CYGWIN__) -# define __CYGWIN__ __CYGWIN32__ -#endif -#if defined(__CYGWIN__) -# if defined(__WINDOWS__) -# undef __WINDOWS__ -# endif -#elif defined(_WIN32) -# define __WINDOWS__ _WIN32 -#elif defined(WIN32) -# define __WINDOWS__ WIN32 -#endif -#if defined(__CYGWIN__) && defined(__WINDOWS__) -# undef __WINDOWS__ -#endif - - -/* DLL building support on win32 hosts; mostly to workaround their - ridiculous implementation of data symbol exporting. */ -#if !defined(LT_SCOPE) -# if defined(__WINDOWS__) -# if defined(DLL_EXPORT) /* defined by libtool (if required) */ -# define LT_SCOPE __declspec(dllexport) -# endif -# if defined(LIBLTDL_DLL_IMPORT) /* define if linking with this dll */ -# define LT_SCOPE extern __declspec(dllimport) -# endif -# endif -# if !defined(LT_SCOPE) /* static linking or !__WINDOWS__ */ -# define LT_SCOPE extern -# endif -#endif - -#if defined(__WINDOWS__) -/* LT_DIRSEP_CHAR is accepted *in addition* to '/' as a directory - separator when it is set. */ -# define LT_DIRSEP_CHAR '\\' -# define LT_PATHSEP_CHAR ';' -#else -# define LT_PATHSEP_CHAR ':' -#endif - -#if defined(_MSC_VER) /* Visual Studio */ -# define R_OK 4 -#endif - -/* fopen() mode flags for reading a text file */ -#undef LT_READTEXT_MODE -#if defined(__WINDOWS__) || defined(__CYGWIN__) -# define LT_READTEXT_MODE "rt" -#else -# define LT_READTEXT_MODE "r" -#endif - -/* The extra indirection to the LT__STR and LT__CONC macros is required so - that if the arguments to LT_STR() (or LT_CONC()) are themselves macros, - they will be expanded before being quoted. */ -#ifndef LT_STR -# define LT__STR(arg) #arg -# define LT_STR(arg) LT__STR(arg) -#endif - -#ifndef LT_CONC -# define LT__CONC(a, b) a##b -# define LT_CONC(a, b) LT__CONC(a, b) -#endif -#ifndef LT_CONC3 -# define LT__CONC3(a, b, c) a##b##c -# define LT_CONC3(a, b, c) LT__CONC3(a, b, c) -#endif - -#endif /*!defined(LT_SYSTEM_H)*/ Index: libltdl/ltdl.h =================================================================== RCS file: libltdl/ltdl.h diff -N libltdl/ltdl.h --- libltdl/ltdl.h 22 Oct 2004 13:07:44 -0000 1.76 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,174 +0,0 @@ -/* ltdl.h -- generic dlopen functions - Copyright (C) 1998-2000, 2004 Free Software Foundation, Inc. - Originally by Thomas Tanner - - NOTE: The canonical source of this file is maintained with the - GNU Libtool package. Report bugs to bug-libtool@gnu.org. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -As a special exception to the GNU Lesser General Public License, -if you distribute this file as part of a program or library that -is built using GNU libtool, you may include it under the same -distribution terms that you use for the rest of that program. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free -Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA -*/ - -/* Only include this header file once. */ -#if !defined(LTDL_H) -#define LTDL_H 1 - -#include -#include -#include - -LT_BEGIN_C_DECLS - - -/* LT_STRLEN can be used safely on NULL pointers. */ -#define LT_STRLEN(s) (((s) && (s)[0]) ? strlen (s) : 0) - - - -/* --- DYNAMIC MODULE LOADING API --- */ - - -typedef void * lt_dlhandle; /* A loaded module. */ - -/* Initialisation and finalisation functions for libltdl. */ -LT_SCOPE int lt_dlinit (void); -LT_SCOPE int lt_dlexit (void); - -/* Module search path manipulation. */ -LT_SCOPE int lt_dladdsearchdir (const char *search_dir); -LT_SCOPE int lt_dlinsertsearchdir (const char *before, - const char *search_dir); -LT_SCOPE int lt_dlsetsearchpath (const char *search_path); -LT_SCOPE const char *lt_dlgetsearchpath (void); -LT_SCOPE int lt_dlforeachfile ( - const char *search_path, - int (*func) (const char *filename, void *data), - void *data); - -/* Portable libltdl versions of the system dlopen() API. */ -LT_SCOPE lt_dlhandle lt_dlopen (const char *filename); -LT_SCOPE lt_dlhandle lt_dlopenext (const char *filename); -LT_SCOPE void * lt_dlsym (lt_dlhandle handle, const char *name); -LT_SCOPE const char *lt_dlerror (void); -LT_SCOPE int lt_dlclose (lt_dlhandle handle); - -/* Module residency management. */ -LT_SCOPE int lt_dlmakeresident (lt_dlhandle handle); -LT_SCOPE int lt_dlisresident (lt_dlhandle handle); - - - - -/* --- PRELOADED MODULE SUPPORT --- */ - - -/* A preopened symbol. Arrays of this type comprise the exported - symbols for a dlpreopened module. */ -typedef struct { - const char *name; - void *address; -} lt_dlsymlist; - -typedef int lt_dlpreload_callback_func (lt_dlhandle handle); - -LT_SCOPE int lt_dlpreload (const lt_dlsymlist *preloaded); -LT_SCOPE int lt_dlpreload_default (const lt_dlsymlist *preloaded); -LT_SCOPE int lt_dlpreload_open (const char *originator, - lt_dlpreload_callback_func *func); - -#define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols -#define LTDL_SET_PRELOADED_SYMBOLS() LT_STMT_START{ \ - extern const lt_dlsymlist lt_preloaded_symbols[]; \ - lt_dlpreload_default(lt_preloaded_symbols); \ - }LT_STMT_END - - - - -/* --- MODULE INFORMATION --- */ - - -/* Associating user data with loaded modules. */ -typedef void * lt_dlcaller_id; -typedef int lt_dlhandle_interface (lt_dlhandle handle, const char *id_string); - -LT_SCOPE lt_dlcaller_id lt_dlcaller_register (const char *id_string, - lt_dlhandle_interface *iface); -LT_SCOPE void * lt_dlcaller_set_data (lt_dlcaller_id key, - lt_dlhandle handle, void *data); -LT_SCOPE void * lt_dlcaller_get_data (lt_dlcaller_id key, - lt_dlhandle handle); - -/* Read only information pertaining to a loaded module. */ -typedef struct { - char * filename; /* file name */ - char * name; /* module name */ - int ref_count; /* number of times lt_dlopened minus - number of times lt_dlclosed. */ -} lt_dlinfo; - -LT_SCOPE const lt_dlinfo *lt_dlgetinfo (lt_dlhandle handle); -LT_SCOPE lt_dlhandle lt_dlhandle_first (lt_dlcaller_id key); -LT_SCOPE lt_dlhandle lt_dlhandle_next (lt_dlhandle place); -LT_SCOPE lt_dlhandle lt_dlhandle_find (const char *module_name); -LT_SCOPE int lt_dlforeach ( - int (*func) (lt_dlhandle handle, void *data), - void *data); - - - -/* --- BINARY COMPATIBILITY WITH OLD LIBLTDL --- */ - -typedef void lt_dlmutex_lock (void); -typedef void lt_dlmutex_unlock (void); -typedef void lt_dlmutex_seterror (const char *errmsg); -typedef const char *lt_dlmutex_geterror (void); - -LT_SCOPE void * (*lt_dlmalloc) (size_t size); -LT_SCOPE void * (*lt_dlrealloc) (void *ptr, size_t size); -LT_SCOPE void (*lt_dlfree) (void *ptr); - - -LT_SCOPE int lt_dlmutex_register (lt_dlmutex_lock *lock, - lt_dlmutex_unlock *unlock, - lt_dlmutex_seterror *seterror, - lt_dlmutex_geterror *geterror); - -# define lt_ptr void * - - - -/* --- SOURCE COMPATIBILITY WITH ANCIENT LIBLTDL --- */ - - -#if defined(LT_NON_POSIX_NAMESPACE) -# define lt_ptr_t void * -# define lt_module_t lt_module -# define lt_module_open_t lt_module_open -# define lt_module_close_t lt_module_close -# define lt_find_sym_t lt_find_sym -# define lt_dlloader_exit_t lt_dlloader_exit -# define lt_dlloader_t lt_dlloader -# define lt_dlloader_data_t lt_user_data -#endif - -LT_END_C_DECLS - -#endif /*!defined(LTDL_H)*/ Index: libltdl/slist.h =================================================================== RCS file: libltdl/slist.h diff -N libltdl/slist.h --- libltdl/slist.h 3 Oct 2004 13:50:10 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,92 +0,0 @@ -/* slist.h -- generalised singly linked lists - Copyright (C) 2000, 2004 Free Software Foundation, Inc. - Written by Gary V. Vaughan - - NOTE: The canonical source of this file is maintained with the - GNU Libtool package. Report bugs to bug-libtool@gnu.org. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -As a special exception to the GNU Lesser General Public License, -if you distribute this file as part of a program or library that -is built using GNU libtool, you may include it under the same -distribution terms that you use for the rest of that program. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA - -*/ - -/* A generalised list. This is deliberately transparent so that you - can make the NEXT field of all your chained data structures first, - and then cast them to `(SList *)' so that they can be manipulated - by this API. - - Alternatively, you can generate raw SList elements using slist_new(), - and put the element data in the USERDATA field. Either way you - get to manage the memory involved by yourself. -*/ - -#if !defined(SLIST_H) -#define SLIST_H 1 - -#if defined(LTDL) -# include -#else -# define LT_SCOPE -#endif - -#if defined(_cplusplus) -extern "C" { -#endif - -typedef struct slist { - struct slist *next; /* chain forward pointer*/ - const void *userdata; /* for boxed `SList' item */ -} SList; - -typedef void * SListCallback (SList *item, void *userdata); -typedef int SListCompare (const SList *item1, const SList *item2, - void *userdata); - -LT_SCOPE SList *slist_concat (SList *head, SList *tail); -LT_SCOPE SList *slist_cons (SList *item, SList *slist); - -LT_SCOPE SList *slist_delete (SList *slist, void (*delete) (void *item)); -LT_SCOPE void * slist_remove (SList **phead, SListCallback *find, - void *matchdata); -LT_SCOPE SList *slist_reverse (SList *slist); -LT_SCOPE SList *slist_sort (SList *slist, SListCompare *compare, - void *userdata); - -LT_SCOPE SList *slist_tail (SList *slist); -LT_SCOPE SList *slist_nth (SList *slist, size_t n); -LT_SCOPE void * slist_find (SList *slist, SListCallback *find, - void *matchdata); -LT_SCOPE size_t slist_length (SList *slist); - -LT_SCOPE void * slist_foreach (SList *slist, SListCallback *foreach, - void *userdata); - -LT_SCOPE SList *slist_box (const void *userdata); -LT_SCOPE void * slist_unbox (SList *item); - -#if defined(_cplusplus) -} -#endif - -#if !defined(LTDL) -# undef LT_SCOPE -#endif - -#endif /*!defined(SLIST_H)*/ Index: libltdl/libltdl/lt__alloc.h =================================================================== RCS file: libltdl/libltdl/lt__alloc.h diff -N libltdl/libltdl/lt__alloc.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ libltdl/libltdl/lt__alloc.h 23 Nov 2004 12:10:43 -0000 @@ -0,0 +1,57 @@ +/* lt__alloc.h -- internal memory management interface + Copyright (C) 2004 Free Software Foundation, Inc. + Originally by Gary V. Vaughan + + NOTE: The canonical source of this file is maintained with the + GNU Libtool package. Report bugs to bug-libtool@gnu.org. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +As a special exception to the GNU Lesser General Public License, +if you distribute this file as part of a program or library that +is built using GNU libtool, you may include it under the same +distribution terms that you use for the rest of that program. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA + +*/ + +#if !defined(LT__ALLOC_H) +#define LT__ALLOC_H 1 + +#include "lt_system.h" + +LT_BEGIN_C_DECLS + +#define MALLOC(tp, n) (tp*) lt__malloc((n) * sizeof(tp)) +#define REALLOC(tp, mem, n) (tp*) lt__realloc((mem), (n) * sizeof(tp)) +#define FREE(mem) LT_STMT_START { \ + if (mem) (mem) = (free (mem), (void *) 0); } LT_STMT_END +#define MEMREASSIGN(p, q) LT_STMT_START { \ + if ((p) != (q)) { if (p) free (p); (p) = (q); (q) = 0; } \ + } LT_STMT_END + +/* If set, this function is called when memory allocation has failed. */ +LT_SCOPE void (*lt__alloc_die) (void); + +LT_SCOPE void *lt__malloc (size_t n); +LT_SCOPE void *lt__zalloc (size_t n); +LT_SCOPE void *lt__realloc (void *mem, size_t n); +LT_SCOPE void *lt__memdup (void const *mem, size_t n); + +LT_SCOPE char *lt__strdup (const char *string); + +LT_END_C_DECLS + +#endif /*!defined(LT__ALLOC_H)*/ Index: libltdl/libltdl/lt__dirent.h =================================================================== RCS file: libltdl/libltdl/lt__dirent.h diff -N libltdl/libltdl/lt__dirent.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ libltdl/libltdl/lt__dirent.h 23 Nov 2004 12:10:43 -0000 @@ -0,0 +1,97 @@ +/* lt__dirent.h -- internal directory entry scanning interface + Copyright (C) 2001, 2004 Free Software Foundation, Inc. + Originally by Bob Friesenhahn + + NOTE: The canonical source of this file is maintained with the + GNU Libtool package. Report bugs to bug-libtool@gnu.org. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +As a special exception to the GNU Lesser General Public License, +if you distribute this file as part of a program or library that +is built using GNU libtool, you may include it under the same +distribution terms that you use for the rest of that program. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA + +*/ + +#if !defined(LT__DIRENT_H) +#define LT__DIRENT_H 1 + +#if defined(HAVE_CONFIG_H) +# include HAVE_CONFIG_H +#endif + +#include "lt_system.h" + +#if defined(HAVE_CLOSEDIR) && defined(HAVE_OPENDIR) && defined(HAVE_READDIR) && defined(HAVE_DIRENT_H) +/* We have a fully operational dirent subsystem. */ +# include +# define D_NAMLEN(dirent) (strlen((dirent)->d_name)) + +#elif !defined(__WINDOWS__) +/* We are not on windows, so we can get the same functionality from the + `direct' API. */ +# define dirent direct +# define D_NAMLEN(dirent) ((dirent)->d_namlen) +# if defined(HAVE_SYS_NDIR_H) +# include +# endif +# if defined(HAVE_SYS_DIR_H) +# include +# endif +# if defined(HAVE_NDIR_H) +# include +# endif + +#else /* __WINDOWS__ */ +/* Use some wrapper code to emulate dirent on windows.. */ +# define WINDOWS_DIRENT_EMULATION 1 + +# include + +# define D_NAMLEN(dirent) (strlen((dirent)->d_name)) +# define dirent lt__dirent +# define DIR lt__DIR +# define opendir lt__opendir +# define readdir lt__readdir +# define closedir lt__closedir + +LT_BEGIN_C_DECLS + +struct dirent +{ + char d_name[LT_FILENAME_MAX]; + int d_namlen; +}; + +typedef struct +{ + HANDLE hSearch; + WIN32_FIND_DATA Win32FindData; + BOOL firsttime; + struct dirent file_info; +} DIR; + + +LT_SCOPE DIR * opendir (const char *path); +LT_SCOPE struct dirent *readdir (DIR *entry); +LT_SCOPE void closedir (DIR *entry); + +LT_END_C_DECLS + +#endif /*!defined(__WINDOWS__)*/ + +#endif /*!defined(LT__DIRENT_H)*/ Index: libltdl/libltdl/lt__glibc.h =================================================================== RCS file: libltdl/libltdl/lt__glibc.h diff -N libltdl/libltdl/lt__glibc.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ libltdl/libltdl/lt__glibc.h 23 Nov 2004 12:10:43 -0000 @@ -0,0 +1,56 @@ +/* lt__glibc.h -- support for non glibc environments + Copyright (C) 2004 Free Software Foundation, Inc. + Originally by Gary V. Vaughan + + NOTE: The canonical source of this file is maintained with the + GNU Libtool package. Report bugs to bug-libtool@gnu.org. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +As a special exception to the GNU Lesser General Public License, +if you distribute this file as part of a program or library that +is built using GNU libtool, you may include it under the same +distribution terms that you use for the rest of that program. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA + +*/ + +#if !defined(LT__GLIBC_H) +#define LT__GLIBC_H 1 + +#if defined(HAVE_CONFIG_H) +# include HAVE_CONFIG_H +#endif + +#if !defined(HAVE_ARGZ_H) +/* Redefine any glibc symbols we reimplement to import the + implementations into our lt__ namespace so we don't ever + clash with the system library if our clients use argz_* + from there in addition to libltdl. */ +# undef argz_append +# define argz_append lt__argz_append +# undef argz_create_sep +# define argz_create_sep lt__argz_create_sep +# undef argz_insert +# define argz_insert lt__argz_insert +# undef argz_next +# define argz_next lt__argz_next +# undef argz_stringify +# define argz_stringify lt__argz_stringify +#endif + +#include + +#endif /*!defined(LT__GLIBC_H)*/ Index: libltdl/libltdl/lt__private.h =================================================================== RCS file: libltdl/libltdl/lt__private.h diff -N libltdl/libltdl/lt__private.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ libltdl/libltdl/lt__private.h 23 Nov 2004 12:10:43 -0000 @@ -0,0 +1,133 @@ +/* lt__private.h -- internal apis for libltdl + Copyright (C) 2004 Free Software Foundation, Inc. + Originally by Gary V. Vaughan + + NOTE: The canonical source of this file is maintained with the + GNU Libtool package. Report bugs to bug-libtool@gnu.org. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +As a special exception to the GNU Lesser General Public License, +if you distribute this file as part of a program or library that +is built using GNU libtool, you may include it under the same +distribution terms that you use for the rest of that program. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA + +*/ + +#if !defined(LT__PRIVATE_H) +#define LT__PRIVATE_H 1 + +#if defined(HAVE_CONFIG_H) +# include HAVE_CONFIG_H +#endif + +#include +#include +#include +#include + +#if defined(HAVE_UNISTD_H) +# include +#endif + +#if defined(HAVE_STRING_H) +# include +#else +# if defined(HAVE_STRINGS_H) +# include +# endif +#endif +#if defined(HAVE_MEMORY_H) +# include +#endif + +/* Import internal interfaces... */ +#include "lt__alloc.h" +#include "lt__dirent.h" +#include "lt__glibc.h" +#include "slist.h" + +/* ...and all exported interfaces. */ +#include "ltdl.h" + +#if defined(WITH_DMALLOC) +# include +#endif + +#if defined(DLL_EXPORT) +# define LT_GLOBAL_DATA __declspec(dllexport) +#else +# define LT_GLOBAL_DATA +#endif + + +LT_BEGIN_C_DECLS + +#if !defined(errno) +extern int errno; +#endif + +LT_SCOPE void lt__alloc_die_callback (void); + + +/* For readability: */ +#define strneq(s1, s2) (strcmp((s1), (s2)) != 0) +#define streq(s1, s2) (!strcmp((s1), (s2))) + + + +/* --- OPAQUE STRUCTURES DECLARED IN LTDL.H --- */ + +/* This type is used for the array of caller data sets in each handler. */ +typedef struct { + lt_dlcaller_id key; + void * data; +} lt_caller_data; + +typedef struct lt__handle lt__handle; + +struct lt__handle { + lt__handle * next; + const lt_dlvtable * vtable; /* dlopening interface */ + lt_dlinfo info; /* user visible fields */ + int depcount; /* number of dependencies */ + lt_dlhandle * deplibs; /* dependencies */ + lt_module module; /* system module handle */ + void * system; /* system specific data */ + lt_caller_data * caller_data; /* per caller associated data */ + int flags; /* various boolean stats */ +}; + + + +/* --- ERROR HANDLING --- */ + +/* Extract the diagnostic strings from the error table macro in the same + order as the enumerated indices in lt_error.h. */ + +LT_SCOPE const char *lt__error_strings[]; + +#define LT__STRERROR(name) lt__error_strings[LT_CONC(LT_ERROR_,name)] + +#define LT__GETERROR(lvalue) (lvalue) = lt__last_error; +#define LT__SETERRORSTR(errormsg) lt__last_error = (errormsg) +#define LT__SETERROR(errorcode) LT__SETERRORSTR(LT__STRERROR(errorcode)) + +LT_SCOPE const char *lt__last_error; + +LT_END_C_DECLS + +#endif /*!defined(LT__PRIVATE_H)*/ Index: libltdl/libltdl/lt_dlloader.h =================================================================== RCS file: libltdl/libltdl/lt_dlloader.h diff -N libltdl/libltdl/lt_dlloader.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ libltdl/libltdl/lt_dlloader.h 23 Nov 2004 12:10:43 -0000 @@ -0,0 +1,83 @@ +/* lt_dlloader.h -- dynamic library loader interface + Copyright (C) 2004 Free Software Foundation, Inc. + Originally by Gary V. Vaughan + + NOTE: The canonical source of this file is maintained with the + GNU Libtool package. Report bugs to bug-libtool@gnu.org. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +As a special exception to the GNU Lesser General Public License, +if you distribute this file as part of a program or library that +is built using GNU libtool, you may include it under the same +distribution terms that you use for the rest of that program. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA + +*/ + +#if !defined(LT_DLLOADER_H) +#define LT_DLLOADER_H 1 + +#include + +LT_BEGIN_C_DECLS + +typedef void * lt_dlloader; +typedef void * lt_module; +typedef void * lt_user_data; + +/* Function pointer types for module loader vtable entries: */ +typedef lt_module lt_module_open (lt_user_data data, + const char *filename); +typedef int lt_module_close (lt_user_data data, + lt_module module); +typedef void * lt_find_sym (lt_user_data data, lt_module module, + const char *symbolname); +typedef int lt_dlloader_init (lt_user_data data); +typedef int lt_dlloader_exit (lt_user_data data); + +/* Default priority is LT_DLLOADER_PREPEND if none is explicitly given. */ +typedef enum { + LT_DLLOADER_PREPEND = 0, LT_DLLOADER_APPEND +} lt_dlloader_priority; + +/* This structure defines a module loader, as populated by the get_vtable + entry point of each loader. */ +typedef struct { + const char * name; + const char * sym_prefix; + lt_module_open * module_open; + lt_module_close * module_close; + lt_find_sym * find_sym; + lt_dlloader_init * dlloader_init; + lt_dlloader_exit * dlloader_exit; + lt_user_data dlloader_data; + lt_dlloader_priority priority; +} lt_dlvtable; + +LT_SCOPE int lt_dlloader_add (const lt_dlvtable *vtable); +LT_SCOPE lt_dlloader lt_dlloader_next (const lt_dlloader loader); + +LT_SCOPE lt_dlvtable * lt_dlloader_remove (char *name); +LT_SCOPE const lt_dlvtable *lt_dlloader_find (char *name); +LT_SCOPE const lt_dlvtable *lt_dlloader_get (lt_dlloader loader); + + +/* Type of a function to get a loader's vtable: */ +typedef const lt_dlvtable *lt_get_vtable (lt_user_data data); + +LT_END_C_DECLS + +#endif /*!defined(LT_DLLOADER_H)*/ Index: libltdl/libltdl/lt_error.h =================================================================== RCS file: libltdl/libltdl/lt_error.h diff -N libltdl/libltdl/lt_error.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ libltdl/libltdl/lt_error.h 23 Nov 2004 12:10:43 -0000 @@ -0,0 +1,78 @@ +/* lt_error.h -- error propogation interface + Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc. + Originally by Thomas Tanner + + NOTE: The canonical source of this file is maintained with the + GNU Libtool package. Report bugs to bug-libtool@gnu.org. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +As a special exception to the GNU Lesser General Public License, +if you distribute this file as part of a program or library that +is built using GNU libtool, you may include it under the same +distribution terms that you use for the rest of that program. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free +Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA +*/ + +/* Only include this header file once. */ +#if !defined(LT_ERROR_H) +#define LT_ERROR_H 1 + +#include + +LT_BEGIN_C_DECLS + +/* Defining error strings alongside their symbolic names in a macro in + this way allows us to expand the macro in different contexts with + confidence that the enumeration of symbolic names will map correctly + onto the table of error strings. */ +#define lt_dlerror_table \ + LT_ERROR(UNKNOWN, "unknown error") \ + LT_ERROR(DLOPEN_NOT_SUPPORTED, "dlopen support not available") \ + LT_ERROR(INVALID_LOADER, "invalid loader") \ + LT_ERROR(INIT_LOADER, "loader initialization failed") \ + LT_ERROR(REMOVE_LOADER, "loader removal failed") \ + LT_ERROR(FILE_NOT_FOUND, "file not found") \ + LT_ERROR(DEPLIB_NOT_FOUND, "dependency library not found") \ + LT_ERROR(NO_SYMBOLS, "no symbols defined") \ + LT_ERROR(CANNOT_OPEN, "can't open the module") \ + LT_ERROR(CANNOT_CLOSE, "can't close the module") \ + LT_ERROR(SYMBOL_NOT_FOUND, "symbol not found") \ + LT_ERROR(NO_MEMORY, "not enough memory") \ + LT_ERROR(INVALID_HANDLE, "invalid module handle") \ + LT_ERROR(BUFFER_OVERFLOW, "internal buffer overflow") \ + LT_ERROR(INVALID_ERRORCODE, "invalid errorcode") \ + LT_ERROR(SHUTDOWN, "library already shutdown") \ + LT_ERROR(CLOSE_RESIDENT_MODULE, "can't close resident module") \ + LT_ERROR(INVALID_MUTEX_ARGS, "internal error (code withdrawn)") \ + LT_ERROR(INVALID_POSITION, "invalid search path insert position") + +/* Enumerate the symbolic error names. */ +enum { +#define LT_ERROR(name, diagnostic) LT_CONC(LT_ERROR_, name), + lt_dlerror_table +#undef LT_ERROR + + LT_ERROR_MAX +}; + +/* These functions are only useful from inside custom module loaders. */ +LT_SCOPE int lt_dladderror (const char *diagnostic); +LT_SCOPE int lt_dlseterror (int errorcode); + + +LT_END_C_DECLS + +#endif /*!defined(LT_ERROR_H)*/ Index: libltdl/libltdl/lt_system.h =================================================================== RCS file: libltdl/libltdl/lt_system.h diff -N libltdl/libltdl/lt_system.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ libltdl/libltdl/lt_system.h 23 Nov 2004 12:10:43 -0000 @@ -0,0 +1,151 @@ +/* lt_system.h -- system portability abstraction layer + Copyright (C) 2004 Free Software Foundation, Inc. + Originally by Gary V. Vaughan + + NOTE: The canonical source of this file is maintained with the + GNU Libtool package. Report bugs to bug-libtool@gnu.org. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +As a special exception to the GNU Lesser General Public License, +if you distribute this file as part of a program or library that +is built using GNU libtool, you may include it under the same +distribution terms that you use for the rest of that program. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free +Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA +*/ + +#if !defined(LT_SYSTEM_H) +#define LT_SYSTEM_H 1 + +#include +#include +#include + +/* Some systems do not define EXIT_*, even with STDC_HEADERS. */ +#if !defined(EXIT_SUCCESS) +# define EXIT_SUCCESS 0 +#endif +#if !defined(EXIT_FAILURE) +# define EXIT_FAILURE 1 +#endif + +/* Just pick a big number... */ +#define LT_FILENAME_MAX 2048 + + +/* Saves on those hard to debug '\0' typos.... */ +#define LT_EOS_CHAR '\0' + +/* LTDL_BEGIN_C_DECLS should be used at the beginning of your declarations, + so that C++ compilers don't mangle their names. Use LTDL_END_C_DECLS at + the end of C declarations. */ +#if defined(__cplusplus) +# define LT_BEGIN_C_DECLS extern "C" { +# define LT_END_C_DECLS } +#else +# define LT_BEGIN_C_DECLS /* empty */ +# define LT_END_C_DECLS /* empty */ +#endif + +/* LT_STMT_START/END are used to create macros which expand to a + a single compound statement in a portable way. */ +#if defined (__GNUC__) && !defined (__STRICT_ANSI__) && !defined (__cplusplus) +# define LT_STMT_START (void)( +# define LT_STMT_END ) +#else +# if (defined (sun) || defined (__sun__)) +# define LT_STMT_START if (1) +# define LT_STMT_END else (void)0 +# else +# define LT_STMT_START do +# define LT_STMT_END while (0) +# endif +#endif + +/* Canonicalise Windows and Cygwin recognition macros. + To match the values set by recent Cygwin compilers, make sure that if + __CYGWIN__ is defined (after canonicalisation), __WINDOWS__ is NOT! */ +#if defined(__CYGWIN32__) && !defined(__CYGWIN__) +# define __CYGWIN__ __CYGWIN32__ +#endif +#if defined(__CYGWIN__) +# if defined(__WINDOWS__) +# undef __WINDOWS__ +# endif +#elif defined(_WIN32) +# define __WINDOWS__ _WIN32 +#elif defined(WIN32) +# define __WINDOWS__ WIN32 +#endif +#if defined(__CYGWIN__) && defined(__WINDOWS__) +# undef __WINDOWS__ +#endif + + +/* DLL building support on win32 hosts; mostly to workaround their + ridiculous implementation of data symbol exporting. */ +#if !defined(LT_SCOPE) +# if defined(__WINDOWS__) +# if defined(DLL_EXPORT) /* defined by libtool (if required) */ +# define LT_SCOPE __declspec(dllexport) +# endif +# if defined(LIBLTDL_DLL_IMPORT) /* define if linking with this dll */ +# define LT_SCOPE extern __declspec(dllimport) +# endif +# endif +# if !defined(LT_SCOPE) /* static linking or !__WINDOWS__ */ +# define LT_SCOPE extern +# endif +#endif + +#if defined(__WINDOWS__) +/* LT_DIRSEP_CHAR is accepted *in addition* to '/' as a directory + separator when it is set. */ +# define LT_DIRSEP_CHAR '\\' +# define LT_PATHSEP_CHAR ';' +#else +# define LT_PATHSEP_CHAR ':' +#endif + +#if defined(_MSC_VER) /* Visual Studio */ +# define R_OK 4 +#endif + +/* fopen() mode flags for reading a text file */ +#undef LT_READTEXT_MODE +#if defined(__WINDOWS__) || defined(__CYGWIN__) +# define LT_READTEXT_MODE "rt" +#else +# define LT_READTEXT_MODE "r" +#endif + +/* The extra indirection to the LT__STR and LT__CONC macros is required so + that if the arguments to LT_STR() (or LT_CONC()) are themselves macros, + they will be expanded before being quoted. */ +#ifndef LT_STR +# define LT__STR(arg) #arg +# define LT_STR(arg) LT__STR(arg) +#endif + +#ifndef LT_CONC +# define LT__CONC(a, b) a##b +# define LT_CONC(a, b) LT__CONC(a, b) +#endif +#ifndef LT_CONC3 +# define LT__CONC3(a, b, c) a##b##c +# define LT_CONC3(a, b, c) LT__CONC3(a, b, c) +#endif + +#endif /*!defined(LT_SYSTEM_H)*/ Index: libltdl/libltdl/ltdl.h =================================================================== RCS file: libltdl/libltdl/ltdl.h diff -N libltdl/libltdl/ltdl.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ libltdl/libltdl/ltdl.h 23 Nov 2004 12:10:43 -0000 @@ -0,0 +1,174 @@ +/* ltdl.h -- generic dlopen functions + Copyright (C) 1998-2000, 2004 Free Software Foundation, Inc. + Originally by Thomas Tanner + + NOTE: The canonical source of this file is maintained with the + GNU Libtool package. Report bugs to bug-libtool@gnu.org. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +As a special exception to the GNU Lesser General Public License, +if you distribute this file as part of a program or library that +is built using GNU libtool, you may include it under the same +distribution terms that you use for the rest of that program. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free +Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA +*/ + +/* Only include this header file once. */ +#if !defined(LTDL_H) +#define LTDL_H 1 + +#include +#include +#include + +LT_BEGIN_C_DECLS + + +/* LT_STRLEN can be used safely on NULL pointers. */ +#define LT_STRLEN(s) (((s) && (s)[0]) ? strlen (s) : 0) + + + +/* --- DYNAMIC MODULE LOADING API --- */ + + +typedef void * lt_dlhandle; /* A loaded module. */ + +/* Initialisation and finalisation functions for libltdl. */ +LT_SCOPE int lt_dlinit (void); +LT_SCOPE int lt_dlexit (void); + +/* Module search path manipulation. */ +LT_SCOPE int lt_dladdsearchdir (const char *search_dir); +LT_SCOPE int lt_dlinsertsearchdir (const char *before, + const char *search_dir); +LT_SCOPE int lt_dlsetsearchpath (const char *search_path); +LT_SCOPE const char *lt_dlgetsearchpath (void); +LT_SCOPE int lt_dlforeachfile ( + const char *search_path, + int (*func) (const char *filename, void *data), + void *data); + +/* Portable libltdl versions of the system dlopen() API. */ +LT_SCOPE lt_dlhandle lt_dlopen (const char *filename); +LT_SCOPE lt_dlhandle lt_dlopenext (const char *filename); +LT_SCOPE void * lt_dlsym (lt_dlhandle handle, const char *name); +LT_SCOPE const char *lt_dlerror (void); +LT_SCOPE int lt_dlclose (lt_dlhandle handle); + +/* Module residency management. */ +LT_SCOPE int lt_dlmakeresident (lt_dlhandle handle); +LT_SCOPE int lt_dlisresident (lt_dlhandle handle); + + + + +/* --- PRELOADED MODULE SUPPORT --- */ + + +/* A preopened symbol. Arrays of this type comprise the exported + symbols for a dlpreopened module. */ +typedef struct { + const char *name; + void *address; +} lt_dlsymlist; + +typedef int lt_dlpreload_callback_func (lt_dlhandle handle); + +LT_SCOPE int lt_dlpreload (const lt_dlsymlist *preloaded); +LT_SCOPE int lt_dlpreload_default (const lt_dlsymlist *preloaded); +LT_SCOPE int lt_dlpreload_open (const char *originator, + lt_dlpreload_callback_func *func); + +#define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols +#define LTDL_SET_PRELOADED_SYMBOLS() LT_STMT_START{ \ + extern const lt_dlsymlist lt_preloaded_symbols[]; \ + lt_dlpreload_default(lt_preloaded_symbols); \ + }LT_STMT_END + + + + +/* --- MODULE INFORMATION --- */ + + +/* Associating user data with loaded modules. */ +typedef void * lt_dlcaller_id; +typedef int lt_dlhandle_interface (lt_dlhandle handle, const char *id_string); + +LT_SCOPE lt_dlcaller_id lt_dlcaller_register (const char *id_string, + lt_dlhandle_interface *iface); +LT_SCOPE void * lt_dlcaller_set_data (lt_dlcaller_id key, + lt_dlhandle handle, void *data); +LT_SCOPE void * lt_dlcaller_get_data (lt_dlcaller_id key, + lt_dlhandle handle); + +/* Read only information pertaining to a loaded module. */ +typedef struct { + char * filename; /* file name */ + char * name; /* module name */ + int ref_count; /* number of times lt_dlopened minus + number of times lt_dlclosed. */ +} lt_dlinfo; + +LT_SCOPE const lt_dlinfo *lt_dlgetinfo (lt_dlhandle handle); +LT_SCOPE lt_dlhandle lt_dlhandle_first (lt_dlcaller_id key); +LT_SCOPE lt_dlhandle lt_dlhandle_next (lt_dlhandle place); +LT_SCOPE lt_dlhandle lt_dlhandle_find (const char *module_name); +LT_SCOPE int lt_dlforeach ( + int (*func) (lt_dlhandle handle, void *data), + void *data); + + + +/* --- BINARY COMPATIBILITY WITH OLD LIBLTDL --- */ + +typedef void lt_dlmutex_lock (void); +typedef void lt_dlmutex_unlock (void); +typedef void lt_dlmutex_seterror (const char *errmsg); +typedef const char *lt_dlmutex_geterror (void); + +LT_SCOPE void * (*lt_dlmalloc) (size_t size); +LT_SCOPE void * (*lt_dlrealloc) (void *ptr, size_t size); +LT_SCOPE void (*lt_dlfree) (void *ptr); + + +LT_SCOPE int lt_dlmutex_register (lt_dlmutex_lock *lock, + lt_dlmutex_unlock *unlock, + lt_dlmutex_seterror *seterror, + lt_dlmutex_geterror *geterror); + +# define lt_ptr void * + + + +/* --- SOURCE COMPATIBILITY WITH ANCIENT LIBLTDL --- */ + + +#if defined(LT_NON_POSIX_NAMESPACE) +# define lt_ptr_t void * +# define lt_module_t lt_module +# define lt_module_open_t lt_module_open +# define lt_module_close_t lt_module_close +# define lt_find_sym_t lt_find_sym +# define lt_dlloader_exit_t lt_dlloader_exit +# define lt_dlloader_t lt_dlloader +# define lt_dlloader_data_t lt_user_data +#endif + +LT_END_C_DECLS + +#endif /*!defined(LTDL_H)*/ Index: libltdl/libltdl/slist.h =================================================================== RCS file: libltdl/libltdl/slist.h diff -N libltdl/libltdl/slist.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ libltdl/libltdl/slist.h 23 Nov 2004 12:10:43 -0000 @@ -0,0 +1,92 @@ +/* slist.h -- generalised singly linked lists + Copyright (C) 2000, 2004 Free Software Foundation, Inc. + Written by Gary V. Vaughan + + NOTE: The canonical source of this file is maintained with the + GNU Libtool package. Report bugs to bug-libtool@gnu.org. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +As a special exception to the GNU Lesser General Public License, +if you distribute this file as part of a program or library that +is built using GNU libtool, you may include it under the same +distribution terms that you use for the rest of that program. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA + +*/ + +/* A generalised list. This is deliberately transparent so that you + can make the NEXT field of all your chained data structures first, + and then cast them to `(SList *)' so that they can be manipulated + by this API. + + Alternatively, you can generate raw SList elements using slist_new(), + and put the element data in the USERDATA field. Either way you + get to manage the memory involved by yourself. +*/ + +#if !defined(SLIST_H) +#define SLIST_H 1 + +#if defined(LTDL) +# include +#else +# define LT_SCOPE +#endif + +#if defined(_cplusplus) +extern "C" { +#endif + +typedef struct slist { + struct slist *next; /* chain forward pointer*/ + const void *userdata; /* for boxed `SList' item */ +} SList; + +typedef void * SListCallback (SList *item, void *userdata); +typedef int SListCompare (const SList *item1, const SList *item2, + void *userdata); + +LT_SCOPE SList *slist_concat (SList *head, SList *tail); +LT_SCOPE SList *slist_cons (SList *item, SList *slist); + +LT_SCOPE SList *slist_delete (SList *slist, void (*delete) (void *item)); +LT_SCOPE void * slist_remove (SList **phead, SListCallback *find, + void *matchdata); +LT_SCOPE SList *slist_reverse (SList *slist); +LT_SCOPE SList *slist_sort (SList *slist, SListCompare *compare, + void *userdata); + +LT_SCOPE SList *slist_tail (SList *slist); +LT_SCOPE SList *slist_nth (SList *slist, size_t n); +LT_SCOPE void * slist_find (SList *slist, SListCallback *find, + void *matchdata); +LT_SCOPE size_t slist_length (SList *slist); + +LT_SCOPE void * slist_foreach (SList *slist, SListCallback *foreach, + void *userdata); + +LT_SCOPE SList *slist_box (const void *userdata); +LT_SCOPE void * slist_unbox (SList *item); + +#if defined(_cplusplus) +} +#endif + +#if !defined(LTDL) +# undef LT_SCOPE +#endif + +#endif /*!defined(SLIST_H)*/ Index: libltdl/loaders/Makefile.am =================================================================== RCS file: /cvsroot/libtool/libtool/libltdl/loaders/Makefile.am,v retrieving revision 1.4 diff -u -3 -p -u -r1.4 Makefile.am --- libltdl/loaders/Makefile.am 15 Nov 2004 01:03:14 -0000 1.4 +++ libltdl/loaders/Makefile.am 23 Nov 2004 12:10:43 -0000 @@ -24,8 +24,8 @@ EXTRA_DIST = AUTOMAKE_OPTIONS = foreign DEFS = -DHAVE_CONFIG_H="<$(CONFIG_H)>" -DLTDL -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \ - -I.. -I$(srcdir)/.. +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \ + -I.. -I$(srcdir)/.. -I$(srcdir)/../libltdl AM_LDFLAGS = -no-undefined -module -avoid-version -export-dynamic pkgincludedir = $(includedir)/libltdl