cvs: php3 / Makefile.in configure.in internal_functions.c mod_php3.c mod_php3.h

martin Thu Dec 14 13:38:15 2000 EDT Modified files: /php3 Makefile.in configure.in internal_functions.c mod_php3.c mod_php3.h Log: Add hooks and configuration for driving the SESAM SQL database. (see functions/sesam.c) Index: php3/Makefile.in diff -u php3/Makefile.in:1.362 php3/Makefile.in:1.363 --- php3/Makefile.in:1.362 Tue Oct 3 12:37:55 2000 +++ php3/Makefile.in Thu Dec 14 13:38:12 2000 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.362 2000/10/03 19:37:55 sas Exp $ +# $Id: Makefile.in,v 1.363 2000/12/14 21:38:12 martin Exp $ # prefix = @prefix@ @@ -81,7 +81,7 @@ functions/oracle.c functions/oci8.c functions/pack.c \ functions/pageinfo.c functions/pgsql.c functions/magick.c\ functions/post.c functions/rand.c functions/reg.c \ - functions/solid.c functions/soundex.c \ + functions/sesam.c functions/solid.c functions/soundex.c \ functions/string.c functions/syslog.c functions/type.c \ functions/uniqid.c functions/sybase.c \ functions/sybase-ct.c functions/url.c functions/base64.c \ Index: php3/configure.in diff -u php3/configure.in:1.506 php3/configure.in:1.507 --- php3/configure.in:1.506 Wed Jun 14 04:58:08 2000 +++ php3/configure.in Thu Dec 14 13:38:12 2000 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.506 2000/06/14 11:58:08 eschmid Exp $ +dnl $Id: configure.in,v 1.507 2000/12/14 21:38:12 martin Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -67,11 +67,15 @@ dnl check for -R, etc. switch AC_MSG_CHECKING(if compiler supports -R) +if test "uname -m" = "BS2000"; then + php_cv_cc_dashr=no +else AC_CACHE_VAL(php_cv_cc_dashr,[ SAVE_LIBS="${LIBS}" LIBS="-R /usr/lib ${LIBS}" AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no) LIBS="${SAVE_LIBS}"]) +fi AC_MSG_RESULT($php_cv_cc_dashr) if test $php_cv_cc_dashr = "yes"; then ld_runpath_switch="-R" Index: php3/internal_functions.c diff -u php3/internal_functions.c:1.365 php3/internal_functions.c:1.366 --- php3/internal_functions.c:1.365 Mon Apr 10 12:29:36 2000 +++ php3/internal_functions.c Thu Dec 14 13:38:12 2000 @@ -29,7 +29,7 @@ */ -/* $Id: internal_functions.c,v 1.365 2000/04/10 19:29:36 andi Exp $ */ +/* $Id: internal_functions.c,v 1.366 2000/12/14 21:38:12 martin Exp $ */ #include "php.h" #ifndef MSVC5 @@ -76,6 +76,7 @@ #include "functions/exec.h" #include "functions/php3_solid.h" #include "functions/adabasd.h" +#include "functions/php3_sesam.h" #include "functions/file.h" #include "functions/dbase.h" #include "functions/hw.h" @@ -161,6 +162,7 @@ {"Regular Expressions", regexp_module_ptr}, {"Solid", solid_module_ptr}, {"Adabas", adabas_module_ptr}, + {"Sesam", sesam_module_ptr}, {"Image", gd_module_ptr}, {"OCI8", oci8_module_ptr}, {"Oracle", oracle_module_ptr}, Index: php3/mod_php3.c diff -u php3/mod_php3.c:1.100 php3/mod_php3.c:1.101 --- php3/mod_php3.c:1.100 Sun Jan 30 13:25:21 2000 +++ php3/mod_php3.c Thu Dec 14 13:38:12 2000 @@ -27,7 +27,7 @@ | (with helpful hints from Dean Gaudet <dgaudet@arctic.org> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php3.c,v 1.100 2000/01/30 21:25:21 rasmus Exp $ */ +/* $Id: mod_php3.c,v 1.101 2000/12/14 21:38:12 martin Exp $ */ #include "httpd.h" #include "http_config.h" @@ -353,7 +353,11 @@ if (add->ignore_user_abort != base->ignore_user_abort) new->ignore_user_abort = add->ignore_user_abort; if (add->asp_tags != base->asp_tags) new->asp_tags = add->asp_tags; if (add->dav_script != base->dav_script) new->dav_script = add->dav_script; - + + if (add->sesam_oml_filelink != base->sesam_oml_filelink) new->sesam_oml_filelink = add->sesam_oml_filelink; + if (add->sesam_configuration_filelink != base->sesam_configuration_filelink) new->sesam_configuration_filelink = add->sesam_configuration_filelink; + if (add->sesam_messagecatalog != base->sesam_messagecatalog) new->sesam_messagecatalog = add->sesam_messagecatalog; + return new; } @@ -514,6 +518,15 @@ case 21: conf->charset = pstrdup(cmd->pool, arg); break; + case 22: + conf->sesam_oml_filelink = pstrdup(cmd->pool, arg); + break; + case 23: + conf->sesam_configuration_filelink = pstrdup(cmd->pool, arg); + break; + case 24: + conf->sesam_messagecatalog = pstrdup(cmd->pool, arg); + break; } return NULL; } @@ -621,6 +634,11 @@ "Lets PHP handle DAV requests by parsing this script."}, #endif {"php3_charset", php3take1handler, (void *)21, OR_OPTIONS, TAKE1, "charset"}, +#ifdef _OSD_POSIX /*HAVE_SESAM_DB*/ + {"php3_sesam_oml", php3take1handler, (void *)22, OR_OPTIONS, TAKE1, "Set FILE-LINK to SESAM OML Library"}, + {"php3_sesam_configfile", php3take1handler, (void *)23, OR_OPTIONS, TAKE1, "Set FILE-LINK to SESAM configuration file"}, + {"php3_sesam_messagecatalog", php3take1handler, (void *)24, OR_OPTIONS, TAKE1, "Set Message Catalog for SESAM SQL database"}, +#endif {"php3_track_errors", php3flaghandler, (void *)0, OR_OPTIONS, FLAG, "on|off"}, {"php3_magic_quotes_gpc", php3flaghandler, (void *)1, OR_OPTIONS, FLAG, "on|off"}, {"php3_magic_quotes_runtime", php3flaghandler, (void *)2, OR_OPTIONS, FLAG, "on|off"}, Index: php3/mod_php3.h diff -u php3/mod_php3.h:1.54 php3/mod_php3.h:1.55 --- php3/mod_php3.h:1.54 Sat Jan 29 11:33:04 2000 +++ php3/mod_php3.h Thu Dec 14 13:38:12 2000 @@ -26,7 +26,7 @@ | Authors: Rasmus Lerdorf <rasmus@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php3.h,v 1.54 2000/01/29 19:33:04 rasmus Exp $ */ +/* $Id: mod_php3.h,v 1.55 2000/12/14 21:38:12 martin Exp $ */ #ifndef _MOD_PHP3_H #define _MOD_PHP3_H @@ -94,6 +94,10 @@ char *dav_script; long expose_php; char *charset; + /* These are *only* needed for SESAM database support */ + char *sesam_oml_filelink; + char *sesam_configuration_filelink; + char *sesam_messagecatalog; } php3_ini_structure; #if MSVC5