-AC_CHECK_HEADERS(dlfcn.h, have_dlfcn=yes)
-test -z "$with_shlib" && test ! -z "$have_dlfcn" && { AC_CHECK_LIB(dl, dlopen, [ AC_DEFINE(HAVE_DLOPEN) DLL_LIB=dl; with_shlib=yes]) }
-test -z "$with_shlib" && test ! -z "$have_dlfcn" && { AC_CHECK_LIB(c, _dlopen, [ AC_DEFINE(HAVE_DLOPEN) DLL_LIB=; with_shlib=yes]) }
-test -z "$with_shlib" && test ! -z "$have_dlfcn" && { AC_CHECK_LIB(c, dlopen, [ AC_DEFINE(HAVE_DLOPEN) DLL_LIB=; with_shlib=yes]) }
-test -z "$with_shlib" && { AC_CHECK_LIB(dld, shl_load, [ AC_DEFINE(HAVE_SHL_LOAD) DLL_LIB=dld; with_shlib=yes]) }
-test -z "$with_shlib" && { AC_CHECK_LIB(dld, dld_init, [ AC_DEFINE(HAVE_DLD_INIT) DLL_LIB=dld; with_shlib=yes]) }
-if test "$with_shlib" = "yes"; then
- AC_DEFINE(HAVE_SHLIB)
- XE_ADD_OBJS(sysdll.o)
- XE_ADD_OBJS(dll.o)
- test ! -z "$DLL_LIB" && XE_PREPEND(-l${DLL_LIB}, LIBS)
- XE_MAKE_SHAREDLIB
- AC_CHECK_FUNCS(dlerror)
- ld_dynamic_link_flags=
- dnl Fill this in with other values as this gets more testing
- case "$opsys" in
- hpux*) ld_dynamic_link_flags="-Wl,-E" ;;
- linux*) ld_dynamic_link_flags="-rdynamic" ;;
- *) ;;
- esac
+AC_CHECK_HEADERS(dlfcn.h, [have_dlfcn=yes
+ AC_DEFINE(HAVE_DLFCN_H)])
+test -z "$with_modules" && test ! -z "$have_dlfcn" && { AC_CHECK_LIB(dl, dlopen, [ AC_DEFINE(HAVE_DLOPEN) DLL_LIB=dl; with_modules=yes]) }
+test -z "$with_modules" && test ! -z "$have_dlfcn" && { AC_CHECK_LIB(c, _dlopen, [ AC_DEFINE(HAVE_DLOPEN) DLL_LIB=; with_modules=yes]) }
+test -z "$with_modules" && test ! -z "$have_dlfcn" && { AC_CHECK_LIB(c, dlopen, [ AC_DEFINE(HAVE_DLOPEN) DLL_LIB=; with_modules=yes]) }
+test -z "$with_modules" && { AC_CHECK_LIB(dld, shl_load, [ AC_DEFINE(HAVE_SHL_LOAD) DLL_LIB=dld; with_modules=yes]) }
+test -z "$with_modules" && { AC_CHECK_LIB(dld, dld_init, [ AC_DEFINE(HAVE_DLD_INIT) DLL_LIB=dld; with_modules=yes]) }
+if test "$with_modules" = "yes"; then
+ XE_SHLIB_STUFF
+ if test "$can_build_shared" = "yes"; then
+ AC_DEFINE(HAVE_SHLIB)
+ XE_ADD_OBJS(sysdll.o)
+ XE_ADD_OBJS(emodules.o)
+ XE_APPEND(src, INSTALL_ARCH_DEP_SUBDIR)
+ test ! -z "$DLL_LIB" && XE_PREPEND(-l${DLL_LIB}, LIBS)
+ AC_CHECK_FUNCS(dlerror _dlerror)
+ else
+ AC_MSG_WARN(disabling shared library support)
+ with_modules=no
+ fi