diff --git a/Makefile.in b/Makefile.in index 0d109b6..3576143 100644 --- a/Makefile.in +++ b/Makefile.in @@ -163,8 +163,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/ac/ar-lib \ $(top_srcdir)/ac/compile $(top_srcdir)/ac/config.guess \ $(top_srcdir)/ac/config.sub $(top_srcdir)/ac/install-sh \ $(top_srcdir)/ac/ltmain.sh $(top_srcdir)/ac/missing ac/ar-lib \ - ac/compile ac/config.guess ac/config.sub ac/depcomp \ - ac/install-sh ac/ltmain.sh ac/missing + ac/compile ac/config.guess ac/config.sub ac/install-sh \ + ac/ltmain.sh ac/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -229,6 +229,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ diff --git a/configure b/configure index ab455bc..79f9112 100755 --- a/configure +++ b/configure @@ -657,6 +657,7 @@ PACKAGE_VERSION_MINOR PACKAGE_VERSION_MAJOR QUADMATH_LIBS UNICOWS_LIBS +DL_LIBS LIBM WIN32_FALSE WIN32_TRUE @@ -17587,6 +17588,65 @@ fi done +save_LIBS="$LIBS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 +$as_echo_n "checking for library containing dlopen... " >&6; } +if ${ac_cv_search_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +for ac_lib in '' dl dld; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_dlopen=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_dlopen+:} false; then : + break +fi +done +if ${ac_cv_search_dlopen+:} false; then : + +else + ac_cv_search_dlopen=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 +$as_echo "$ac_cv_search_dlopen" >&6; } +ac_res=$ac_cv_search_dlopen +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + DL_LIBS="$ac_cv_search_dlopen" +fi + +LIBS="$save_LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lunicows" >&5 $as_echo_n "checking for main in -lunicows... " >&6; } diff --git a/lib/Makefile.am b/lib/Makefile.am index 1dd4551..d6034d5 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -15,12 +15,12 @@ CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined LIBADD_LIB_COMMON = $(LIBM) -if ENABLE_LIBLTDL -CPPFLAGS_LIB_COMMON += $(LTDLINCL) -LIBADD_LIB_COMMON += $(LIBLTDL) -else +#if ENABLE_LIBLTDL +#CPPFLAGS_LIB_COMMON += $(LTDLINCL) +#LIBADD_LIB_COMMON += $(LIBLTDL) +#else LIBADD_LIB_COMMON += $(DL_LIBS) -endif +#endif pkgincludedir = $(includedir) pkglibdir = $(libdir) diff --git a/lib/Makefile.in b/lib/Makefile.in index a93e4f9..bc91e4c 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -135,7 +135,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(pkgincludedir)" LTLIBRARIES = $(pkglib_LTLIBRARIES) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libhcl_la_DEPENDENCIES = $(am__DEPENDENCIES_2) am_libhcl_la_OBJECTS = libhcl_la-bigint.lo libhcl_la-comp.lo \ libhcl_la-debug.lo libhcl_la-decode.lo libhcl_la-dic.lo \ @@ -223,6 +223,7 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/hcl-cfg.h.in \ $(top_srcdir)/ac/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +#endif pkgincludedir = $(includedir) pkglibdir = $(libdir) ACLOCAL = @ACLOCAL@ @@ -247,6 +248,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -381,7 +383,12 @@ LDFLAGS_ALL_COMMON = -L$(abs_builddir) -L$(libdir) ################################################## CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined -LIBADD_LIB_COMMON = $(LIBM) + +#if ENABLE_LIBLTDL +#CPPFLAGS_LIB_COMMON += $(LTDLINCL) +#LIBADD_LIB_COMMON += $(LIBLTDL) +#else +LIBADD_LIB_COMMON = $(LIBM) $(DL_LIBS) pkginclude_HEADERS = \ hcl-cfg.h \ hcl-cmn.h \