configure: Get rid of the no longer used check for libtxc_dxtn.
This commit is contained in:
parent
35d2fd7a25
commit
6a4010294c
|
@ -15491,84 +15491,6 @@ _ACEOF
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: checking for -ltxc_dxtn" >&5
|
|
||||||
echo $ECHO_N "checking for -ltxc_dxtn... $ECHO_C" >&6; }
|
|
||||||
if test "${ac_cv_lib_soname_txc_dxtn+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
ac_check_soname_save_LIBS=$LIBS
|
|
||||||
LIBS="-ltxc_dxtn $LIBS"
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
/* confdefs.h. */
|
|
||||||
_ACEOF
|
|
||||||
cat confdefs.h >>conftest.$ac_ext
|
|
||||||
cat >>conftest.$ac_ext <<_ACEOF
|
|
||||||
/* 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 fetch_2d_texel_rgba_dxt1 ();
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
return fetch_2d_texel_rgba_dxt1 ();
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
||||||
if { (ac_try="$ac_link"
|
|
||||||
case "(($ac_try" in
|
|
||||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
||||||
*) ac_try_echo=$ac_try;;
|
|
||||||
esac
|
|
||||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
||||||
(eval "$ac_link") 2>conftest.er1
|
|
||||||
ac_status=$?
|
|
||||||
grep -v '^ *+' conftest.er1 >conftest.err
|
|
||||||
rm -f conftest.er1
|
|
||||||
cat conftest.err >&5
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); } && {
|
|
||||||
test -z "$ac_c_werror_flag" ||
|
|
||||||
test ! -s conftest.err
|
|
||||||
} && test -s conftest$ac_exeext &&
|
|
||||||
$as_test_x conftest$ac_exeext; then
|
|
||||||
case "$LIBEXT" in
|
|
||||||
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
|
|
||||||
else
|
|
||||||
echo "$as_me: failed program was:" >&5
|
|
||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
|
||||||
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
||||||
conftest$ac_exeext conftest.$ac_ext
|
|
||||||
LIBS=$ac_check_soname_save_LIBS
|
|
||||||
fi
|
|
||||||
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; }
|
|
||||||
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
|
||||||
#define SONAME_LIBTXC_DXTN "$ac_cv_lib_soname_txc_dxtn"
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1150,7 +1150,6 @@ WINE_CHECK_SONAME(Xext,XextCreateExtension,,,[$X_LIBS -lX11 $X_EXTRA_LIBS])
|
||||||
WINE_CHECK_SONAME(Xi,XOpenDevice,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
|
WINE_CHECK_SONAME(Xi,XOpenDevice,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
|
||||||
WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lX11 $X_EXTRA_LIBS])
|
WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lX11 $X_EXTRA_LIBS])
|
||||||
WINE_CHECK_SONAME(freetype,FT_Init_FreeType,,,[$X_LIBS])
|
WINE_CHECK_SONAME(freetype,FT_Init_FreeType,,,[$X_LIBS])
|
||||||
WINE_CHECK_SONAME(txc_dxtn,fetch_2d_texel_rgba_dxt1)
|
|
||||||
|
|
||||||
|
|
||||||
dnl **** Check for functions ****
|
dnl **** Check for functions ****
|
||||||
|
|
|
@ -1002,9 +1002,6 @@
|
||||||
/* Define to the soname of the libssl library. */
|
/* Define to the soname of the libssl library. */
|
||||||
#undef SONAME_LIBSSL
|
#undef SONAME_LIBSSL
|
||||||
|
|
||||||
/* Define to the soname of the libtxc_dxtn library. */
|
|
||||||
#undef SONAME_LIBTXC_DXTN
|
|
||||||
|
|
||||||
/* Define to the soname of the libX11 library. */
|
/* Define to the soname of the libX11 library. */
|
||||||
#undef SONAME_LIBX11
|
#undef SONAME_LIBX11
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue