autoconf fixes and cleanups (check for dlopen() in libc too).

configure.in

@@ -84,21 +84,21 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl)
 dnl Check for -lw for Solaris
 AC_CHECK_LIB(w,iswalnum)
 dnl Check for -lnsl for Solaris
-AC_CHECK_FUNCS(gethostbyname)
-if test "$ac_cv_func_gethostbyname" = "no"
-then
-    AC_CHECK_LIB(nsl,gethostbyname)
-fi
+AC_CHECK_FUNCS(gethostbyname,,AC_CHECK_LIB(nsl,gethostbyname))
 dnl Check for -lsocket for Solaris
-AC_CHECK_FUNCS(connect)
-if test "$ac_cv_func_connect" = "no"
-then
-    AC_CHECK_LIB(socket,connect)
-fi
+AC_CHECK_FUNCS(connect,,AC_CHECK_LIB(socket,connect))
 dnl Check for -lxpg4 for FreeBSD
 AC_CHECK_LIB(xpg4,setrunelocale)
-dnl Check for -ldl
-AC_CHECK_LIB(dl,dlopen)
+
+AC_CHECK_HEADERS(dlfcn.h,
+	AC_CHECK_FUNCS(dlopen,
+		AC_DEFINE(HAVE_DL_API),
+    		AC_CHECK_LIB(dl,dlopen,
+			AC_DEFINE(HAVE_DL_API)
+			LIBS="$LIBS -ldl"
+		)
+	)
+)
 AC_SUBST(XLIB)
 if test "$have_x" = "yes"
 then
@@ -459,7 +459,6 @@ dnl **** Check for header files ****
 AC_CHECK_HEADERS(\
 	arpa/nameser.h \
 	curses.h \
-	dlfcn.h \
 	elf.h \
 	float.h \
 	libio.h \

include/acconfig.h

@@ -89,3 +89,6 @@
 
 /* Define if Mesa is present on the system or not */
 #undef HAVE_LIBMESAGL
+
+/* Define if the system has dynamic link library support with the dl* API */
+#undef HAVE_DL_API

include/config.h.in

@@ -93,6 +93,9 @@
 /* Define if Mesa is present on the system or not */
 #undef HAVE_LIBMESAGL
 
+/* Define if the system has dynamic link library support with the dl* API */
+#undef HAVE_DL_API
+
 /* The number of bytes in a long long.  */
 #undef SIZEOF_LONG_LONG
 
@@ -105,6 +108,9 @@
 /* Define if you have the connect function.  */
 #undef HAVE_CONNECT
 
+/* Define if you have the dlopen function.  */
+#undef HAVE_DLOPEN
+
 /* Define if you have the gethostbyname function.  */
 #undef HAVE_GETHOSTBYNAME
 
@@ -267,24 +273,15 @@
 /* Define if you have the curses library (-lcurses).  */
 #undef HAVE_LIBCURSES
 
-/* Define if you have the dl library (-ldl).  */
-#undef HAVE_LIBDL
-
 /* Define if you have the i386 library (-li386).  */
 #undef HAVE_LIBI386
 
 /* Define if you have the ncurses library (-lncurses).  */
 #undef HAVE_LIBNCURSES
 
-/* Define if you have the nsl library (-lnsl).  */
-#undef HAVE_LIBNSL
-
 /* Define if you have the ossaudio library (-lossaudio).  */
 #undef HAVE_LIBOSSAUDIO
 
-/* Define if you have the socket library (-lsocket).  */
-#undef HAVE_LIBSOCKET
-
 /* Define if you have the w library (-lw).  */
 #undef HAVE_LIBW
 

include/elfdll.h

@@ -5,7 +5,7 @@ WINE_MODREF *ELFDLL_LoadLibraryExA(LPCSTR libname, DWORD flags, DWORD *err);
 HINSTANCE16 ELFDLL_LoadModule16(LPCSTR libname, BOOL implicit);
 void ELFDLL_UnloadLibrary(WINE_MODREF *wm);
 
-#if defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H)
+#if defined(HAVE_DL_API)
 
 void *ELFDLL_dlopen(const char *libname, int flags);
 extern char *extra_ld_library_path;

loader/elf.c

@@ -92,7 +92,7 @@ WINE_MODREF *ELF_CreateDummyModule( LPCSTR libname, LPCSTR modname )
 }
 
 
-#if defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H)
+#if defined(HAVE_DL_API)
 
 #define UNIX_DLL_ENDING		"so"
 

loader/elfdll.c

@@ -22,7 +22,7 @@
 
 DECLARE_DEBUG_CHANNEL(elfdll)
 
-#if defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H)
+#if defined(HAVE_DL_API)
 #include <dlfcn.h>
 
 /*------------------ HACKS -----------------*/

loader/loadorder.c

@@ -333,7 +333,7 @@ BOOL MODULE_InitLoadOrder(void)
 	char buffer[BUFFERSIZE];
 	int nbuffer;
 
-#if defined(HAVE_LIBDL) && defined(HAVE_DLFCN_H)
+#if defined(HAVE_DL_API)
 	/* Get/set the new LD_LIBRARY_PATH */
 	nbuffer = PROFILE_GetWineIniString("DllDefaults", "EXTRA_LD_LIBRARY_PATH", "", buffer, sizeof(buffer));