MERMS/MermsEmrWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Upgrade CodeIgniter 3.1.9 => 3.1.11

Browse Source
This commit is contained in:
Olusesan Ameye
2020-08-14 04:19:45 -04:00
parent dde9afa5c6
commit f473e949cb
357 changed files with 1718 additions and 1601 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mermsemr/src/autom4te.cache/output.0
+46 -46
View File
@@ -727,7 +727,7 @@ ac_user_opts='
enable_option_checking
with_libdir
with_php_config
enable_mermsemr_api_sameye
enable_mermsemr_api_oameye
enable_shared
enable_static
with_pic
@@ -1367,7 +1367,7 @@ Optional Features and Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-libdir=NAME Look for libraries in .../NAME rather than .../lib
--with-php-config=PATH Path to php-config php-config
--enable-mermsemr_api_sameye Enable "mermsemr_api_sameye" extension support
--enable-mermsemr_api_oameye Enable "mermsemr_api_oameye" extension support
--enable-shared@<:@=PKGS@:>@ build shared libraries @<:@default=yes@:>@
--enable-static@<:@=PKGS@:>@ build static libraries @<:@default=yes@:>@
--with-pic@<:@=PKGS@:>@ try to use only PIC/non-PIC objects @<:@default=use
@@ -3986,17 +3986,17 @@ $as_echo "no" >&6; }
php_enable_mermsemr_api_sameye=no
php_enable_mermsemr_api_oameye=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to enable the \"mermsemr_api_sameye\" extension" >&5
$as_echo_n "checking Whether to enable the \"mermsemr_api_sameye\" extension... " >&6; }
@%:@ Check whether --enable-mermsemr_api_sameye was given.
if test "${enable_mermsemr_api_sameye+set}" = set; then :
enableval=$enable_mermsemr_api_sameye; PHP_MERMSEMR_API_SAMEYE=$enableval
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to enable the \"mermsemr_api_oameye\" extension" >&5
$as_echo_n "checking Whether to enable the \"mermsemr_api_oameye\" extension... " >&6; }
@%:@ Check whether --enable-mermsemr_api_oameye was given.
if test "${enable_mermsemr_api_oameye+set}" = set; then :
enableval=$enable_mermsemr_api_oameye; PHP_MERMSEMR_API_OAMEYE=$enableval
else
PHP_MERMSEMR_API_SAMEYE=no
test "$PHP_ENABLE_ALL" && PHP_MERMSEMR_API_SAMEYE=$PHP_ENABLE_ALL
PHP_MERMSEMR_API_OAMEYE=no
test "$PHP_ENABLE_ALL" && PHP_MERMSEMR_API_OAMEYE=$PHP_ENABLE_ALL
fi
@@ -4004,12 +4004,12 @@ fi
ext_output="yes, shared"
ext_shared=yes
case $PHP_MERMSEMR_API_SAMEYE in
case $PHP_MERMSEMR_API_OAMEYE in
shared,*)
PHP_MERMSEMR_API_SAMEYE=`echo "$PHP_MERMSEMR_API_SAMEYE"|$SED 's/^shared,//'`
PHP_MERMSEMR_API_OAMEYE=`echo "$PHP_MERMSEMR_API_OAMEYE"|$SED 's/^shared,//'`
;;
shared)
PHP_MERMSEMR_API_SAMEYE=yes
PHP_MERMSEMR_API_OAMEYE=yes
;;
no)
ext_output=no
@@ -4024,7 +4024,7 @@ esac
ext_output="yes, shared"
ext_shared=yes
test "$PHP_MERMSEMR_API_SAMEYE" = "no" && PHP_MERMSEMR_API_SAMEYE=yes
test "$PHP_MERMSEMR_API_OAMEYE" = "no" && PHP_MERMSEMR_API_OAMEYE=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
@@ -4033,7 +4033,7 @@ $as_echo "$ext_output" >&6; }
if test $PHP_MERMSEMR_API_SAMEYE != "no"; then
if test $PHP_MERMSEMR_API_OAMEYE != "no"; then
if test -z "$php_cxx_done"; then
ac_ext=cpp
@@ -4440,7 +4440,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
PHP_VAR_SUBST="$PHP_VAR_SUBST MERMSEMR_API_SAMEYE_SHARED_LIBADD"
PHP_VAR_SUBST="$PHP_VAR_SUBST MERMSEMR_API_OAMEYE_SHARED_LIBADD"
@@ -4448,7 +4448,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
c|c_r|pthread*) ;;
*)
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lstdc++"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lstdc++"
else
@@ -4499,7 +4499,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="-lpq $MERMSEMR_API_SAMEYE_SHARED_LIBADD"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="-lpq $MERMSEMR_API_OAMEYE_SHARED_LIBADD"
if test -n "/usr/lib64"; then
if test "/usr/lib64" != "/usr/$PHP_LIBDIR" && test "/usr/lib64" != "/usr/lib"; then
@@ -4516,8 +4516,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="-L$ai_p $MERMSEMR_API_SAMEYE_SHARED_LIBADD"
test -n "$ld_runpath_switch" && MERMSEMR_API_SAMEYE_SHARED_LIBADD="$ld_runpath_switch$ai_p $MERMSEMR_API_SAMEYE_SHARED_LIBADD"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="-L$ai_p $MERMSEMR_API_OAMEYE_SHARED_LIBADD"
test -n "$ld_runpath_switch" && MERMSEMR_API_OAMEYE_SHARED_LIBADD="$ld_runpath_switch$ai_p $MERMSEMR_API_OAMEYE_SHARED_LIBADD"
else
@@ -4599,7 +4599,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
c|c_r|pthread*) ;;
*)
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lcurl"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lcurl"
else
@@ -4622,7 +4622,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
c|c_r|pthread*) ;;
*)
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lconfig++"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lconfig++"
else
@@ -4645,7 +4645,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
c|c_r|pthread*) ;;
*)
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -ljson-c"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -ljson-c"
else
@@ -4668,7 +4668,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
c|c_r|pthread*) ;;
*)
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lssl"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lssl"
else
@@ -4691,7 +4691,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
c|c_r|pthread*) ;;
*)
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lz"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lz"
else
@@ -4714,7 +4714,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
c|c_r|pthread*) ;;
*)
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lpcrecpp"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lpcrecpp"
else
@@ -4737,7 +4737,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
c|c_r|pthread*) ;;
*)
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lgcc_s"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lgcc_s"
else
@@ -4767,7 +4767,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_extra=`echo "-I@ext_srcdir@/libconfig-1.0.1"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
PHP_MERMSEMR_API_SAMEYE_SHARED=no
PHP_MERMSEMR_API_OAMEYE_SHARED=no
case $ext_dir in
@@ -4811,13 +4811,13 @@ EOF
done
EXT_STATIC="$EXT_STATIC mermsemr_api_sameye;$ext_dir"
EXT_STATIC="$EXT_STATIC mermsemr_api_oameye;$ext_dir"
if test "$ext_shared" != "nocli"; then
EXT_CLI_STATIC="$EXT_CLI_STATIC mermsemr_api_sameye;$ext_dir"
EXT_CLI_STATIC="$EXT_CLI_STATIC mermsemr_api_oameye;$ext_dir"
fi
else
if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
PHP_MERMSEMR_API_SAMEYE_SHARED=yes
PHP_MERMSEMR_API_OAMEYE_SHARED=yes
case $ext_dir in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -4844,7 +4844,7 @@ EOF
ac_obj=$1
IFS=$old_IFS
shared_objects_mermsemr_api_sameye="$shared_objects_mermsemr_api_sameye $ac_bdir$ac_obj.lo"
shared_objects_mermsemr_api_oameye="$shared_objects_mermsemr_api_oameye $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -4870,32 +4870,32 @@ EOF
esac
if test "x" = "xyes"; then
PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mermsemr_api_sameye.$suffix"
PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mermsemr_api_oameye.$suffix"
else
PHP_MODULES="$PHP_MODULES \$(phplibdir)/mermsemr_api_sameye.$suffix"
PHP_MODULES="$PHP_MODULES \$(phplibdir)/mermsemr_api_oameye.$suffix"
fi
PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mermsemr_api_sameye"
PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mermsemr_api_oameye"
cat >>Makefile.objects<<EOF
\$(phplibdir)/mermsemr_api_sameye.$suffix: $ext_builddir/mermsemr_api_sameye.$suffix
\$(LIBTOOL) --mode=install cp $ext_builddir/mermsemr_api_sameye.$suffix \$(phplibdir)
\$(phplibdir)/mermsemr_api_oameye.$suffix: $ext_builddir/mermsemr_api_oameye.$suffix
\$(LIBTOOL) --mode=install cp $ext_builddir/mermsemr_api_oameye.$suffix \$(phplibdir)
$ext_builddir/mermsemr_api_sameye.$suffix: \$(shared_objects_mermsemr_api_sameye) \$(MERMSEMR_API_SAMEYE_SHARED_DEPENDENCIES)
\$(LIBTOOL) --mode=link \$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_mermsemr_api_sameye) \$(MERMSEMR_API_SAMEYE_SHARED_LIBADD)
$ext_builddir/mermsemr_api_oameye.$suffix: \$(shared_objects_mermsemr_api_oameye) \$(MERMSEMR_API_OAMEYE_SHARED_DEPENDENCIES)
\$(LIBTOOL) --mode=link \$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_mermsemr_api_oameye) \$(MERMSEMR_API_OAMEYE_SHARED_LIBADD)
EOF
cat >>confdefs.h <<_ACEOF
@%:@define COMPILE_DL_MERMSEMR_API_SAMEYE 1
@%:@define COMPILE_DL_MERMSEMR_API_OAMEYE 1
_ACEOF
fi
fi
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_MERMSEMR_API_SAMEYE_SHARED=no
PHP_MERMSEMR_API_OAMEYE_SHARED=no
case "$PHP_SAPI" in
cgi|embed|phpdbg)
@@ -4941,7 +4941,7 @@ EOF
done
EXT_STATIC="$EXT_STATIC mermsemr_api_sameye;$ext_dir"
EXT_STATIC="$EXT_STATIC mermsemr_api_oameye;$ext_dir"
;;
*)
@@ -4989,7 +4989,7 @@ EOF
;;
esac
EXT_CLI_STATIC="$EXT_CLI_STATIC mermsemr_api_sameye;$ext_dir"
EXT_CLI_STATIC="$EXT_CLI_STATIC mermsemr_api_oameye;$ext_dir"
fi
@@ -4998,20 +4998,20 @@ EOF
if test "$ext_builddir" = "."; then
PHP_PECL_EXTENSION=mermsemr_api_sameye
PHP_PECL_EXTENSION=mermsemr_api_oameye
PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
fi
echo "#define MERMSEMR_API_SAMEYE_NS \"mermsemr_api_sameye\"" > include/php_mermsemr_api_sameye_ns.h
echo "#define MERMSEMR_API_OAMEYE_NS \"mermsemr_api_oameye\"" > include/php_mermsemr_api_oameye_ns.h
echo "#define MERMSEMR_CONFIG \"`pwd|sed s/src//`etc/\"" > include/php_mermsemr_config.h
echo "#define MERMSEMR_LOG \"`pwd|sed s/src//`logs/mermsemr_api_sameye.log\"" > include/php_mermsemr_log.h
echo "#define MERMSEMR_LOG \"`pwd|sed s/src//`logs/mermsemr_api_oameye.log\"" > include/php_mermsemr_log.h
echo "#define TMPL_PREFIX \"`pwd|sed s/src//`email/\"" > include/php_tmpl_prefix.h
mermsemr/src/autom4te.cache/requests
+51 -51
View File
@@ -15,63 +15,63 @@
'configure.ac'
],
{
'LT_INIT' => 1,
'm4_pattern_forbid' => 1,
'sinclude' => 1,
'include' => 1,
'AH_OUTPUT' => 1,
'_m4_warn' => 1,
'AC_FC_PP_SRCEXT' => 1,
'AC_CANONICAL_HOST' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
'AM_PATH_GUILE' => 1,
'AM_GNU_GETTEXT' => 1,
'AM_SILENT_RULES' => 1,
'AC_PROG_LIBTOOL' => 1,
'AM_MAKEFILE_INCLUDE' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'AM_PROG_F77_C_O' => 1,
'AC_LIBSOURCE' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'LT_SUPPORTED_TAG' => 1,
'AC_CONFIG_FILES' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FC_SRCEXT' => 1,
'AC_CANONICAL_BUILD' => 1,
'AM_PROG_CXX_C_O' => 1,
'm4_sinclude' => 1,
'AC_INIT' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AM_PROG_FC_C_O' => 1,
'AM_NLS' => 1,
'AC_SUBST_TRACE' => 1,
'AM_PROG_MOC' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'AM_PROG_CC_C_O' => 1,
'm4_pattern_allow' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AM_POT_TOOLS' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AC_FC_PP_DEFINE' => 1,
'AC_CONFIG_HEADERS' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
'AM_CONDITIONAL' => 1,
'LT_SUPPORTED_TAG' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'_AM_MAKEFILE_INCLUDE' => 1,
'AM_MAINTAINER_MODE' => 1,
'AC_FC_FREEFORM' => 1,
'AM_ENABLE_MULTILIB' => 1,
'AC_CONFIG_LINKS' => 1,
'AC_FC_SRCEXT' => 1,
'_LT_AC_TAGCONFIG' => 1,
'_AM_COND_ENDIF' => 1,
'AC_CANONICAL_TARGET' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AM_XGETTEXT_OPTION' => 1,
'AC_SUBST' => 1,
'AC_CONFIG_FILES' => 1,
'AC_FC_PP_SRCEXT' => 1,
'AM_PROG_AR' => 1,
'AC_SUBST' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'm4_sinclude' => 1,
'AM_PROG_FC_C_O' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
'_LT_AC_TAGCONFIG' => 1,
'AC_FC_PP_DEFINE' => 1,
'AM_XGETTEXT_OPTION' => 1,
'AC_CANONICAL_TARGET' => 1,
'AC_CONFIG_LINKS' => 1,
'AC_LIBSOURCE' => 1,
'AC_SUBST_TRACE' => 1,
'_AM_COND_IF' => 1,
'm4_pattern_forbid' => 1,
'AM_NLS' => 1,
'AM_ENABLE_MULTILIB' => 1,
'_AM_COND_ELSE' => 1,
'AM_CONDITIONAL' => 1,
'_AM_MAKEFILE_INCLUDE' => 1,
'AM_PATH_GUILE' => 1,
'AH_OUTPUT' => 1,
'include' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
'AC_INIT' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AM_POT_TOOLS' => 1,
'AC_CANONICAL_HOST' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'AM_PROG_F77_C_O' => 1,
'AM_PROG_CC_C_O' => 1,
'AC_FC_FREEFORM' => 1,
'AM_SILENT_RULES' => 1,
'LT_INIT' => 1,
'AM_MAINTAINER_MODE' => 1,
'_m4_warn' => 1,
'_AM_COND_ENDIF' => 1,
'm4_pattern_allow' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'AM_PROG_MOC' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'm4_include' => 1,
'_AM_COND_IF' => 1
'sinclude' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_CONFIG_AUX_DIR' => 1
}
], 'Autom4te::Request' )
);
mermsemr/src/autom4te.cache/traces.0
+4 -4
View File
@@ -308,10 +308,10 @@ m4trace:config.m4:6: -1- m4_pattern_allow([^CPPFLAGS$])
m4trace:config.m4:6: -1- AC_SUBST([CXXCPP])
m4trace:config.m4:6: -1- AC_SUBST_TRACE([CXXCPP])
m4trace:config.m4:6: -1- m4_pattern_allow([^CXXCPP$])
m4trace:config.m4:23: -1- AC_DEFINE_TRACE_LITERAL([COMPILE_DL_MERMSEMR_API_SAMEYE])
m4trace:config.m4:23: -1- m4_pattern_allow([^COMPILE_DL_MERMSEMR_API_SAMEYE$])
m4trace:config.m4:23: -1- AH_OUTPUT([COMPILE_DL_MERMSEMR_API_SAMEYE], [/* Whether to build mermsemr_api_sameye as dynamic module */
@%:@undef COMPILE_DL_MERMSEMR_API_SAMEYE])
m4trace:config.m4:23: -1- AC_DEFINE_TRACE_LITERAL([COMPILE_DL_MERMSEMR_API_OAMEYE])
m4trace:config.m4:23: -1- m4_pattern_allow([^COMPILE_DL_MERMSEMR_API_OAMEYE$])
m4trace:config.m4:23: -1- AH_OUTPUT([COMPILE_DL_MERMSEMR_API_OAMEYE], [/* Whether to build mermsemr_api_oameye as dynamic module */
@%:@undef COMPILE_DL_MERMSEMR_API_OAMEYE])
m4trace:configure.ac:149: -1- AC_PROG_LIBTOOL
m4trace:configure.ac:149: -1- _m4_warn([obsolete], [The macro `AC_PROG_LIBTOOL' is obsolete.
You should run autoupdate.], [aclocal.m4:3383: AC_PROG_LIBTOOL is expanded from...
mermsemr/src/confdefs.h
+1 -1
View File
@@ -5,7 +5,7 @@
#define PACKAGE_STRING ""
#define PACKAGE_BUGREPORT ""
#define PACKAGE_URL ""
#define COMPILE_DL_MERMSEMR_API_SAMEYE 1
#define COMPILE_DL_MERMSEMR_API_OAMEYE 1
#define STDC_HEADERS 1
#define HAVE_SYS_TYPES_H 1
#define HAVE_SYS_STAT_H 1
mermsemr/src/config.h
+2 -2
View File
@@ -1,8 +1,8 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* Whether to build mermsemr_api_sameye as dynamic module */
#define COMPILE_DL_MERMSEMR_API_SAMEYE 1
/* Whether to build mermsemr_api_oameye as dynamic module */
#define COMPILE_DL_MERMSEMR_API_OAMEYE 1
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
mermsemr/src/config.h.in
+2 -2
View File
@@ -1,7 +1,7 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* Whether to build mermsemr_api_sameye as dynamic module */
#undef COMPILE_DL_MERMSEMR_API_SAMEYE
/* Whether to build mermsemr_api_oameye as dynamic module */
#undef COMPILE_DL_MERMSEMR_API_OAMEYE
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
mermsemr/src/config.h.in~
+2 -3
View File
@@ -1,4 +1,4 @@
/* config.h.in. Generated from configure.in by autoheader. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* Whether to build mermsemr_api_sameye as dynamic module */
#undef COMPILE_DL_MERMSEMR_API_SAMEYE
@@ -33,8 +33,7 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
mermsemr/src/config.m4
+17 -17
View File
@@ -1,33 +1,33 @@
PHP_ARG_ENABLE(mermsemr_api_sameye,
[Whether to enable the "mermsemr_api_sameye" extension],
[ --enable-mermsemr_api_sameye Enable "mermsemr_api_sameye" extension support])
PHP_ARG_ENABLE(mermsemr_api_oameye,
[Whether to enable the "mermsemr_api_oameye" extension],
[ --enable-mermsemr_api_oameye Enable "mermsemr_api_oameye" extension support])
if test $PHP_MERMSEMR_API_SAMEYE != "no"; then
if test $PHP_MERMSEMR_API_OAMEYE != "no"; then
PHP_REQUIRE_CXX()
PHP_SUBST(MERMSEMR_API_SAMEYE_SHARED_LIBADD)
PHP_ADD_LIBRARY(stdc++, 1, MERMSEMR_API_SAMEYE_SHARED_LIBADD)
PHP_SUBST(MERMSEMR_API_OAMEYE_SHARED_LIBADD)
PHP_ADD_LIBRARY(stdc++, 1, MERMSEMR_API_OAMEYE_SHARED_LIBADD)
PHP_ADD_INCLUDE(/usr/include/pgsql)
PHP_ADD_LIBRARY_WITH_PATH(pq, /usr/lib64, MERMSEMR_API_SAMEYE_SHARED_LIBADD)
PHP_ADD_LIBRARY(curl, 1, MERMSEMR_API_SAMEYE_SHARED_LIBADD)
PHP_ADD_LIBRARY(config++, 1, MERMSEMR_API_SAMEYE_SHARED_LIBADD)
PHP_ADD_LIBRARY(json-c, 1, MERMSEMR_API_SAMEYE_SHARED_LIBADD)
PHP_ADD_LIBRARY(ssl, 1, MERMSEMR_API_SAMEYE_SHARED_LIBADD)
PHP_ADD_LIBRARY(z, 1, MERMSEMR_API_SAMEYE_SHARED_LIBADD)
PHP_ADD_LIBRARY(pcrecpp, 1, MERMSEMR_API_SAMEYE_SHARED_LIBADD)
PHP_ADD_LIBRARY(gcc_s, 1, MERMSEMR_API_SAMEYE_SHARED_LIBADD)
PHP_ADD_LIBRARY_WITH_PATH(pq, /usr/lib64, MERMSEMR_API_OAMEYE_SHARED_LIBADD)
PHP_ADD_LIBRARY(curl, 1, MERMSEMR_API_OAMEYE_SHARED_LIBADD)
PHP_ADD_LIBRARY(config++, 1, MERMSEMR_API_OAMEYE_SHARED_LIBADD)
PHP_ADD_LIBRARY(json-c, 1, MERMSEMR_API_OAMEYE_SHARED_LIBADD)
PHP_ADD_LIBRARY(ssl, 1, MERMSEMR_API_OAMEYE_SHARED_LIBADD)
PHP_ADD_LIBRARY(z, 1, MERMSEMR_API_OAMEYE_SHARED_LIBADD)
PHP_ADD_LIBRARY(pcrecpp, 1, MERMSEMR_API_OAMEYE_SHARED_LIBADD)
PHP_ADD_LIBRARY(gcc_s, 1, MERMSEMR_API_OAMEYE_SHARED_LIBADD)
#LIBCFG_DIR="`pwd`/libconfig-1.3.1"
#PHP_ADD_LIBRARY_WITH_PATH(config++, "$LIBCFG_DIR/.libs/")
PHP_NEW_EXTENSION(
mermsemr_api_sameye,
mermsemr_api_oameye,
core/*.cc shared_tool/*.cc,
$ext_shared,
,-I@ext_srcdir@/libconfig-1.0.1)
PHP_DEFINE([MERMSEMR_API_SAMEYE_NS],[\"mermsemr_api_sameye\"],[])
PHP_DEFINE([MERMSEMR_API_OAMEYE_NS],[\"mermsemr_api_oameye\"],[])
PHP_DEFINE([MERMSEMR_CONFIG],[\"`pwd|sed s/src//`etc/\"],[])
PHP_DEFINE([MERMSEMR_LOG],[\"`pwd|sed s/src//`logs/mermsemr_api_sameye.log\"],[])
PHP_DEFINE([MERMSEMR_LOG],[\"`pwd|sed s/src//`logs/mermsemr_api_oameye.log\"],[])
PHP_DEFINE([TMPL_PREFIX],[\"`pwd|sed s/src//`email/\"],[])
PHP_DEFINE([FILELOG_MAX_LEVEL],[9],[])
fi
mermsemr/src/configure
Vendored
+46 -46
View File
@@ -727,7 +727,7 @@ ac_user_opts='
enable_option_checking
with_libdir
with_php_config
enable_mermsemr_api_sameye
enable_mermsemr_api_oameye
enable_shared
enable_static
with_pic
@@ -1367,7 +1367,7 @@ Optional Features and Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-libdir=NAME Look for libraries in .../NAME rather than .../lib
--with-php-config=PATH Path to php-config php-config
--enable-mermsemr_api_sameye Enable "mermsemr_api_sameye" extension support
--enable-mermsemr_api_oameye Enable "mermsemr_api_oameye" extension support
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-static[=PKGS] build static libraries [default=yes]
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
@@ -3986,17 +3986,17 @@ $as_echo "no" >&6; }
php_enable_mermsemr_api_sameye=no
php_enable_mermsemr_api_oameye=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to enable the \"mermsemr_api_sameye\" extension" >&5
$as_echo_n "checking Whether to enable the \"mermsemr_api_sameye\" extension... " >&6; }
# Check whether --enable-mermsemr_api_sameye was given.
if test "${enable_mermsemr_api_sameye+set}" = set; then :
enableval=$enable_mermsemr_api_sameye; PHP_MERMSEMR_API_SAMEYE=$enableval
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to enable the \"mermsemr_api_oameye\" extension" >&5
$as_echo_n "checking Whether to enable the \"mermsemr_api_oameye\" extension... " >&6; }
# Check whether --enable-mermsemr_api_oameye was given.
if test "${enable_mermsemr_api_oameye+set}" = set; then :
enableval=$enable_mermsemr_api_oameye; PHP_MERMSEMR_API_OAMEYE=$enableval
else
PHP_MERMSEMR_API_SAMEYE=no
test "$PHP_ENABLE_ALL" && PHP_MERMSEMR_API_SAMEYE=$PHP_ENABLE_ALL
PHP_MERMSEMR_API_OAMEYE=no
test "$PHP_ENABLE_ALL" && PHP_MERMSEMR_API_OAMEYE=$PHP_ENABLE_ALL
fi
@@ -4004,12 +4004,12 @@ fi
ext_output="yes, shared"
ext_shared=yes
case $PHP_MERMSEMR_API_SAMEYE in
case $PHP_MERMSEMR_API_OAMEYE in
shared,*)
PHP_MERMSEMR_API_SAMEYE=`echo "$PHP_MERMSEMR_API_SAMEYE"|$SED 's/^shared,//'`
PHP_MERMSEMR_API_OAMEYE=`echo "$PHP_MERMSEMR_API_OAMEYE"|$SED 's/^shared,//'`
;;
shared)
PHP_MERMSEMR_API_SAMEYE=yes
PHP_MERMSEMR_API_OAMEYE=yes
;;
no)
ext_output=no
@@ -4024,7 +4024,7 @@ esac
ext_output="yes, shared"
ext_shared=yes
test "$PHP_MERMSEMR_API_SAMEYE" = "no" && PHP_MERMSEMR_API_SAMEYE=yes
test "$PHP_MERMSEMR_API_OAMEYE" = "no" && PHP_MERMSEMR_API_OAMEYE=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
@@ -4033,7 +4033,7 @@ $as_echo "$ext_output" >&6; }
if test $PHP_MERMSEMR_API_SAMEYE != "no"; then
if test $PHP_MERMSEMR_API_OAMEYE != "no"; then
if test -z "$php_cxx_done"; then
ac_ext=cpp
@@ -4440,7 +4440,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
PHP_VAR_SUBST="$PHP_VAR_SUBST MERMSEMR_API_SAMEYE_SHARED_LIBADD"
PHP_VAR_SUBST="$PHP_VAR_SUBST MERMSEMR_API_OAMEYE_SHARED_LIBADD"
@@ -4448,7 +4448,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
c|c_r|pthread*) ;;
*)
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lstdc++"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lstdc++"
else
@@ -4499,7 +4499,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="-lpq $MERMSEMR_API_SAMEYE_SHARED_LIBADD"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="-lpq $MERMSEMR_API_OAMEYE_SHARED_LIBADD"
if test -n "/usr/lib64"; then
if test "/usr/lib64" != "/usr/$PHP_LIBDIR" && test "/usr/lib64" != "/usr/lib"; then
@@ -4516,8 +4516,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="-L$ai_p $MERMSEMR_API_SAMEYE_SHARED_LIBADD"
test -n "$ld_runpath_switch" && MERMSEMR_API_SAMEYE_SHARED_LIBADD="$ld_runpath_switch$ai_p $MERMSEMR_API_SAMEYE_SHARED_LIBADD"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="-L$ai_p $MERMSEMR_API_OAMEYE_SHARED_LIBADD"
test -n "$ld_runpath_switch" && MERMSEMR_API_OAMEYE_SHARED_LIBADD="$ld_runpath_switch$ai_p $MERMSEMR_API_OAMEYE_SHARED_LIBADD"
else
@@ -4599,7 +4599,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
c|c_r|pthread*) ;;
*)
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lcurl"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lcurl"
else
@@ -4622,7 +4622,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
c|c_r|pthread*) ;;
*)
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lconfig++"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lconfig++"
else
@@ -4645,7 +4645,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
c|c_r|pthread*) ;;
*)
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -ljson-c"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -ljson-c"
else
@@ -4668,7 +4668,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
c|c_r|pthread*) ;;
*)
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lssl"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lssl"
else
@@ -4691,7 +4691,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
c|c_r|pthread*) ;;
*)
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lz"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lz"
else
@@ -4714,7 +4714,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
c|c_r|pthread*) ;;
*)
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lpcrecpp"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lpcrecpp"
else
@@ -4737,7 +4737,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
c|c_r|pthread*) ;;
*)
if test "$ext_shared" = "yes"; then
MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lgcc_s"
MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lgcc_s"
else
@@ -4767,7 +4767,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_extra=`echo "-I@ext_srcdir@/libconfig-1.0.1"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
PHP_MERMSEMR_API_SAMEYE_SHARED=no
PHP_MERMSEMR_API_OAMEYE_SHARED=no
case $ext_dir in
@@ -4811,13 +4811,13 @@ EOF
done
EXT_STATIC="$EXT_STATIC mermsemr_api_sameye;$ext_dir"
EXT_STATIC="$EXT_STATIC mermsemr_api_oameye;$ext_dir"
if test "$ext_shared" != "nocli"; then
EXT_CLI_STATIC="$EXT_CLI_STATIC mermsemr_api_sameye;$ext_dir"
EXT_CLI_STATIC="$EXT_CLI_STATIC mermsemr_api_oameye;$ext_dir"
fi
else
if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
PHP_MERMSEMR_API_SAMEYE_SHARED=yes
PHP_MERMSEMR_API_OAMEYE_SHARED=yes
case $ext_dir in
"") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
@@ -4844,7 +4844,7 @@ EOF
ac_obj=$1
IFS=$old_IFS
shared_objects_mermsemr_api_sameye="$shared_objects_mermsemr_api_sameye $ac_bdir$ac_obj.lo"
shared_objects_mermsemr_api_oameye="$shared_objects_mermsemr_api_oameye $ac_bdir$ac_obj.lo"
case $ac_src in
*.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
@@ -4870,32 +4870,32 @@ EOF
esac
if test "x" = "xyes"; then
PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mermsemr_api_sameye.$suffix"
PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mermsemr_api_oameye.$suffix"
else
PHP_MODULES="$PHP_MODULES \$(phplibdir)/mermsemr_api_sameye.$suffix"
PHP_MODULES="$PHP_MODULES \$(phplibdir)/mermsemr_api_oameye.$suffix"
fi
PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mermsemr_api_sameye"
PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mermsemr_api_oameye"
cat >>Makefile.objects<<EOF
\$(phplibdir)/mermsemr_api_sameye.$suffix: $ext_builddir/mermsemr_api_sameye.$suffix
\$(LIBTOOL) --mode=install cp $ext_builddir/mermsemr_api_sameye.$suffix \$(phplibdir)
\$(phplibdir)/mermsemr_api_oameye.$suffix: $ext_builddir/mermsemr_api_oameye.$suffix
\$(LIBTOOL) --mode=install cp $ext_builddir/mermsemr_api_oameye.$suffix \$(phplibdir)
$ext_builddir/mermsemr_api_sameye.$suffix: \$(shared_objects_mermsemr_api_sameye) \$(MERMSEMR_API_SAMEYE_SHARED_DEPENDENCIES)
\$(LIBTOOL) --mode=link \$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_mermsemr_api_sameye) \$(MERMSEMR_API_SAMEYE_SHARED_LIBADD)
$ext_builddir/mermsemr_api_oameye.$suffix: \$(shared_objects_mermsemr_api_oameye) \$(MERMSEMR_API_OAMEYE_SHARED_DEPENDENCIES)
\$(LIBTOOL) --mode=link \$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_mermsemr_api_oameye) \$(MERMSEMR_API_OAMEYE_SHARED_LIBADD)
EOF
cat >>confdefs.h <<_ACEOF
#define COMPILE_DL_MERMSEMR_API_SAMEYE 1
#define COMPILE_DL_MERMSEMR_API_OAMEYE 1
_ACEOF
fi
fi
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
PHP_MERMSEMR_API_SAMEYE_SHARED=no
PHP_MERMSEMR_API_OAMEYE_SHARED=no
case "$PHP_SAPI" in
cgi|embed|phpdbg)
@@ -4941,7 +4941,7 @@ EOF
done
EXT_STATIC="$EXT_STATIC mermsemr_api_sameye;$ext_dir"
EXT_STATIC="$EXT_STATIC mermsemr_api_oameye;$ext_dir"
;;
*)
@@ -4989,7 +4989,7 @@ EOF
;;
esac
EXT_CLI_STATIC="$EXT_CLI_STATIC mermsemr_api_sameye;$ext_dir"
EXT_CLI_STATIC="$EXT_CLI_STATIC mermsemr_api_oameye;$ext_dir"
fi
@@ -4998,20 +4998,20 @@ EOF
if test "$ext_builddir" = "."; then
PHP_PECL_EXTENSION=mermsemr_api_sameye
PHP_PECL_EXTENSION=mermsemr_api_oameye
PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
fi
echo "#define MERMSEMR_API_SAMEYE_NS \"mermsemr_api_sameye\"" > include/php_mermsemr_api_sameye_ns.h
echo "#define MERMSEMR_API_OAMEYE_NS \"mermsemr_api_oameye\"" > include/php_mermsemr_api_oameye_ns.h
echo "#define MERMSEMR_CONFIG \"`pwd|sed s/src//`etc/\"" > include/php_mermsemr_config.h
echo "#define MERMSEMR_LOG \"`pwd|sed s/src//`logs/mermsemr_api_sameye.log\"" > include/php_mermsemr_log.h
echo "#define MERMSEMR_LOG \"`pwd|sed s/src//`logs/mermsemr_api_oameye.log\"" > include/php_mermsemr_log.h
echo "#define TMPL_PREFIX \"`pwd|sed s/src//`email/\"" > include/php_tmpl_prefix.h
mermsemr/src/core/mermsemr_api.cc
+12 -12
View File
@@ -242,10 +242,10 @@ static void mermsemr_object_free(zend_object *object)
}
// ------------------------------------------------------------------ // ------------------------------------------------------------------
PHP_MINIT_FUNCTION(mermsemr_api_sameye)
PHP_MINIT_FUNCTION(mermsemr_api_oameye)
{
zend_class_entry ce;
INIT_NS_CLASS_ENTRY(ce, MERMSEMR_API_SAMEYE_NS, "MermsEmr", mermsemr_methods);
INIT_NS_CLASS_ENTRY(ce, MERMSEMR_API_OAMEYE_NS, "MermsEmr", mermsemr_methods);
mermsemr_ce = zend_register_internal_class(&ce TSRMLS_CC);
mermsemr_ce->create_object = mermsemr_object_new;
@@ -266,7 +266,7 @@ PHP_MINIT_FUNCTION(mermsemr_api_sameye)
}
// ------------------------------------------------------------------ // ------------------------------------------------------------------
PHP_MINFO_FUNCTION(mermsemr_api_sameye)
PHP_MINFO_FUNCTION(mermsemr_api_oameye)
{
php_info_print_table_start();
php_info_print_table_row(2, "MERMSEMR API support", "enabled");
@@ -274,31 +274,31 @@ PHP_MINFO_FUNCTION(mermsemr_api_sameye)
php_info_print_table_row(2, "Config File", MERMSEMR_CONFIG"mermsemr_api.conf");
php_info_print_table_row(2, "Build Date", __DATE__);
php_info_print_table_row(2, "Build Time", __TIME__);
php_info_print_table_row(2, "Namespace", MERMSEMR_API_SAMEYE_NS);
php_info_print_table_row(2, "Version", PHP_MERMSEMR_API_SAMEYE_EXTVER);
php_info_print_table_row(2, "Namespace", MERMSEMR_API_OAMEYE_NS);
php_info_print_table_row(2, "Version", PHP_MERMSEMR_API_OAMEYE_EXTVER);
php_info_print_table_end();
}
// ------------------------------------------------------------------ // ------------------------------------------------------------------
zend_module_entry mermsemr_api_sameye_module_entry = {
zend_module_entry mermsemr_api_oameye_module_entry = {
#if ZEND_MODULE_API_NO >= 20010901
STANDARD_MODULE_HEADER,
#endif
PHP_MERMSEMR_API_SAMEYE_EXTNAME,
PHP_MERMSEMR_API_OAMEYE_EXTNAME,
NULL, /* Functions */
PHP_MINIT(mermsemr_api_sameye),
PHP_MINIT(mermsemr_api_oameye),
NULL, /* MSHUTDOWN */
NULL, /* RINIT */
NULL, /* RSHUTDOWN */
PHP_MINFO(mermsemr_api_sameye), /* MINFO */
PHP_MINFO(mermsemr_api_oameye), /* MINFO */
#if ZEND_MODULE_API_NO >= 20010901
PHP_MERMSEMR_API_SAMEYE_EXTVER,
PHP_MERMSEMR_API_OAMEYE_EXTVER,
#endif
STANDARD_MODULE_PROPERTIES
};
//#ifdef COMPILE_DL_MERMSEMR_API_SAMEYE
//#ifdef COMPILE_DL_MERMSEMR_API_OAMEYE
extern "C" {
ZEND_GET_MODULE(mermsemr_api_sameye)
ZEND_GET_MODULE(mermsemr_api_oameye)
}
//#endif
mermsemr/src/include/php_mermsemr_api.h
+8 -8
View File
@@ -1,8 +1,8 @@
#ifndef PHP_MERMSEMR_API_SAMEYE_H
#define PHP_MERMSEMR_API_SAMEYE_H
#ifndef PHP_MERMSEMR_API_OAMEYE_H
#define PHP_MERMSEMR_API_OAMEYE_H
#define PHP_MERMSEMR_API_SAMEYE_EXTNAME "mermsemr_api_sameye"
#define PHP_MERMSEMR_API_SAMEYE_EXTVER "0.1"
#define PHP_MERMSEMR_API_OAMEYE_EXTNAME "mermsemr_api_oameye"
#define PHP_MERMSEMR_API_OAMEYE_EXTVER "0.1"
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -12,8 +12,8 @@ extern "C" {
#include "php.h"
}
extern zend_module_entry mermsemr_api_sameye_module_entry;
#define mermsemr_api_sameye_module_ptr &mermsemr_api_sameye_module_entry
#define phpext_mermsemr_api_sameye_ptr mermsemr_api_sameye_module_ptr
extern zend_module_entry mermsemr_api_oameye_module_entry;
#define mermsemr_api_oameye_module_ptr &mermsemr_api_oameye_module_entry
#define phpext_mermsemr_api_oameye_ptr mermsemr_api_oameye_module_ptr
#endif /* PHP_MERMSEMR_API_SAMEYE_H */
#endif /* PHP_MERMSEMR_API_OAMEYE_H */
mermsemr/src/include/php_mermsemr_api_ns.h
+1 -1
View File
@@ -1 +1 @@
#define MERMSEMR_API_SAMEYE_NS "mermsemr_api_sameye"
#define MERMSEMR_API_OAMEYE_NS "mermsemr_api_oameye"
mermsemr/src/libtool
+2 -2
View File
@@ -1,6 +1,6 @@
#! /bin/sh
# Generated automatically by config.status ()
# Libtool was configured on host merms-ehr-dev:
# Libtool was configured on host localhost.localdomain:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
@@ -285,7 +285,7 @@ hardcode_into_libs=yes
sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/8 /usr/lib64 /lib64 /usr/lib /lib "
# Detected run-time system search path for libraries.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64//bind9-export/ /usr/lib64/dyninst "
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64//bind9-export/ /usr/lib64/dyninst "
# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
configure_time_lt_sys_library_path=""