From 47f021c4ed5d8d50f7963a94ecac24afa84b1c5c Mon Sep 17 00:00:00 2001 From: Todd Vierling Date: Sat, 26 Jul 2003 20:27:47 +0000 Subject: [PATCH] Make WINE_GET_SONAME work on NetBSD. --- aclocal.m4 | 2 +- configure | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 7ecaee59f34..3c25181768c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -38,7 +38,7 @@ AC_CACHE_CHECK([for -l$1 soname], ac_cv_lib_soname_$1, [ac_get_soname_save_LIBS=$LIBS LIBS="-l$1 $3 $LIBS" AC_LINK_IFELSE([AC_LANG_CALL([], [$2])], - [ac_cv_lib_soname_$1=`$ac_cv_path_LDD conftest$ac_exeext | grep lib$1\\.so | sed 's/^[[ ]]*\([[^ ]]*\)[[ ]]*=>.*$/\1/'` + [ac_cv_lib_soname_$1=`$ac_cv_path_LDD conftest$ac_exeext | grep lib$1\\.so | sed 's/^.*\(lib$1\.so[[^ ]]*\).*$/\1/'` if test "x$ac_cv_lib_soname_$1" = "x" then ac_cv_lib_soname_$1="lib$1.so" diff --git a/configure b/configure index d3bb9532256..8c706cbc1e1 100755 --- a/configure +++ b/configure @@ -12451,7 +12451,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_soname_X11=`$ac_cv_path_LDD conftest$ac_exeext | grep libX11\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'` + ac_cv_lib_soname_X11=`$ac_cv_path_LDD conftest$ac_exeext | grep libX11\\.so | sed 's/^.*\(libX11\.so[^ ]*\).*$/\1/'` if test "x$ac_cv_lib_soname_X11" = "x" then ac_cv_lib_soname_X11="libX11.so" @@ -12516,7 +12516,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_soname_Xext=`$ac_cv_path_LDD conftest$ac_exeext | grep libXext\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'` + ac_cv_lib_soname_Xext=`$ac_cv_path_LDD conftest$ac_exeext | grep libXext\\.so | sed 's/^.*\(libXext\.so[^ ]*\).*$/\1/'` if test "x$ac_cv_lib_soname_Xext" = "x" then ac_cv_lib_soname_Xext="libXext.so" @@ -12581,7 +12581,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_soname_Xrender=`$ac_cv_path_LDD conftest$ac_exeext | grep libXrender\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'` + ac_cv_lib_soname_Xrender=`$ac_cv_path_LDD conftest$ac_exeext | grep libXrender\\.so | sed 's/^.*\(libXrender\.so[^ ]*\).*$/\1/'` if test "x$ac_cv_lib_soname_Xrender" = "x" then ac_cv_lib_soname_Xrender="libXrender.so" @@ -12646,7 +12646,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_soname_freetype=`$ac_cv_path_LDD conftest$ac_exeext | grep libfreetype\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'` + ac_cv_lib_soname_freetype=`$ac_cv_path_LDD conftest$ac_exeext | grep libfreetype\\.so | sed 's/^.*\(libfreetype\.so[^ ]*\).*$/\1/'` if test "x$ac_cv_lib_soname_freetype" = "x" then ac_cv_lib_soname_freetype="libfreetype.so" @@ -12711,7 +12711,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_soname_GL=`$ac_cv_path_LDD conftest$ac_exeext | grep libGL\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'` + ac_cv_lib_soname_GL=`$ac_cv_path_LDD conftest$ac_exeext | grep libGL\\.so | sed 's/^.*\(libGL\.so[^ ]*\).*$/\1/'` if test "x$ac_cv_lib_soname_GL" = "x" then ac_cv_lib_soname_GL="libGL.so" @@ -12776,7 +12776,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_soname_cups=`$ac_cv_path_LDD conftest$ac_exeext | grep libcups\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'` + ac_cv_lib_soname_cups=`$ac_cv_path_LDD conftest$ac_exeext | grep libcups\\.so | sed 's/^.*\(libcups\.so[^ ]*\).*$/\1/'` if test "x$ac_cv_lib_soname_cups" = "x" then ac_cv_lib_soname_cups="libcups.so" @@ -12841,7 +12841,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_soname_jack=`$ac_cv_path_LDD conftest$ac_exeext | grep libjack\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'` + ac_cv_lib_soname_jack=`$ac_cv_path_LDD conftest$ac_exeext | grep libjack\\.so | sed 's/^.*\(libjack\.so[^ ]*\).*$/\1/'` if test "x$ac_cv_lib_soname_jack" = "x" then ac_cv_lib_soname_jack="libjack.so" @@ -12906,7 +12906,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_soname_ssl=`$ac_cv_path_LDD conftest$ac_exeext | grep libssl\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'` + ac_cv_lib_soname_ssl=`$ac_cv_path_LDD conftest$ac_exeext | grep libssl\\.so | sed 's/^.*\(libssl\.so[^ ]*\).*$/\1/'` if test "x$ac_cv_lib_soname_ssl" = "x" then ac_cv_lib_soname_ssl="libssl.so" @@ -12971,7 +12971,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_soname_crypto=`$ac_cv_path_LDD conftest$ac_exeext | grep libcrypto\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'` + ac_cv_lib_soname_crypto=`$ac_cv_path_LDD conftest$ac_exeext | grep libcrypto\\.so | sed 's/^.*\(libcrypto\.so[^ ]*\).*$/\1/'` if test "x$ac_cv_lib_soname_crypto" = "x" then ac_cv_lib_soname_crypto="libcrypto.so"