diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix configure for WIN32.

Browse Source
This commit is contained in:
unknown 2011-03-21 23:43:06 +00:00
parent 185151db2a
commit 591119b888
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure vendored Executable file → Normal file
View File

@ -5228,11 +5228,7 @@ _ACEOF
fi fi
yap_cv_readline=no yap_cv_readline=no
if test "$target_win64" = yes CLIB_NETLIBS="-lws2_32 -lpsapi -lgdi32"
CLIB_NETLIBS="-lws2_32 -lpsapi -lgdi32"
then
CLIB_NETLIBS="-lwsock32 -lpsapi -lgdi32"
fi
if test "$prefix" = "NONE" if test "$prefix" = "NONE"
then then
if test "$target_win64" = yes if test "$target_win64" = yes
@ -9331,8 +9327,8 @@ CHR_TARGETS=chr_support."$SO"
CLIB_TARGETS="random.$SO socket.$SO cgi.$SO memfile.$SO files.$SO mime.$SO crypt.$SO" CLIB_TARGETS="random.$SO socket.$SO cgi.$SO memfile.$SO files.$SO mime.$SO $CRYPT_TARGETS"
CLIB_PLTARGETS="random.pl socket.pl cgi.pl memfile.pl filesex.pl mime.pl crypt.pl" CLIB_PLTARGETS="random.pl socket.pl cgi.pl memfile.pl filesex.pl mime.pl $CRYPT_TARGETS"
if test "$ac_cv_func_setitimer" = "yes"; then if test "$ac_cv_func_setitimer" = "yes"; then
CLIB_TARGETS="$CLIB_TARGETS time.$SO" CLIB_TARGETS="$CLIB_TARGETS time.$SO"
@ -9529,12 +9525,9 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
$as_echo "$ac_cv_lib_crypt_crypt" >&6; } $as_echo "$ac_cv_lib_crypt_crypt" >&6; }
if test "x$ac_cv_lib_crypt_crypt" = xyes; then : if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
cat >>confdefs.h <<_ACEOF CRYPT_TARGET=crypt.\$SO
#define HAVE_LIBCRYPT 1 else
_ACEOF CRYPT_TARGET=""
LIBS="-lcrypt $LIBS"
fi fi
CLIB_CRYPTLIBS="$LIBS" CLIB_CRYPTLIBS="$LIBS"

12
configure.in Executable file → Normal file
View File

@ -577,11 +577,7 @@ then
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS \$(abs_top_builddir)/yap.dll" EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS \$(abs_top_builddir)/yap.dll"
AC_CHECK_LIB(psapi,main) AC_CHECK_LIB(psapi,main)
yap_cv_readline=no yap_cv_readline=no
if test "$target_win64" = yes CLIB_NETLIBS="-lws2_32 -lpsapi -lgdi32"
CLIB_NETLIBS="-lws2_32 -lpsapi -lgdi32"
then
CLIB_NETLIBS="-lwsock32 -lpsapi -lgdi32"
fi
if test "$prefix" = "NONE" if test "$prefix" = "NONE"
then then
if test "$target_win64" = yes if test "$target_win64" = yes
@ -1840,8 +1836,8 @@ AC_SUBST(TARGETS)
AC_SUBST(PLTARGETS) AC_SUBST(PLTARGETS)
AC_SUBST(CHR_TARGETS) AC_SUBST(CHR_TARGETS)
CLIB_TARGETS="random.$SO socket.$SO cgi.$SO memfile.$SO files.$SO mime.$SO crypt.$SO" CLIB_TARGETS="random.$SO socket.$SO cgi.$SO memfile.$SO files.$SO mime.$SO $CRYPT_TARGETS"
CLIB_PLTARGETS="random.pl socket.pl cgi.pl memfile.pl filesex.pl mime.pl crypt.pl" CLIB_PLTARGETS="random.pl socket.pl cgi.pl memfile.pl filesex.pl mime.pl $CRYPT_TARGETS"
if test "$ac_cv_func_setitimer" = "yes"; then if test "$ac_cv_func_setitimer" = "yes"; then
CLIB_TARGETS="$CLIB_TARGETS time.$SO" CLIB_TARGETS="$CLIB_TARGETS time.$SO"
@ -1871,7 +1867,7 @@ AC_CHECK_LIB(pthread, pthread_create,
[CLIB_PTHREADS="-lpthread"],[CLIB_PTHREADS=""]) [CLIB_PTHREADS="-lpthread"],[CLIB_PTHREADS=""])
oldlibs="$LIBS" oldlibs="$LIBS"
AC_CHECK_LIB(crypt, crypt) AC_CHECK_LIB(crypt, crypt, CRYPT_TARGET=crypt.\$SO, CRYPT_TARGET="")
CLIB_CRYPTLIBS="$LIBS" CLIB_CRYPTLIBS="$LIBS"
AC_CHECK_FUNCS(crypt) AC_CHECK_FUNCS(crypt)
LIBS="$oldlibs" LIBS="$oldlibs"