ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better check for -lresolv. Removed FREETYPELIBS.

This commit is contained in:
Alexandre Julliard 2002-04-03 20:24:44 +00:00
parent 79fdd847e0
commit c555274d7d
3 changed files with 795 additions and 731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1516
configure vendored
View File

File diff suppressed because it is too large Load Diff

7
configure.ac
View File

@ -90,7 +90,7 @@ AC_CHECK_FUNCS(gethostbyname,,AC_CHECK_LIB(nsl,gethostbyname))
dnl Check for -lsocket for Solaris dnl Check for -lsocket for Solaris
AC_CHECK_FUNCS(connect,,AC_CHECK_LIB(socket,connect)) AC_CHECK_FUNCS(connect,,AC_CHECK_LIB(socket,connect))
dnl Check for -lresolv for Solaris dnl Check for -lresolv for Solaris
AC_CHECK_LIB(resolv,inet_aton) AC_CHECK_FUNCS(inet_aton,,AC_CHECK_LIB(resolv,inet_aton))
dnl Check for -lxpg4 for FreeBSD dnl Check for -lxpg4 for FreeBSD
AC_CHECK_LIB(xpg4,_xpg4_setrunelocale) AC_CHECK_LIB(xpg4,_xpg4_setrunelocale)
dnl Check for -lmmap for OS/2 dnl Check for -lmmap for OS/2
@ -392,7 +392,6 @@ dnl **** Check for FreeType 2 ****
AC_CHECK_LIB(freetype,FT_Init_FreeType,ft_lib=yes,ft_lib=no,$X_LIBS) AC_CHECK_LIB(freetype,FT_Init_FreeType,ft_lib=yes,ft_lib=no,$X_LIBS)
if test "$ft_lib" = "no" if test "$ft_lib" = "no"
then then
FREETYPELIBS=""
FREETYPEINCL="" FREETYPEINCL=""
wine_cv_msg_freetype=no wine_cv_msg_freetype=no
else else
@ -407,11 +406,9 @@ else
fi fi
if test "$ft_devel" = "no" if test "$ft_devel" = "no"
then then
FREETYPELIBS=""
FREETYPEINCL="" FREETYPEINCL=""
wine_cv_msg_freetype=yes wine_cv_msg_freetype=yes
else else
FREETYPELIBS=`$ft_devel --libs`
FREETYPEINCL=`$ft_devel --cflags` FREETYPEINCL=`$ft_devel --cflags`
ac_save_CPPFLAGS="$CPPFLAGS" ac_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$FREETYPEINCL $CPPFLAGS" CPPFLAGS="$FREETYPEINCL $CPPFLAGS"
@ -436,13 +433,11 @@ else
AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed]) AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed])
wine_cv_msg_freetype=no wine_cv_msg_freetype=no
else else
FREETYPELIBS=""
FREETYPEINCL="" FREETYPEINCL=""
wine_cv_msg_freetype=yes wine_cv_msg_freetype=yes
fi fi
fi fi
fi fi
AC_SUBST(FREETYPELIBS)
AC_SUBST(FREETYPEINCL) AC_SUBST(FREETYPEINCL)
dnl **** Check for parport (currently Linux only) **** dnl **** Check for parport (currently Linux only) ****

3
include/config.h.in
View File

@ -151,6 +151,9 @@
/* Define if you have the <ieeefp.h> header file. */ /* Define if you have the <ieeefp.h> header file. */
#undef HAVE_IEEEFP_H #undef HAVE_IEEEFP_H
/* Define if you have the `inet_aton' function. */
#undef HAVE_INET_ATON
/* Define if you have the `inet_network' function. */ /* Define if you have the `inet_network' function. */
#undef HAVE_INET_NETWORK #undef HAVE_INET_NETWORK