Removed check for -lm, winegcc takes care of that.
This commit is contained in:
parent
4cf091ab09
commit
b400edb0e7
|
@ -5727,79 +5727,6 @@ test -n "$DB2TXT" || DB2TXT="false"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
echo "$as_me:$LINENO: checking for sqrt in -lm" >&5
|
|
||||||
echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6
|
|
||||||
if test "${ac_cv_lib_m_sqrt+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
ac_check_lib_save_LIBS=$LIBS
|
|
||||||
LIBS="-lm $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 gcc2 internal prototype to avoid an error. */
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C"
|
|
||||||
#endif
|
|
||||||
/* We use char because int might match the return type of a gcc2
|
|
||||||
builtin and then its argument prototype would still apply. */
|
|
||||||
char sqrt ();
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
sqrt ();
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
||||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&
|
|
||||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
||||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
||||||
(eval $ac_try) 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); }; } &&
|
|
||||||
{ ac_try='test -s conftest$ac_exeext'
|
|
||||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
||||||
(eval $ac_try) 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); }; }; then
|
|
||||||
ac_cv_lib_m_sqrt=yes
|
|
||||||
else
|
|
||||||
echo "$as_me: failed program was:" >&5
|
|
||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
|
||||||
|
|
||||||
ac_cv_lib_m_sqrt=no
|
|
||||||
fi
|
|
||||||
rm -f conftest.err conftest.$ac_objext \
|
|
||||||
conftest$ac_exeext conftest.$ac_ext
|
|
||||||
LIBS=$ac_check_lib_save_LIBS
|
|
||||||
fi
|
|
||||||
echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5
|
|
||||||
echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6
|
|
||||||
if test $ac_cv_lib_m_sqrt = yes; then
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
|
||||||
#define HAVE_LIBM 1
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
LIBS="-lm $LIBS"
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
echo "$as_me:$LINENO: checking for i386_set_ldt in -li386" >&5
|
echo "$as_me:$LINENO: checking for i386_set_ldt in -li386" >&5
|
||||||
echo $ECHO_N "checking for i386_set_ldt in -li386... $ECHO_C" >&6
|
echo $ECHO_N "checking for i386_set_ldt in -li386... $ECHO_C" >&6
|
||||||
if test "${ac_cv_lib_i386_i386_set_ldt+set}" = set; then
|
if test "${ac_cv_lib_i386_i386_set_ldt+set}" = set; then
|
||||||
|
|
|
@ -124,8 +124,6 @@ AC_SUBST(DB2TXT)
|
||||||
|
|
||||||
dnl **** Check for some libraries ****
|
dnl **** Check for some libraries ****
|
||||||
|
|
||||||
dnl Check for -lm
|
|
||||||
AC_CHECK_LIB(m,sqrt)
|
|
||||||
dnl Check for -li386 for NetBSD and OpenBSD
|
dnl Check for -li386 for NetBSD and OpenBSD
|
||||||
AC_CHECK_LIB(i386,i386_set_ldt)
|
AC_CHECK_LIB(i386,i386_set_ldt)
|
||||||
dnl Check for -lossaudio for NetBSD
|
dnl Check for -lossaudio for NetBSD
|
||||||
|
|
|
@ -43,7 +43,7 @@ $(SPEC_DEF): $(WINEBUILD)
|
||||||
$(WIN16_FILES:%=__checklink16__%): checklink16
|
$(WIN16_FILES:%=__checklink16__%): checklink16
|
||||||
|
|
||||||
checklink16:: $(MAINSPEC).o $(OBJS) $(MODULE).dbg.o dummy
|
checklink16:: $(MAINSPEC).o $(OBJS) $(MODULE).dbg.o dummy
|
||||||
$(CC) -o checklink -Wl,-rpath,$(TOPOBJDIR)/libs $(TOPSRCDIR)/dlls/checklink.c $(MAINSPEC).o $(OBJS) $(MODULE).dbg.o -L$(DLLDIR) $(ALL_LIBS) && $(RM) checklink $(MAINSPEC).c $(MAINSPEC).o
|
$(CC) -o checklink -Wl,-rpath,$(TOPOBJDIR)/libs $(TOPSRCDIR)/dlls/checklink.c $(MAINSPEC).o $(OBJS) $(MODULE).dbg.o -L$(DLLDIR) $(ALL_LIBS) -lm && $(RM) checklink $(MAINSPEC).c $(MAINSPEC).o
|
||||||
|
|
||||||
checklink:: $(WIN16_FILES:%=__checklink16__%)
|
checklink:: $(WIN16_FILES:%=__checklink16__%)
|
||||||
|
|
||||||
|
|
|
@ -245,9 +245,6 @@
|
||||||
/* Define if you have libjpeg including devel headers */
|
/* Define if you have libjpeg including devel headers */
|
||||||
#undef HAVE_LIBJPEG
|
#undef HAVE_LIBJPEG
|
||||||
|
|
||||||
/* Define to 1 if you have the `m' library (-lm). */
|
|
||||||
#undef HAVE_LIBM
|
|
||||||
|
|
||||||
/* Define if you have the ncurses library (-lncurses) */
|
/* Define if you have the ncurses library (-lncurses) */
|
||||||
#undef HAVE_LIBNCURSES
|
#undef HAVE_LIBNCURSES
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue