CVS update: php3
| From: | rasmus | Date: | Mon, 21 Sep 1998 21:44:05 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1339@lists.php.net to get a copy of this message | ||
Date: Monday September 21, 1998 @ 17:44
Author: rasmus
Update of /repository/php3
In directory asf:/u2/tmp/cvs-serv4412
Modified Files:
aclocal.m4 configure.in
Log Message:
Fix escape problems
Index: php3/aclocal.m4
diff -c php3/aclocal.m4:1.22 php3/aclocal.m4:1.23
*** php3/aclocal.m4:1.22 Mon Sep 21 15:49:15 1998
--- php3/aclocal.m4 Mon Sep 21 17:44:00 1998
***************
*** 1,4 ****
! dnl $Id: aclocal.m4,v 1.22 1998/09/21 19:49:15 rasmus Exp $
dnl
dnl This file contains local autoconf functions.
--- 1,4 ----
! dnl $Id: aclocal.m4,v 1.23 1998/09/21 21:44:00 rasmus Exp $
dnl
dnl This file contains local autoconf functions.
***************
*** 149,155 ****
AC_MSG_CHECKING([for MD5 crypt])
AC_TRY_RUN([
main() {
! exit (strcmp((char
*)crypt("rasmuslerdorf","$1$rasmusle$"),"$1$rasmusle$rISCgZzpwk3UhDidwXvin0"));
}],[
AC_DEFINE(MD5_CRYPT,1)
AC_MSG_RESULT(ok)
--- 149,161 ----
AC_MSG_CHECKING([for MD5 crypt])
AC_TRY_RUN([
main() {
! char salt[15], answer[40];
!
! salt[0]='$'; salt[1]='1'; salt[2]='\0';
! strcat(salt,"$rasmusle$");
! strcpy(answer,salt);
! strcat(answer,"rISCgZzpwk3UhDidwXvin0");
! exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer));
}],[
AC_DEFINE(MD5_CRYPT,1)
AC_MSG_RESULT(ok)
***************
*** 164,170 ****
AC_MSG_CHECKING([for Blowfish crypt])
AC_TRY_RUN([
main() {
! exit (strcmp((char
*)crypt("rasmuslerdorf","$2a$07$rasmuslerdorf"),"$2a$07$rasmuslerdor..........mSZzvO8z3s/MMTixItx1MGqktlZgPja"));
}],[
AC_DEFINE(BLOW_CRYPT,1)
AC_MSG_RESULT(ok)
--- 170,182 ----
AC_MSG_CHECKING([for Blowfish crypt])
AC_TRY_RUN([
main() {
! char salt[25], answer[60];
!
! salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$';
salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0';
! strcat(salt,"rasmuslerdorf");
! strncpy(answer,salt,19);
! strcat(answer,"..........mSZzvO8z3s/MMTixItx1MGqktlZgPja");
! exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer));
}],[
AC_DEFINE(BLOW_CRYPT,1)
AC_MSG_RESULT(ok)
Index: php3/configure.in
diff -c php3/configure.in:1.249 php3/configure.in:1.250
*** php3/configure.in:1.249 Mon Sep 21 13:47:49 1998
--- php3/configure.in Mon Sep 21 17:44:01 1998
***************
*** 1,4 ****
! dnl $Id: configure.in,v 1.249 1998/09/21 17:47:49 rasmus Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
--- 1,4 ----
! dnl $Id: configure.in,v 1.250 1998/09/21 21:44:01 rasmus Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
***************
*** 98,104 ****
])
dnl AIX keeps in_addr_t in /usr/include/netinet/in.h
! AC_MSG_CHECKING(for in_addr_t)
AC_CACHE_VAL(ac_cv_type_$1,
[AC_EGREP_CPP(dnl
changequote(<<,>>)dnl
--- 98,104 ----
])
dnl AIX keeps in_addr_t in /usr/include/netinet/in.h
! dnl AC_MSG_CHECKING(for in_addr_t)
AC_CACHE_VAL(ac_cv_type_$1,
[AC_EGREP_CPP(dnl
changequote(<<,>>)dnl
***************
*** 112,118 ****
#include <netinet/in.h>
#endif], ac_cv_type_in_addr_t=yes, ac_cv_type_in_addr_t=no)])dnl
! AC_MSG_RESULT($ac_cv_type_in_addr_t)
if test $ac_cv_type_in_addr_t = no; then
AC_DEFINE(in_addr_t, u_int)
fi
--- 112,118 ----
#include <netinet/in.h>
#endif], ac_cv_type_in_addr_t=yes, ac_cv_type_in_addr_t=no)])dnl
! dnl AC_MSG_RESULT($ac_cv_type_in_addr_t)
if test $ac_cv_type_in_addr_t = no; then
AC_DEFINE(in_addr_t, u_int)
fi
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net