diff --git a/aclocal.m4 b/aclocal.m4
index e139fcde42c..d4aef3c6864 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -35,22 +35,22 @@ dnl
 AC_DEFUN([WINE_GET_SONAME],
 [AC_REQUIRE([WINE_PATH_LDD])dnl
 AS_VAR_PUSHDEF([ac_Lib],[ac_cv_lib_soname_$1])dnl
-AC_CACHE_CHECK([for -l$1 soname], ac_Lib,
+AC_MSG_CHECKING([for -l$1 soname])
+AC_CACHE_VAL(ac_Lib,
 [ac_get_soname_save_LIBS=$LIBS
 LIBS="-l$1 $3 $LIBS"
   AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],
   [case "$LIBEXT" in
-    dylib) AS_VAR_SET(ac_Lib,[`otool -L conftest$ac_exeext | grep lib$1\\.[[0-9A-Za-z.]]*dylib | sed -e "s/^.*\/\(lib$1\.[[0-9A-Za-z.]]*dylib\).*$/\1/"';2,$d'`]) ;;
-    so) AS_VAR_SET(ac_Lib,[`$ac_cv_path_LDD conftest$ac_exeext | grep lib$1\\.so | sed -e "s/^.*\(lib$1\.so[[^	 ]]*\).*$/\1/"';2,$d'`]) ;;
-  esac
-  if test "x$ac_Lib" = "x"
-  then
-     AS_VAR_SET(ac_Lib,"lib$1.$LIBEXT")
-  fi],
-  [AS_VAR_SET(ac_Lib,"lib$1.$LIBEXT")])
-  LIBS=$ac_get_soname_save_LIBS])
-AS_VAR_SET_IF(ac_Lib,[AC_DEFINE_UNQUOTED(AS_TR_CPP(SONAME_LIB$1),["]AS_VAR_GET(ac_Lib)["],
-                        [Define to the soname of the lib$1 library.])])dnl
+    dll) ;;
+    dylib) AS_VAR_SET(ac_Lib,[`otool -L conftest$ac_exeext | grep "lib$1\\.[[0-9A-Za-z.]]*dylib" | sed -e "s/^.*\/\(lib$1\.[[0-9A-Za-z.]]*dylib\).*$/\1/"';2,$d'`]) ;;
+    *) AS_VAR_SET(ac_Lib,[`$ac_cv_path_LDD conftest$ac_exeext | grep "lib$1\\.$LIBEXT" | sed -e "s/^.*\(lib$1\.$LIBEXT[[^	 ]]*\).*$/\1/"';2,$d'`]) ;;
+  esac])
+  LIBS=$ac_get_soname_save_LIBS])dnl
+AS_IF([test "x]AS_VAR_GET(ac_Lib)[" = "x"],
+      [AC_MSG_RESULT([not found])],
+      [AC_MSG_RESULT(AS_VAR_GET(ac_Lib))
+       AC_DEFINE_UNQUOTED(AS_TR_CPP(SONAME_LIB$1),["]AS_VAR_GET(ac_Lib)["],
+                          [Define to the soname of the lib$1 library.])])dnl
 AS_VAR_POPDEF([ac_Lib])])
 
 dnl **** Link C code with an assembly file ****
@@ -148,3 +148,7 @@ dnl Usage: WINE_CONFIG_EXTRA_DIR(dirname)
 dnl
 AC_DEFUN([WINE_CONFIG_EXTRA_DIR],
 [AC_CONFIG_COMMANDS([$1],[test -d "$1" || (AC_MSG_NOTICE([creating $1]) && mkdir "$1")])])
+
+dnl Local Variables:
+dnl compile-command: "autoreconf --warnings=all"
+dnl End:
diff --git a/configure b/configure
index f8f31a5bcef..0cbc031f560 100755
--- a/configure
+++ b/configure
@@ -14130,9 +14130,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-if test "$LIBEXT" = "so" -o "$LIBEXT" = "dylib"
-then
-  # Extract the first word of "ldd", so it can be a program name with args.
+# Extract the first word of "ldd", so it can be a program name with args.
 set dummy ldd; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
@@ -14222,27 +14220,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_X11=`otool -L conftest$ac_exeext | grep libX11\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libX11\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_X11=`$ac_cv_path_LDD conftest$ac_exeext | grep libX11\\.so | sed -e "s/^.*\(libX11\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_X11=`otool -L conftest$ac_exeext | grep "libX11\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libX11\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_X11=`$ac_cv_path_LDD conftest$ac_exeext | grep "libX11\\.$LIBEXT" | sed -e "s/^.*\(libX11\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_X11" = "x"
-  then
-     ac_cv_lib_soname_X11="libX11.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_X11="libX11.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_X11" >&5
+if test "x$ac_cv_lib_soname_X11" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_X11" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_X11" >&6; }
-if test "${ac_cv_lib_soname_X11+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBX11 "$ac_cv_lib_soname_X11"
@@ -14250,7 +14248,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -lXext soname" >&5
+{ echo "$as_me:$LINENO: checking for -lXext soname" >&5
 echo $ECHO_N "checking for -lXext soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_Xext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14298,27 +14296,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_Xext=`otool -L conftest$ac_exeext | grep libXext\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libXext\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_Xext=`$ac_cv_path_LDD conftest$ac_exeext | grep libXext\\.so | sed -e "s/^.*\(libXext\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_Xext=`otool -L conftest$ac_exeext | grep "libXext\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libXext\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_Xext=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXext\\.$LIBEXT" | sed -e "s/^.*\(libXext\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_Xext" = "x"
-  then
-     ac_cv_lib_soname_Xext="libXext.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_Xext="libXext.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xext" >&5
+if test "x$ac_cv_lib_soname_Xext" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xext" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_Xext" >&6; }
-if test "${ac_cv_lib_soname_Xext+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBXEXT "$ac_cv_lib_soname_Xext"
@@ -14326,7 +14324,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -lXi soname" >&5
+{ echo "$as_me:$LINENO: checking for -lXi soname" >&5
 echo $ECHO_N "checking for -lXi soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_Xi+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14374,27 +14372,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_Xi=`otool -L conftest$ac_exeext | grep libXi\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libXi\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_Xi=`$ac_cv_path_LDD conftest$ac_exeext | grep libXi\\.so | sed -e "s/^.*\(libXi\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_Xi=`otool -L conftest$ac_exeext | grep "libXi\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libXi\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_Xi=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXi\\.$LIBEXT" | sed -e "s/^.*\(libXi\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_Xi" = "x"
-  then
-     ac_cv_lib_soname_Xi="libXi.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_Xi="libXi.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xi" >&5
+if test "x$ac_cv_lib_soname_Xi" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xi" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_Xi" >&6; }
-if test "${ac_cv_lib_soname_Xi+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBXI "$ac_cv_lib_soname_Xi"
@@ -14402,7 +14400,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -lXinerama soname" >&5
+{ echo "$as_me:$LINENO: checking for -lXinerama soname" >&5
 echo $ECHO_N "checking for -lXinerama soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_Xinerama+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14450,27 +14448,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_Xinerama=`otool -L conftest$ac_exeext | grep libXinerama\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libXinerama\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_Xinerama=`$ac_cv_path_LDD conftest$ac_exeext | grep libXinerama\\.so | sed -e "s/^.*\(libXinerama\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_Xinerama=`otool -L conftest$ac_exeext | grep "libXinerama\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libXinerama\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_Xinerama=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXinerama\\.$LIBEXT" | sed -e "s/^.*\(libXinerama\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_Xinerama" = "x"
-  then
-     ac_cv_lib_soname_Xinerama="libXinerama.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_Xinerama="libXinerama.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xinerama" >&5
+if test "x$ac_cv_lib_soname_Xinerama" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xinerama" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_Xinerama" >&6; }
-if test "${ac_cv_lib_soname_Xinerama+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBXINERAMA "$ac_cv_lib_soname_Xinerama"
@@ -14478,7 +14476,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -lXrender soname" >&5
+{ echo "$as_me:$LINENO: checking for -lXrender soname" >&5
 echo $ECHO_N "checking for -lXrender soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_Xrender+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14526,27 +14524,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_Xrender=`otool -L conftest$ac_exeext | grep libXrender\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libXrender\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_Xrender=`$ac_cv_path_LDD conftest$ac_exeext | grep libXrender\\.so | sed -e "s/^.*\(libXrender\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_Xrender=`otool -L conftest$ac_exeext | grep "libXrender\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libXrender\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_Xrender=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXrender\\.$LIBEXT" | sed -e "s/^.*\(libXrender\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_Xrender" = "x"
-  then
-     ac_cv_lib_soname_Xrender="libXrender.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_Xrender="libXrender.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xrender" >&5
+if test "x$ac_cv_lib_soname_Xrender" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xrender" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_Xrender" >&6; }
-if test "${ac_cv_lib_soname_Xrender+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBXRENDER "$ac_cv_lib_soname_Xrender"
@@ -14554,7 +14552,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -lXrandr soname" >&5
+{ echo "$as_me:$LINENO: checking for -lXrandr soname" >&5
 echo $ECHO_N "checking for -lXrandr soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_Xrandr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14602,27 +14600,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_Xrandr=`otool -L conftest$ac_exeext | grep libXrandr\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libXrandr\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_Xrandr=`$ac_cv_path_LDD conftest$ac_exeext | grep libXrandr\\.so | sed -e "s/^.*\(libXrandr\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_Xrandr=`otool -L conftest$ac_exeext | grep "libXrandr\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libXrandr\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_Xrandr=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXrandr\\.$LIBEXT" | sed -e "s/^.*\(libXrandr\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_Xrandr" = "x"
-  then
-     ac_cv_lib_soname_Xrandr="libXrandr.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_Xrandr="libXrandr.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xrandr" >&5
+if test "x$ac_cv_lib_soname_Xrandr" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xrandr" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_Xrandr" >&6; }
-if test "${ac_cv_lib_soname_Xrandr+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBXRANDR "$ac_cv_lib_soname_Xrandr"
@@ -14630,7 +14628,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -lXcursor soname" >&5
+{ echo "$as_me:$LINENO: checking for -lXcursor soname" >&5
 echo $ECHO_N "checking for -lXcursor soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_Xcursor+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14678,27 +14676,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_Xcursor=`otool -L conftest$ac_exeext | grep libXcursor\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libXcursor\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_Xcursor=`$ac_cv_path_LDD conftest$ac_exeext | grep libXcursor\\.so | sed -e "s/^.*\(libXcursor\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_Xcursor=`otool -L conftest$ac_exeext | grep "libXcursor\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libXcursor\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_Xcursor=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXcursor\\.$LIBEXT" | sed -e "s/^.*\(libXcursor\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_Xcursor" = "x"
-  then
-     ac_cv_lib_soname_Xcursor="libXcursor.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_Xcursor="libXcursor.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xcursor" >&5
+if test "x$ac_cv_lib_soname_Xcursor" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xcursor" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_Xcursor" >&6; }
-if test "${ac_cv_lib_soname_Xcursor+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBXCURSOR "$ac_cv_lib_soname_Xcursor"
@@ -14706,7 +14704,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -lfreetype soname" >&5
+{ echo "$as_me:$LINENO: checking for -lfreetype soname" >&5
 echo $ECHO_N "checking for -lfreetype soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_freetype+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14754,27 +14752,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_freetype=`otool -L conftest$ac_exeext | grep libfreetype\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libfreetype\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_freetype=`$ac_cv_path_LDD conftest$ac_exeext | grep libfreetype\\.so | sed -e "s/^.*\(libfreetype\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_freetype=`otool -L conftest$ac_exeext | grep "libfreetype\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libfreetype\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_freetype=`$ac_cv_path_LDD conftest$ac_exeext | grep "libfreetype\\.$LIBEXT" | sed -e "s/^.*\(libfreetype\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_freetype" = "x"
-  then
-     ac_cv_lib_soname_freetype="libfreetype.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_freetype="libfreetype.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_freetype" >&5
+if test "x$ac_cv_lib_soname_freetype" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_freetype" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_freetype" >&6; }
-if test "${ac_cv_lib_soname_freetype+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBFREETYPE "$ac_cv_lib_soname_freetype"
@@ -14782,7 +14780,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -lGL soname" >&5
+{ echo "$as_me:$LINENO: checking for -lGL soname" >&5
 echo $ECHO_N "checking for -lGL soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_GL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14830,27 +14828,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_GL=`otool -L conftest$ac_exeext | grep libGL\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libGL\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_GL=`$ac_cv_path_LDD conftest$ac_exeext | grep libGL\\.so | sed -e "s/^.*\(libGL\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_GL=`otool -L conftest$ac_exeext | grep "libGL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libGL\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_GL=`$ac_cv_path_LDD conftest$ac_exeext | grep "libGL\\.$LIBEXT" | sed -e "s/^.*\(libGL\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_GL" = "x"
-  then
-     ac_cv_lib_soname_GL="libGL.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_GL="libGL.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GL" >&5
+if test "x$ac_cv_lib_soname_GL" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GL" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_GL" >&6; }
-if test "${ac_cv_lib_soname_GL+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBGL "$ac_cv_lib_soname_GL"
@@ -14858,7 +14856,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -lhal soname" >&5
+{ echo "$as_me:$LINENO: checking for -lhal soname" >&5
 echo $ECHO_N "checking for -lhal soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_hal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14906,27 +14904,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_hal=`otool -L conftest$ac_exeext | grep libhal\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libhal\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_hal=`$ac_cv_path_LDD conftest$ac_exeext | grep libhal\\.so | sed -e "s/^.*\(libhal\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_hal=`otool -L conftest$ac_exeext | grep "libhal\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libhal\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_hal=`$ac_cv_path_LDD conftest$ac_exeext | grep "libhal\\.$LIBEXT" | sed -e "s/^.*\(libhal\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_hal" = "x"
-  then
-     ac_cv_lib_soname_hal="libhal.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_hal="libhal.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_hal" >&5
+if test "x$ac_cv_lib_soname_hal" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_hal" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_hal" >&6; }
-if test "${ac_cv_lib_soname_hal+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBHAL "$ac_cv_lib_soname_hal"
@@ -14934,7 +14932,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -ltxc_dxtn soname" >&5
+{ echo "$as_me:$LINENO: checking for -ltxc_dxtn soname" >&5
 echo $ECHO_N "checking for -ltxc_dxtn soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_txc_dxtn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14982,27 +14980,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_txc_dxtn=`otool -L conftest$ac_exeext | grep libtxc_dxtn\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libtxc_dxtn\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_txc_dxtn=`$ac_cv_path_LDD conftest$ac_exeext | grep libtxc_dxtn\\.so | sed -e "s/^.*\(libtxc_dxtn\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_txc_dxtn=`otool -L conftest$ac_exeext | grep "libtxc_dxtn\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libtxc_dxtn\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_txc_dxtn=`$ac_cv_path_LDD conftest$ac_exeext | grep "libtxc_dxtn\\.$LIBEXT" | sed -e "s/^.*\(libtxc_dxtn\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_txc_dxtn" = "x"
-  then
-     ac_cv_lib_soname_txc_dxtn="libtxc_dxtn.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_txc_dxtn="libtxc_dxtn.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_txc_dxtn" >&5
+if test "x$ac_cv_lib_soname_txc_dxtn" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_txc_dxtn" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_txc_dxtn" >&6; }
-if test "${ac_cv_lib_soname_txc_dxtn+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBTXC_DXTN "$ac_cv_lib_soname_txc_dxtn"
@@ -15010,7 +15008,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -lcups soname" >&5
+{ echo "$as_me:$LINENO: checking for -lcups soname" >&5
 echo $ECHO_N "checking for -lcups soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_cups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15058,27 +15056,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_cups=`otool -L conftest$ac_exeext | grep libcups\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libcups\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_cups=`$ac_cv_path_LDD conftest$ac_exeext | grep libcups\\.so | sed -e "s/^.*\(libcups\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_cups=`otool -L conftest$ac_exeext | grep "libcups\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libcups\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_cups=`$ac_cv_path_LDD conftest$ac_exeext | grep "libcups\\.$LIBEXT" | sed -e "s/^.*\(libcups\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_cups" = "x"
-  then
-     ac_cv_lib_soname_cups="libcups.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_cups="libcups.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_cups" >&5
+if test "x$ac_cv_lib_soname_cups" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_cups" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_cups" >&6; }
-if test "${ac_cv_lib_soname_cups+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBCUPS "$ac_cv_lib_soname_cups"
@@ -15086,7 +15084,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -ljack soname" >&5
+{ echo "$as_me:$LINENO: checking for -ljack soname" >&5
 echo $ECHO_N "checking for -ljack soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_jack+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15134,27 +15132,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_jack=`otool -L conftest$ac_exeext | grep libjack\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libjack\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_jack=`$ac_cv_path_LDD conftest$ac_exeext | grep libjack\\.so | sed -e "s/^.*\(libjack\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_jack=`otool -L conftest$ac_exeext | grep "libjack\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libjack\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_jack=`$ac_cv_path_LDD conftest$ac_exeext | grep "libjack\\.$LIBEXT" | sed -e "s/^.*\(libjack\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_jack" = "x"
-  then
-     ac_cv_lib_soname_jack="libjack.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_jack="libjack.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_jack" >&5
+if test "x$ac_cv_lib_soname_jack" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_jack" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_jack" >&6; }
-if test "${ac_cv_lib_soname_jack+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBJACK "$ac_cv_lib_soname_jack"
@@ -15162,7 +15160,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -lfontconfig soname" >&5
+{ echo "$as_me:$LINENO: checking for -lfontconfig soname" >&5
 echo $ECHO_N "checking for -lfontconfig soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_fontconfig+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15210,27 +15208,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_fontconfig=`otool -L conftest$ac_exeext | grep libfontconfig\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libfontconfig\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_fontconfig=`$ac_cv_path_LDD conftest$ac_exeext | grep libfontconfig\\.so | sed -e "s/^.*\(libfontconfig\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_fontconfig=`otool -L conftest$ac_exeext | grep "libfontconfig\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libfontconfig\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_fontconfig=`$ac_cv_path_LDD conftest$ac_exeext | grep "libfontconfig\\.$LIBEXT" | sed -e "s/^.*\(libfontconfig\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_fontconfig" = "x"
-  then
-     ac_cv_lib_soname_fontconfig="libfontconfig.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_fontconfig="libfontconfig.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_fontconfig" >&5
+if test "x$ac_cv_lib_soname_fontconfig" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_fontconfig" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_fontconfig" >&6; }
-if test "${ac_cv_lib_soname_fontconfig+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBFONTCONFIG "$ac_cv_lib_soname_fontconfig"
@@ -15238,7 +15236,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -lssl soname" >&5
+{ echo "$as_me:$LINENO: checking for -lssl soname" >&5
 echo $ECHO_N "checking for -lssl soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_ssl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15286,27 +15284,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_ssl=`otool -L conftest$ac_exeext | grep libssl\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libssl\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_ssl=`$ac_cv_path_LDD conftest$ac_exeext | grep libssl\\.so | sed -e "s/^.*\(libssl\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_ssl=`otool -L conftest$ac_exeext | grep "libssl\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libssl\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_ssl=`$ac_cv_path_LDD conftest$ac_exeext | grep "libssl\\.$LIBEXT" | sed -e "s/^.*\(libssl\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_ssl" = "x"
-  then
-     ac_cv_lib_soname_ssl="libssl.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_ssl="libssl.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_ssl" >&5
+if test "x$ac_cv_lib_soname_ssl" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_ssl" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_ssl" >&6; }
-if test "${ac_cv_lib_soname_ssl+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBSSL "$ac_cv_lib_soname_ssl"
@@ -15314,7 +15312,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -lcrypto soname" >&5
+{ echo "$as_me:$LINENO: checking for -lcrypto soname" >&5
 echo $ECHO_N "checking for -lcrypto soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_crypto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15362,27 +15360,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_crypto=`otool -L conftest$ac_exeext | grep libcrypto\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libcrypto\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_crypto=`$ac_cv_path_LDD conftest$ac_exeext | grep libcrypto\\.so | sed -e "s/^.*\(libcrypto\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_crypto=`otool -L conftest$ac_exeext | grep "libcrypto\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libcrypto\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_crypto=`$ac_cv_path_LDD conftest$ac_exeext | grep "libcrypto\\.$LIBEXT" | sed -e "s/^.*\(libcrypto\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_crypto" = "x"
-  then
-     ac_cv_lib_soname_crypto="libcrypto.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_crypto="libcrypto.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_crypto" >&5
+if test "x$ac_cv_lib_soname_crypto" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_crypto" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_crypto" >&6; }
-if test "${ac_cv_lib_soname_crypto+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBCRYPTO "$ac_cv_lib_soname_crypto"
@@ -15390,7 +15388,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -lncurses soname" >&5
+{ echo "$as_me:$LINENO: checking for -lncurses soname" >&5
 echo $ECHO_N "checking for -lncurses soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_ncurses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15438,27 +15436,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_ncurses=`otool -L conftest$ac_exeext | grep libncurses\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libncurses\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_ncurses=`$ac_cv_path_LDD conftest$ac_exeext | grep libncurses\\.so | sed -e "s/^.*\(libncurses\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_ncurses=`otool -L conftest$ac_exeext | grep "libncurses\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libncurses\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_ncurses=`$ac_cv_path_LDD conftest$ac_exeext | grep "libncurses\\.$LIBEXT" | sed -e "s/^.*\(libncurses\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_ncurses" = "x"
-  then
-     ac_cv_lib_soname_ncurses="libncurses.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_ncurses="libncurses.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_ncurses" >&5
+if test "x$ac_cv_lib_soname_ncurses" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_ncurses" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_ncurses" >&6; }
-if test "${ac_cv_lib_soname_ncurses+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBNCURSES "$ac_cv_lib_soname_ncurses"
@@ -15466,7 +15464,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -lcurses soname" >&5
+{ echo "$as_me:$LINENO: checking for -lcurses soname" >&5
 echo $ECHO_N "checking for -lcurses soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15514,27 +15512,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_curses=`otool -L conftest$ac_exeext | grep libcurses\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libcurses\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_curses=`$ac_cv_path_LDD conftest$ac_exeext | grep libcurses\\.so | sed -e "s/^.*\(libcurses\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_curses=`otool -L conftest$ac_exeext | grep "libcurses\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libcurses\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_curses=`$ac_cv_path_LDD conftest$ac_exeext | grep "libcurses\\.$LIBEXT" | sed -e "s/^.*\(libcurses\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_curses" = "x"
-  then
-     ac_cv_lib_soname_curses="libcurses.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_curses="libcurses.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_curses" >&5
+if test "x$ac_cv_lib_soname_curses" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_curses" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_curses" >&6; }
-if test "${ac_cv_lib_soname_curses+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBCURSES "$ac_cv_lib_soname_curses"
@@ -15542,7 +15540,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -ljpeg soname" >&5
+{ echo "$as_me:$LINENO: checking for -ljpeg soname" >&5
 echo $ECHO_N "checking for -ljpeg soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_jpeg+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15590,27 +15588,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_jpeg=`otool -L conftest$ac_exeext | grep libjpeg\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libjpeg\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_jpeg=`$ac_cv_path_LDD conftest$ac_exeext | grep libjpeg\\.so | sed -e "s/^.*\(libjpeg\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_jpeg=`otool -L conftest$ac_exeext | grep "libjpeg\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libjpeg\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_jpeg=`$ac_cv_path_LDD conftest$ac_exeext | grep "libjpeg\\.$LIBEXT" | sed -e "s/^.*\(libjpeg\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_jpeg" = "x"
-  then
-     ac_cv_lib_soname_jpeg="libjpeg.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_jpeg="libjpeg.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_jpeg" >&5
+if test "x$ac_cv_lib_soname_jpeg" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_jpeg" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_jpeg" >&6; }
-if test "${ac_cv_lib_soname_jpeg+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBJPEG "$ac_cv_lib_soname_jpeg"
@@ -15618,7 +15616,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -lcapi20 soname" >&5
+{ echo "$as_me:$LINENO: checking for -lcapi20 soname" >&5
 echo $ECHO_N "checking for -lcapi20 soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_capi20+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15666,27 +15664,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_capi20=`otool -L conftest$ac_exeext | grep libcapi20\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libcapi20\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_capi20=`$ac_cv_path_LDD conftest$ac_exeext | grep libcapi20\\.so | sed -e "s/^.*\(libcapi20\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_capi20=`otool -L conftest$ac_exeext | grep "libcapi20\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libcapi20\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_capi20=`$ac_cv_path_LDD conftest$ac_exeext | grep "libcapi20\\.$LIBEXT" | sed -e "s/^.*\(libcapi20\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_capi20" = "x"
-  then
-     ac_cv_lib_soname_capi20="libcapi20.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_capi20="libcapi20.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_capi20" >&5
+if test "x$ac_cv_lib_soname_capi20" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_capi20" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_capi20" >&6; }
-if test "${ac_cv_lib_soname_capi20+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBCAPI20 "$ac_cv_lib_soname_capi20"
@@ -15694,7 +15692,7 @@ _ACEOF
 
 fi
 
-  { echo "$as_me:$LINENO: checking for -lsane soname" >&5
+{ echo "$as_me:$LINENO: checking for -lsane soname" >&5
 echo $ECHO_N "checking for -lsane soname... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_sane+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15742,27 +15740,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
-    dylib) ac_cv_lib_soname_sane=`otool -L conftest$ac_exeext | grep libsane\\.[0-9A-Za-z.]*dylib | sed -e "s/^.*\/\(libsane\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    so) ac_cv_lib_soname_sane=`$ac_cv_path_LDD conftest$ac_exeext | grep libsane\\.so | sed -e "s/^.*\(libsane\.so[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dll) ;;
+    dylib) ac_cv_lib_soname_sane=`otool -L conftest$ac_exeext | grep "libsane\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libsane\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_sane=`$ac_cv_path_LDD conftest$ac_exeext | grep "libsane\\.$LIBEXT" | sed -e "s/^.*\(libsane\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
-  if test "x$ac_cv_lib_soname_sane" = "x"
-  then
-     ac_cv_lib_soname_sane="libsane.$LIBEXT"
-  fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_soname_sane="libsane.$LIBEXT"
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$ac_get_soname_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_sane" >&5
+if test "x$ac_cv_lib_soname_sane" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_sane" >&5
 echo "${ECHO_T}$ac_cv_lib_soname_sane" >&6; }
-if test "${ac_cv_lib_soname_sane+set}" = set; then
 
 cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBSANE "$ac_cv_lib_soname_sane"
@@ -15770,7 +15768,6 @@ _ACEOF
 
 fi
 
-fi
 
 
 
diff --git a/configure.ac b/configure.ac
index 6f1fcc395c6..c15b12f798a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1096,30 +1096,27 @@ dnl **** Get the soname for libraries that we load dynamically ****
 
 AC_DEFINE_UNQUOTED(SONAME_EXT,[".$LIBEXT"],[Define to the file extension of shared libraries.])
 
-if test "$LIBEXT" = "so" -o "$LIBEXT" = "dylib"
-then
-  WINE_GET_SONAME(X11,XCreateWindow,[$X_LIBS $X_EXTRA_LIBS])
-  WINE_GET_SONAME(Xext,XextCreateExtension,[$X_LIBS -lX11 $X_EXTRA_LIBS])
-  WINE_GET_SONAME(Xi,XOpenDevice,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
-  WINE_GET_SONAME(Xinerama,XineramaQueryScreens,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
-  WINE_GET_SONAME(Xrender,XRenderQueryExtension,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
-  WINE_GET_SONAME(Xrandr,XRRQueryExtension,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
-  WINE_GET_SONAME(Xcursor,XcursorImageLoadCursor,[$X_LIBS -lX11 $X_EXTRA_LIBS])
-  WINE_GET_SONAME(freetype,FT_Init_FreeType,[$X_LIBS])
-  WINE_GET_SONAME(GL,glXQueryExtension,[$X_LIBS $X_EXTRA_LIBS])
-  WINE_GET_SONAME(hal,libhal_ctx_new)
-  WINE_GET_SONAME(txc_dxtn,fetch_2d_texel_rgba_dxt1)
-  WINE_GET_SONAME(cups,cupsGetDefault)
-  WINE_GET_SONAME(jack,jack_client_new)
-  WINE_GET_SONAME(fontconfig,FcInit)
-  WINE_GET_SONAME(ssl,SSL_library_init)
-  WINE_GET_SONAME(crypto,BIO_new_socket)
-  WINE_GET_SONAME(ncurses,waddch)
-  WINE_GET_SONAME(curses,waddch)
-  WINE_GET_SONAME(jpeg,jpeg_start_decompress)
-  WINE_GET_SONAME(capi20,capi20_isinstalled)
-  WINE_GET_SONAME(sane,sane_init)
-fi
+WINE_GET_SONAME(X11,XCreateWindow,[$X_LIBS $X_EXTRA_LIBS])
+WINE_GET_SONAME(Xext,XextCreateExtension,[$X_LIBS -lX11 $X_EXTRA_LIBS])
+WINE_GET_SONAME(Xi,XOpenDevice,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
+WINE_GET_SONAME(Xinerama,XineramaQueryScreens,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
+WINE_GET_SONAME(Xrender,XRenderQueryExtension,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
+WINE_GET_SONAME(Xrandr,XRRQueryExtension,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
+WINE_GET_SONAME(Xcursor,XcursorImageLoadCursor,[$X_LIBS -lX11 $X_EXTRA_LIBS])
+WINE_GET_SONAME(freetype,FT_Init_FreeType,[$X_LIBS])
+WINE_GET_SONAME(GL,glXQueryExtension,[$X_LIBS $X_EXTRA_LIBS])
+WINE_GET_SONAME(hal,libhal_ctx_new)
+WINE_GET_SONAME(txc_dxtn,fetch_2d_texel_rgba_dxt1)
+WINE_GET_SONAME(cups,cupsGetDefault)
+WINE_GET_SONAME(jack,jack_client_new)
+WINE_GET_SONAME(fontconfig,FcInit)
+WINE_GET_SONAME(ssl,SSL_library_init)
+WINE_GET_SONAME(crypto,BIO_new_socket)
+WINE_GET_SONAME(ncurses,waddch)
+WINE_GET_SONAME(curses,waddch)
+WINE_GET_SONAME(jpeg,jpeg_start_decompress)
+WINE_GET_SONAME(capi20,capi20_isinstalled)
+WINE_GET_SONAME(sane,sane_init)
 
 
 dnl **** Check for functions ****
diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c
index 41968134925..e59c9783d37 100644
--- a/dlls/gphoto2.ds/ds_image.c
+++ b/dlls/gphoto2.ds/ds_image.c
@@ -47,6 +47,10 @@ MAKE_FUNCPTR(jpeg_finish_decompress);
 MAKE_FUNCPTR(jpeg_destroy_decompress);
 #undef MAKE_FUNCPTR
 
+#ifndef SONAME_LIBJPEG
+#define SONAME_LIBJPEG "libjpeg" SONAME_EXT
+#endif
+
 static void *load_libjpeg(void)
 {
     if((libjpeg_handle = wine_dlopen(SONAME_LIBJPEG, RTLD_NOW, NULL, 0)) != NULL) {
diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c
index db39407eb74..be04c212577 100644
--- a/dlls/winex11.drv/xinerama.c
+++ b/dlls/winex11.drv/xinerama.c
@@ -73,6 +73,10 @@ static inline int monitor_to_index( HMONITOR handle )
 MAKE_FUNCPTR(XineramaQueryExtension);
 MAKE_FUNCPTR(XineramaQueryScreens);
 
+#ifndef SONAME_LIBXINERAMA
+#define SONAME_LIBXINERAMA "libXinerama" SONAME_EXT
+#endif
+
 static void load_xinerama(void)
 {
     void *handle;
diff --git a/programs/explorer/hal.c b/programs/explorer/hal.c
index 7cd1a1dbe45..47c6708675f 100644
--- a/programs/explorer/hal.c
+++ b/programs/explorer/hal.c
@@ -75,6 +75,10 @@ DBUS_FUNCS;
 HAL_FUNCS;
 #undef DO_FUNC
 
+#ifndef SONAME_LIBHAL
+#define SONAME_LIBHAL "libhal" SONAME_EXT
+#endif
+
 static BOOL load_functions(void)
 {
     void *hal_handle;
diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c
index 30ae89a33dc..49247d55531 100644
--- a/programs/wineconsole/curses.c
+++ b/programs/wineconsole/curses.c
@@ -64,8 +64,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(curses);
 
 #ifdef HAVE_NCURSES_H
 # define CURSES_NAME "ncurses"
+# ifndef SONAME_LIBNCURSES
+# define SONAME_LIBNCURSES "libncurses" SONAME_EXT
+# endif
 #else
 # define CURSES_NAME "curses"
+# ifndef SONAME_LIBCURSES
+# define SONAME_LIBCURSES "libcurses" SONAME_EXT
+# endif
 #endif
 
 struct inner_data_curse