PHP 7.2 upgrade

coregrade/build/config.m4

@@ -0,0 +1,33 @@
+PHP_ARG_ENABLE(coregrade_api,
+    [Whether to enable the "coregrade_api" extension],
+    [  --enable-coregrade_api      Enable "coregrade_api" extension support])
+
+if test $PHP_COREGRADE_API != "no"; then
+    PHP_REQUIRE_CXX()
+    PHP_SUBST(COREGRADE_API_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(stdc++, 1, COREGRADE_API_SHARED_LIBADD)
+    PHP_ADD_INCLUDE(/usr/include/pgsql)
+    PHP_ADD_LIBRARY_WITH_PATH(pq, /usr/lib64,  COREGRADE_API_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(curl, 1, COREGRADE_API_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(config++, 1, COREGRADE_API_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(json-c, 1, COREGRADE_API_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(ssl, 1, COREGRADE_API_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(z, 1, COREGRADE_API_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(pcrecpp, 1, COREGRADE_API_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(gcc_s, 1, COREGRADE_API_SHARED_LIBADD)
+
+    #LIBCFG_DIR="`pwd`/libconfig-1.3.1"
+
+    #PHP_ADD_LIBRARY_WITH_PATH(config++, "$LIBCFG_DIR/.libs/")
+
+    PHP_NEW_EXTENSION(
+	coregrade_api, 
+	core/*.cc shared_tool/*.cc, 
+	$ext_shared,
+	,-I@ext_srcdir@/libconfig-1.0.1)
+    PHP_DEFINE([COREGRADE_API_NS],[\"coregrade_api\"],[])
+    PHP_DEFINE([COREGRADE_CONFIG],[\"`pwd|sed s/src//`etc/\"],[])
+    PHP_DEFINE([COREGRADE_LOG],[\"`pwd|sed s/src//`logs/coregrade_api.log\"],[])
+    PHP_DEFINE([TMPL_PREFIX],[\"`pwd|sed s/src//`email/\"],[])
+    PHP_DEFINE([FILELOG_MAX_LEVEL],[9],[])
+fi

coregrade/build/configure

@@ -7,16 +7,17 @@ WORK_DIR=`pwd`
 MAILSEND="$WORK_DIR/src/mailsend"
 LIBCONFIG="$WORK_DIR/src/libconfig-1.3.1"
 # Checking user
-if [ "$USER" = "root" ]
+if [ "$USER" = "toor" ]
 then
+    # This is legacy reference, we are using system 1.5 now
     echo "Configuring as root"
     LIBCONFIG_PREFIX="/usr"
-    echo "Building $LIBCONFIG ..."
+#    echo "Building $LIBCONFIG ..."
-    cd $LIBCONFIG
+#    cd $LIBCONFIG
-    #echo `pwd` $LIBCONFIG_PREFIX
+#    #echo `pwd` $LIBCONFIG_PREFIX
-    CFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --prefix=$LIBCONFIG_PREFIX
+#    CFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --prefix=$LIBCONFIG_PREFIX
-    make
+#    make
-    make install
+#    make install
 fi
 mkdir $WORK_DIR/logs
 chmod a+w $WORK_DIR/logs
@@ -24,51 +25,27 @@ mkdir $WORK_DIR/src/modules
 # Building mailsend
 cd $MAILSEND
 make
+cp mailsend ../modules/
 # Configure extension
 cd $WORK_DIR/src/
 
-#####echo "Generating interswitch proxy..."
+# Patch files
-#####cd shared_tool/soap
+LUSER=$(id -u -n)
-#####wsdl2h -ninterswitch -Ninterswitch -qinterswitch -o QuickTellerService.h https://stageserv.interswitchng.com/uat_quicktellerservice/quickteller.svc?wsdl
+UUSER=$(id -u -n | awk '{print toupper($0)}')
-#wsdl2h -o QuickTellerService.h https://stageserv.interswitchng.com/uat_quicktellerservice/quickteller.svc?wsdl
+cat ../build/config.m4 | sed s/coregrade_api/coregrade_api_$LUSER/g | sed s/COREGRADE_API/COREGRADE_API_$UUSER/g > config.m4
-#####soapcpp2 -n -pinterswitch -qinterswitch -1 -C -i -I/usr/share/gsoap/import/ QuickTellerService.h
+cat ../build/php_coregrade_api_ns.h | sed s/COREGRADE_API/COREGRADE_API_$UUSER/g | sed s/coregrade_api/coregrade_api_$LUSER/g > include/php_coregrade_api_ns.h
-#soapcpp2 -C -i -I/usr/share/gsoap/import/ QuickTellerService.h
+cat ../build/php_coregrade_api.h | sed s/coregrade_api/coregrade_api_$LUSER/g | sed s/COREGRADE_API/COREGRADE_API_$UUSER/g > include/php_coregrade_api.h
-## copy C++
+cat ../build/coregrade_api.cc | sed s/tcoregradeapit/coregrade_api_$LUSER/g | sed s/COREGRADE_API/COREGRADE_API_$UUSER/g > core/coregrade_api.cc
-#cp soapC.cpp ../soapC.cc
-#cp soapBasicHttpBinding_USCOREQuickTellerServiceProxy.cpp ../soapBasicHttpBinding_USCOREQuickTellerServiceProxy.cc
-## copy headers
-#cp soapH.h ../../include/
-#cp soapBasicHttpBinding_USCOREQuickTellerServiceProxy.h ../../include/
-#cp BasicHttpBinding_USCOREQuickTellerService.nsmap ../../include/
-#cp soapStub.h ../../include/
-# copy C++
-#####cp interswitchC.cpp ../interswitchC.cc
-#####cp interswitchBasicHttpBinding_USCOREQuickTellerServiceProxy.cpp ../interswitchBasicHttpBinding_USCOREQuickTellerServiceProxy.cc
-# copy headers
-#####cp interswitchH.h ../../include/
-#####cp interswitchBasicHttpBinding_USCOREQuickTellerServiceProxy.h ../../include/
-#####cp interswitch.nsmap ../../include/
-#####cp interswitchStub.h ../../include/
-#####cd ../..
-echo "Generating paylid proxy..."
-cd shared_tool/paylid
-wsdl2h -npaylid -Npaylid -qpaylid -o PaylidService.h http://www.paylid.com/rsl/service.php?wsdl
-soapcpp2 -n -ppaylid -qpaylid -1 -C -i -I/usr/share/gsoap/import/ PaylidService.h
-# copy C++
-cp paylidC.cpp ../paylidC.cc
-cp paylidpaylidwsdlBindingProxy.cpp ../paylidpaylidwsdlBindingProxy.cc
-# copy headers
-cp paylidH.h ../../include/
-cp paylidStub.h ../../include/
-cp paylid.nsmap ../../include/
-cp paylidpaylidwsdlBindingProxy.h ../../include/
-cd ../..
 
 # Generate extension
 phpize
-./configure --enable-coregrade_api
+./configure
+# --enable-coregrade_api_$LUSER
+#_`id -u -n`
 echo "done."
 cd $BUILD_DIR
 echo $BUILD_DIR
 echo $WORK_DIR
 echo $USER
+
+

coregrade/build/coregrade_api.cc

@@ -0,0 +1,304 @@
+#include "php_coregrade_api.h"
+#include "php_coregrade_api_ns.h"
+#include "coregrade.h"
+#include "cfg.h"
+#include "clog.h"
+#include "vars.h"
+
+#include "safestring.h"
+
+#include <string.h>
+#include <map>
+
+#include <ext/standard/info.h>
+
+zend_object_handlers coregrade_object_handlers;
+
+typedef struct _coregrade_object {
+    CoreGrade *coregrade;
+    zend_object std;
+} coregrade_object;
+
+static inline coregrade_object *php_coregrade_obj_from_obj(zend_object *obj) {
+    return (coregrade_object*)((char*)(obj) - XtOffsetOf(coregrade_object, std));
+}
+
+#define Z_TSTOBJ_P(zv)  php_coregrade_obj_from_obj(Z_OBJ_P((zv)))
+
+zend_class_entry *coregrade_ce;
+
+#define SET_ENV( env ) \
+if (NULL != (token = zend_hash_str_find(_SERVER, env, sizeof(env)-1))) {\
+    setenv( env, Z_STRVAL_P(token), 1 ); \
+    logfmt( logINFO, env " = %s", Z_STRVAL_P(token) ); \
+} else {\
+    unsetenv( env );\
+}
+
+// ------------------------------------------------------------------
+// ------------------------------------------------------------------
+PHP_METHOD(CoreGrade, __construct)
+{
+    HashTable *_SERVER;
+    zval *token;
+    zval *id = getThis();
+    coregrade_object *intern;
+
+    intern = Z_TSTOBJ_P(id);
+    if(intern != NULL) {
+        intern->coregrade = new CoreGrade();
+        // Load some _SERVER data into environment
+        zend_string *_server = zend_string_init("_SERVER", strlen("_SERVER"), 0);
+        zend_is_auto_global(_server);
+        if (Z_TYPE(PG(http_globals)[TRACK_VARS_SERVER]) == IS_UNDEF) {
+            logfmt( logINFO, "_SERVER not found" );
+        } else {
+            logfmt( logINFO, "_SERVER found" );
+            _SERVER = Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]);
+            SET_ENV( "REMOTE_ADDR" );
+            SET_ENV( "SERVER_NAME" );
+            SET_ENV( "HTTP_COOKIE" );
+            SET_ENV( "QUERY_STRING" );
+            SET_ENV( "HTTP_X_FORWARDED_FOR" );
+        }
+        zend_string_release(_server);
+    }
+}
+
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
+PHP_METHOD(CoreGrade, coregrade_api)
+{
+    zval *param, *param_out;
+    zval *id = getThis();
+    coregrade_object *intern;
+    CVars input, output;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &param, &param_out) == FAILURE) {
+        // Bad parameters
+	RETURN_NULL();
+    }
+
+    intern = Z_TSTOBJ_P(id);
+    if(intern != NULL) {
+        // Convert input
+
+        HashTable *hash;
+        zend_string *key, val;
+        ulong num_key;
+        uint key_len;
+        zval *value;
+        convert_to_array_ex( param );
+        hash = HASH_OF( param );
+        zend_hash_internal_pointer_reset( hash );
+        ZEND_HASH_FOREACH_KEY_VAL(hash, num_key, key, value) {
+            if (key) { //HASH_KEY_IS_STRING
+                if (Z_TYPE_P(value) == IS_STRING) { 
+                    input[ ZSTR_VAL(key) ] = Z_STRVAL_P(value);
+                    /*
+                } else if (Z_TYPE_P(value) == IS_LONG) {
+                    input[ ZSTR_VAL(key) ] = Z_LVAL_P(value);
+                } else if (Z_TYPE_P(value) == IS_DOUBLE) {
+                    input[ ZSTR_VAL(key) ] = Z_DVAL_P(value);
+                } else if (Z_TYPE_P(value) == _IS_BOOL) {
+                    input[ ZSTR_VAL(key) ] = Z_BVAL(value) ? 1L : 0L;
+                } else if (Z_TYPE_P(value) == IS_NULL) {
+                    input[ ZSTR_VAL(key) ] = ""; */
+                } else {
+                    //logfmt( logINFO, "Item %s has unsupported value type", ZSTR_VAL(key) );
+                    convert_to_string(value);
+                    input[ ZSTR_VAL(key) ] = Z_STRVAL_P(value);
+                }
+            }
+        } ZEND_HASH_FOREACH_END();
+
+        long retval = intern->coregrade->coregrade_api(input, output);
+
+        // Convert output
+        convert_to_array_ex( param_out ); 
+        CVars::iterator i;
+        int j = 0;
+        const int out_size = output.size(); // 200
+        const int out_value_size = 200;
+        char out_key[out_value_size], out_value[out_value_size];
+        for ( i=output.begin(); i != output.end() && j<out_size ; i++ ) {
+            bzero(out_key, out_value_size);
+            bzero(out_value, out_value_size);
+            j++;
+            logfmt( logINFO, "RET: %s=%s", i->first.c_str(), i->second.c_str() );
+            strsafecpy( out_key, i->first.c_str(), out_value_size );
+            strsafecpy( out_value, i->second.c_str(), out_value_size );
+            add_assoc_string( param_out, out_key, out_value);
+        }                
+
+        RETURN_LONG(retval);
+    }
+
+    RETURN_NULL();
+}
+
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
+PHP_METHOD(CoreGrade, cfgReadChar)
+{
+    unsigned char *parameter;
+    zval *id = getThis();
+    coregrade_object *intern;
+
+    if (zend_parse_parameters(
+      ZEND_NUM_ARGS() TSRMLS_CC, "s", &parameter) == FAILURE) {
+          RETURN_NULL();
+    }
+
+    intern = Z_TSTOBJ_P(id);
+    if(intern != NULL) {
+        std::string s = intern->coregrade->cfgReadChar((char*)parameter);
+        RETURN_STRING(s.c_str());
+    }
+    RETURN_NULL();
+}
+
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
+PHP_METHOD(CoreGrade, cfgReadLong)
+{
+    unsigned char *parameter;
+    zval *id = getThis();
+    coregrade_object *intern;
+
+    if (zend_parse_parameters(
+      ZEND_NUM_ARGS() TSRMLS_CC, "s", &parameter) == FAILURE) {
+          RETURN_NULL();
+    }
+
+    intern = Z_TSTOBJ_P(id);
+    if(intern != NULL) {
+        RETURN_LONG(intern->coregrade->cfgReadLong((char*)parameter));
+    }
+    RETURN_NULL();
+}
+
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
+PHP_METHOD(CoreGrade, logMessage)
+{
+    unsigned char *message;
+    zval *id = getThis();
+    coregrade_object *intern;
+
+    if (zend_parse_parameters(
+      ZEND_NUM_ARGS() TSRMLS_CC, "s", &message) == FAILURE) {
+          RETURN_FALSE;
+    }
+
+    intern = Z_TSTOBJ_P(id);
+    if(intern != NULL) {
+        intern->coregrade->logMessage((char*)message);
+        RETURN_TRUE;
+    }
+    RETURN_FALSE;
+}
+
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
+const zend_function_entry coregrade_methods[] = {
+    PHP_ME(CoreGrade, __construct,   NULL, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
+    PHP_ME(CoreGrade,  coregrade_api, NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(CoreGrade,  cfgReadChar,  NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(CoreGrade,  cfgReadLong,  NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(CoreGrade,  logMessage,   NULL, ZEND_ACC_PUBLIC)
+    PHP_FE_END
+};
+
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
+zend_object *coregrade_object_new(zend_class_entry *ce TSRMLS_DC)
+{
+    coregrade_object *intern = (coregrade_object*)ecalloc(1,
+            sizeof(coregrade_object) +
+            zend_object_properties_size(ce));
+
+    zend_object_std_init(&intern->std, ce TSRMLS_CC);
+    object_properties_init(&intern->std, ce);
+
+    intern->std.handlers = &coregrade_object_handlers;
+
+    return &intern->std;
+}
+
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
+static void coregrade_object_destroy(zend_object *object)
+{
+    coregrade_object *my_obj;
+    my_obj = (coregrade_object*)((char *)
+        object - XtOffsetOf(coregrade_object, std));
+
+    // Call __destruct() from user-land.
+    zend_objects_destroy_object(object);
+}
+
+static void coregrade_object_free(zend_object *object)
+{
+    coregrade_object *my_obj;
+    my_obj = (coregrade_object *)((char *)
+        object - XtOffsetOf(coregrade_object, std));
+    delete my_obj->coregrade;
+    // Free the object using Zend macro.
+    zend_object_std_dtor(object); 
+}
+
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
+PHP_MINIT_FUNCTION(tcoregradeapit)
+{
+    zend_class_entry ce;
+    INIT_NS_CLASS_ENTRY(ce, COREGRADE_API_NS, "CoreGrade", coregrade_methods);
+    coregrade_ce = zend_register_internal_class(&ce TSRMLS_CC);
+    coregrade_ce->create_object = coregrade_object_new;
+
+    memcpy(&coregrade_object_handlers, 
+        zend_get_std_object_handlers(), 
+        sizeof(coregrade_object_handlers));
+
+    // Handler for free'ing the object.
+    coregrade_object_handlers.free_obj = coregrade_object_free;
+
+    // Handler for the destructor.
+    coregrade_object_handlers.dtor_obj = coregrade_object_destroy; 
+
+    // Offset into the engine.
+    coregrade_object_handlers.offset = XtOffsetOf(coregrade_object, std); 
+
+    return SUCCESS;
+}
+
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
+PHP_MINFO_FUNCTION(tcoregradeapit)
+{
+    php_info_print_table_start();
+    php_info_print_table_row(2, "COREGRADE API support", "enabled");
+    php_info_print_table_row(2, "Log File", COREGRADE_LOG);
+    php_info_print_table_row(2, "Config File", COREGRADE_CONFIG"coregrade_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", COREGRADE_API_NS);
+    php_info_print_table_row(2, "Version", PHP_COREGRADE_API_EXTVER);
+    php_info_print_table_end();
+}
+
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
+zend_module_entry tcoregradeapit_module_entry = {
+#if ZEND_MODULE_API_NO >= 20010901
+    STANDARD_MODULE_HEADER,
+#endif
+    PHP_COREGRADE_API_EXTNAME,
+    NULL,                  /* Functions */
+    PHP_MINIT(tcoregradeapit),
+    NULL,                  /* MSHUTDOWN */
+    NULL,                  /* RINIT */
+    NULL,                  /* RSHUTDOWN */
+    PHP_MINFO(tcoregradeapit), /* MINFO */
+#if ZEND_MODULE_API_NO >= 20010901
+    PHP_COREGRADE_API_EXTVER,
+#endif
+    STANDARD_MODULE_PROPERTIES
+};
+
+//#ifdef COMPILE_DL_COREGRADE_API
+extern "C" {
+  ZEND_GET_MODULE(tcoregradeapit)
+}
+//#endif

coregrade/build/php_coregrade_api.h

@@ -0,0 +1,19 @@
+#ifndef PHP_COREGRADE_API_H
+#define PHP_COREGRADE_API_H
+
+#define PHP_COREGRADE_API_EXTNAME  "coregrade_api"
+#define PHP_COREGRADE_API_EXTVER   "0.1"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif 
+
+extern "C" {
+#include "php.h"
+}
+
+extern zend_module_entry coregrade_api_module_entry;
+#define coregrade_api_module_ptr &coregrade_api_module_entry
+#define phpext_coregrade_api_ptr coregrade_api_module_ptr
+
+#endif /* PHP_COREGRADE_API_H */

coregrade/build/php_coregrade_api_ns.h

@@ -0,0 +1 @@
+#define COREGRADE_API_NS "coregrade_api"

coregrade/src/.gitignore

@@ -0,0 +1,83 @@
+# Prerequisites
+*.d
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Linker output
+*.ilk
+*.map
+*.exp
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb
+
+# Kernel Module Compile Results
+*.mod*
+*.cmd
+.tmp_versions/
+modules.order
+Module.symvers
+Mkfile.old
+dkms.conf
+
+# Log files
+*.log
+
+# Misc
+.svn
+.libs
+*.bak
+modules
+mermsemr/src/Makefile
+mermsemr/src/Makefile.objects
+mermsemr/src/config.status
+mermsemr/src/include/php_mermsemr_config.h
+mermsemr/src/include/php_mermsemr_log.h
+mermsemr/src/include/php_tmpl_prefix.h
+mermsemr/src/mailsend/mailsend
+mermsemr/src/autom4te.cache
+mermsemr/src/confdefs.h
+mermsemr/src/config.*
+mermsemr/src/configure*
+mermsemr/src/core/mermsemr_api.cc
+mermsemr/src/include/php_mermsemr_api.h
+mermsemr/src/include/php_mermsemr_api_ns.h
+mermsemr/src/libtool
+
+*.swm
+*.swn
+*.swb
+*.swo
+*.swp
+

coregrade/src/Makefile

@@ -4,17 +4,17 @@ top_srcdir = /home/oameye/coregrade/coregrade/src
 top_builddir = /home/oameye/coregrade/coregrade/src
 EGREP = /usr/bin/grep -E
 SED = /usr/bin/sed
-CONFIGURE_COMMAND = './configure' '--enable-coregrade_api'
+CONFIGURE_COMMAND = './configure'
-CONFIGURE_OPTIONS = '--enable-coregrade_api'
+CONFIGURE_OPTIONS =
 SHLIB_SUFFIX_NAME = so
 SHLIB_DL_SUFFIX_NAME = so
 ZEND_EXT_TYPE = zend_extension
 RE2C = exit 0;
 AWK = gawk
-COREGRADE_API_SHARED_LIBADD = -Wl,-rpath,/usr/lib64 -L/usr/lib64 -lpq -lstdc++ -lcurl -lconfig++ -lgsoapssl++ -lssl -lz
+COREGRADE_API_OAMEYE_SHARED_LIBADD = -Wl,-rpath,/usr/lib64 -L/usr/lib64 -lpq -lstdc++ -lcurl -lconfig++ -ljson-c -lssl -lz -lpcrecpp -lgcc_s
-shared_objects_coregrade_api = core/XmlElements.lo core/XmlParser.lo core/cfg.lo core/cgi.lo core/clog.lo core/coregrade.lo core/coregrade_api.lo core/cvariables.lo core/exceptions.lo core/hmac_sha2.lo core/input.lo core/list.lo core/pgsql.lo core/pgsql_wrapper.lo core/safestring.lo core/sha2.lo core/sha512.lo core/smtp.lo core/timer.lo core/util.lo core/vars.lo shared_tool/account.lo shared_tool/coregrade_api_main.lo shared_tool/email.lo shared_tool/envC.lo shared_tool/groups.lo shared_tool/interswitch.lo shared_tool/interswitchBasicHttpBinding_USCOREQuickTellerServiceProxy.lo shared_tool/interswitchC.lo shared_tool/interswitch_sendmoney.lo shared_tool/namespaces.lo shared_tool/paylid.lo shared_tool/paylidC.lo shared_tool/paylidpaylidwsdlBindingProxy.lo shared_tool/storeface.lo shared_tool/topups.lo
+shared_objects_coregrade_api_oameye = core/XmlElements.lo core/XmlParser.lo core/cfg.lo core/cgi.lo core/clog.lo core/coregrade.lo core/coregrade_api.lo core/cvariables.lo core/exceptions.lo core/hmac_sha2.lo core/input.lo core/list.lo core/pgsql.lo core/pgsql_wrapper.lo core/safestring.lo core/sha2.lo core/sha512.lo core/smtp.lo core/timer.lo core/util.lo core/vars.lo shared_tool/account.lo shared_tool/coregrade_api_main.lo shared_tool/email.lo shared_tool/groups.lo shared_tool/namespaces.lo
-PHP_PECL_EXTENSION = coregrade_api
+PHP_PECL_EXTENSION = coregrade_api_oameye
-PHP_MODULES = $(phplibdir)/coregrade_api.la
+PHP_MODULES = $(phplibdir)/coregrade_api_oameye.la
 PHP_ZEND_EX =
 all_targets = $(PHP_MODULES) $(PHP_ZEND_EX)
 install_targets = install-modules install-headers
@@ -38,7 +38,7 @@ EXTRA_LDFLAGS =
 EXTRA_LIBS =
 INCLUDES = -I/usr/include/php -I/usr/include/php/main -I/usr/include/php/TSRM -I/usr/include/php/Zend -I/usr/include/php/ext -I/usr/include/php/ext/date/lib -I/usr/include/pgsql
 LFLAGS =
-LDFLAGS = -Wl,-rpath,/home/oameye/coregrade/coregrade/src/libconfig-1.3.1/.libs/ -L/home/oameye/coregrade/coregrade/src/libconfig-1.3.1/.libs/
+LDFLAGS =
 SHARED_LIBTOOL =
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 SHELL = /bin/sh
@@ -50,12 +50,12 @@ INSTALL_DATA = $(INSTALL) -m 644
 DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
 
-all: $(all_targets) 
+all: $(all_targets)
 	@echo
 	@echo "Build complete."
 	@echo "Don't forget to run 'make test'."
 	@echo
-	
+
 build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
 
 build-binaries: $(PHP_BINARIES)
@@ -131,7 +131,7 @@ PHP_TEST_SHARED_EXTENSIONS =  ` \
 PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
 
 test: all
-	-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
+	@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
 		INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
 		if test "$$INI_FILE"; then \
 			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
@@ -147,7 +147,9 @@ test: all
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
 			$(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
+		TEST_RESULT_EXIT_CODE=$$?; \
 		rm $(top_builddir)/tmp-php.ini; \
+		exit $$TEST_RESULT_EXIT_CODE; \
 	else \
 		echo "ERROR: Cannot run tests without CLI sapi."; \
 	fi
@@ -155,92 +157,94 @@ test: all
 clean:
 	find . -name \*.gcno -o -name \*.gcda | xargs rm -f
 	find . -name \*.lo -o -name \*.o | xargs rm -f
-	find . -name \*.la -o -name \*.a | xargs rm -f 
+	find . -name \*.la -o -name \*.a | xargs rm -f
 	find . -name \*.so | xargs rm -f
 	find . -name .libs -a -type d|xargs rm -rf
-	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
+	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
 
 distclean: clean
-	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
+	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
+	rm -f php7.spec main/build-defs.h scripts/phpize
+	rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
+	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
+	rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
+	rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h
+	rm -f ext/phar/phar.phar ext/phar/phar.php
+	if test "$(srcdir)" != "$(builddir)"; then \
+	  rm -f ext/phar/phar/phar.inc; \
+	fi
 	$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
 
-.PHONY: all clean install distclean test
+prof-gen:
+	CCACHE_DISABLE=1 $(MAKE) PROF_FLAGS=-fprofile-generate all
+
+prof-clean:
+	find . -name \*.lo -o -name \*.o | xargs rm -f
+	find . -name \*.la -o -name \*.a | xargs rm -f
+	find . -name \*.so | xargs rm -f
+	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
+
+prof-use:
+	CCACHE_DISABLE=1 $(MAKE) PROF_FLAGS=-fprofile-use all
+
+
+.PHONY: all clean install distclean test prof-gen prof-clean prof-use
 .NOEXPORT:
 core/XmlElements.lo: /home/oameye/coregrade/coregrade/src/core/XmlElements.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/XmlElements.cc -o core/XmlElements.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/XmlElements.cc -o core/XmlElements.lo 
 core/XmlParser.lo: /home/oameye/coregrade/coregrade/src/core/XmlParser.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/XmlParser.cc -o core/XmlParser.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/XmlParser.cc -o core/XmlParser.lo 
 core/cfg.lo: /home/oameye/coregrade/coregrade/src/core/cfg.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/cfg.cc -o core/cfg.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/cfg.cc -o core/cfg.lo 
 core/cgi.lo: /home/oameye/coregrade/coregrade/src/core/cgi.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/cgi.cc -o core/cgi.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/cgi.cc -o core/cgi.lo 
 core/clog.lo: /home/oameye/coregrade/coregrade/src/core/clog.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/clog.cc -o core/clog.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/clog.cc -o core/clog.lo 
 core/coregrade.lo: /home/oameye/coregrade/coregrade/src/core/coregrade.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/coregrade.cc -o core/coregrade.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/coregrade.cc -o core/coregrade.lo 
 core/coregrade_api.lo: /home/oameye/coregrade/coregrade/src/core/coregrade_api.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/coregrade_api.cc -o core/coregrade_api.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/coregrade_api.cc -o core/coregrade_api.lo 
 core/cvariables.lo: /home/oameye/coregrade/coregrade/src/core/cvariables.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/cvariables.cc -o core/cvariables.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/cvariables.cc -o core/cvariables.lo 
 core/exceptions.lo: /home/oameye/coregrade/coregrade/src/core/exceptions.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/exceptions.cc -o core/exceptions.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/exceptions.cc -o core/exceptions.lo 
 core/hmac_sha2.lo: /home/oameye/coregrade/coregrade/src/core/hmac_sha2.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/hmac_sha2.cc -o core/hmac_sha2.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/hmac_sha2.cc -o core/hmac_sha2.lo 
 core/input.lo: /home/oameye/coregrade/coregrade/src/core/input.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/input.cc -o core/input.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/input.cc -o core/input.lo 
 core/list.lo: /home/oameye/coregrade/coregrade/src/core/list.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/list.cc -o core/list.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/list.cc -o core/list.lo 
 core/pgsql.lo: /home/oameye/coregrade/coregrade/src/core/pgsql.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/pgsql.cc -o core/pgsql.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/pgsql.cc -o core/pgsql.lo 
 core/pgsql_wrapper.lo: /home/oameye/coregrade/coregrade/src/core/pgsql_wrapper.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/pgsql_wrapper.cc -o core/pgsql_wrapper.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/pgsql_wrapper.cc -o core/pgsql_wrapper.lo 
 core/safestring.lo: /home/oameye/coregrade/coregrade/src/core/safestring.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/safestring.cc -o core/safestring.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/safestring.cc -o core/safestring.lo 
 core/sha2.lo: /home/oameye/coregrade/coregrade/src/core/sha2.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/sha2.cc -o core/sha2.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/sha2.cc -o core/sha2.lo 
 core/sha512.lo: /home/oameye/coregrade/coregrade/src/core/sha512.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/sha512.cc -o core/sha512.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/sha512.cc -o core/sha512.lo 
 core/smtp.lo: /home/oameye/coregrade/coregrade/src/core/smtp.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/smtp.cc -o core/smtp.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/smtp.cc -o core/smtp.lo 
 core/timer.lo: /home/oameye/coregrade/coregrade/src/core/timer.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/timer.cc -o core/timer.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/timer.cc -o core/timer.lo 
 core/util.lo: /home/oameye/coregrade/coregrade/src/core/util.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/util.cc -o core/util.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/util.cc -o core/util.lo 
 core/vars.lo: /home/oameye/coregrade/coregrade/src/core/vars.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/vars.cc -o core/vars.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/vars.cc -o core/vars.lo 
 shared_tool/account.lo: /home/oameye/coregrade/coregrade/src/shared_tool/account.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/account.cc -o shared_tool/account.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/account.cc -o shared_tool/account.lo 
 shared_tool/coregrade_api_main.lo: /home/oameye/coregrade/coregrade/src/shared_tool/coregrade_api_main.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/coregrade_api_main.cc -o shared_tool/coregrade_api_main.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/coregrade_api_main.cc -o shared_tool/coregrade_api_main.lo 
 shared_tool/email.lo: /home/oameye/coregrade/coregrade/src/shared_tool/email.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/email.cc -o shared_tool/email.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/email.cc -o shared_tool/email.lo 
-shared_tool/envC.lo: /home/oameye/coregrade/coregrade/src/shared_tool/envC.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/envC.cc -o shared_tool/envC.lo 
 shared_tool/groups.lo: /home/oameye/coregrade/coregrade/src/shared_tool/groups.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/groups.cc -o shared_tool/groups.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/groups.cc -o shared_tool/groups.lo 
-shared_tool/interswitch.lo: /home/oameye/coregrade/coregrade/src/shared_tool/interswitch.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/interswitch.cc -o shared_tool/interswitch.lo 
-shared_tool/interswitchBasicHttpBinding_USCOREQuickTellerServiceProxy.lo: /home/oameye/coregrade/coregrade/src/shared_tool/interswitchBasicHttpBinding_USCOREQuickTellerServiceProxy.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/interswitchBasicHttpBinding_USCOREQuickTellerServiceProxy.cc -o shared_tool/interswitchBasicHttpBinding_USCOREQuickTellerServiceProxy.lo 
-shared_tool/interswitchC.lo: /home/oameye/coregrade/coregrade/src/shared_tool/interswitchC.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/interswitchC.cc -o shared_tool/interswitchC.lo 
-shared_tool/interswitch_sendmoney.lo: /home/oameye/coregrade/coregrade/src/shared_tool/interswitch_sendmoney.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/interswitch_sendmoney.cc -o shared_tool/interswitch_sendmoney.lo 
 shared_tool/namespaces.lo: /home/oameye/coregrade/coregrade/src/shared_tool/namespaces.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/namespaces.cc -o shared_tool/namespaces.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/namespaces.cc -o shared_tool/namespaces.lo 
-shared_tool/paylid.lo: /home/oameye/coregrade/coregrade/src/shared_tool/paylid.cc
+$(phplibdir)/coregrade_api_oameye.la: ./coregrade_api_oameye.la
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/paylid.cc -o shared_tool/paylid.lo 
+	$(LIBTOOL) --mode=install cp ./coregrade_api_oameye.la $(phplibdir)
-shared_tool/paylidC.lo: /home/oameye/coregrade/coregrade/src/shared_tool/paylidC.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/paylidC.cc -o shared_tool/paylidC.lo 
-shared_tool/paylidpaylidwsdlBindingProxy.lo: /home/oameye/coregrade/coregrade/src/shared_tool/paylidpaylidwsdlBindingProxy.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/paylidpaylidwsdlBindingProxy.cc -o shared_tool/paylidpaylidwsdlBindingProxy.lo 
-shared_tool/storeface.lo: /home/oameye/coregrade/coregrade/src/shared_tool/storeface.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/storeface.cc -o shared_tool/storeface.lo 
-shared_tool/topups.lo: /home/oameye/coregrade/coregrade/src/shared_tool/topups.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/topups.cc -o shared_tool/topups.lo 
-$(phplibdir)/coregrade_api.la: ./coregrade_api.la
-	$(LIBTOOL) --mode=install cp ./coregrade_api.la $(phplibdir)
 
-./coregrade_api.la: $(shared_objects_coregrade_api) $(COREGRADE_API_SHARED_DEPENDENCIES)
+./coregrade_api_oameye.la: $(shared_objects_coregrade_api_oameye) $(COREGRADE_API_OAMEYE_SHARED_DEPENDENCIES)
-	$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_coregrade_api) $(COREGRADE_API_SHARED_LIBADD)
+	$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS)  -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_coregrade_api_oameye) $(COREGRADE_API_OAMEYE_SHARED_LIBADD)
 

coregrade/src/Makefile.global

@@ -5,12 +5,12 @@ INSTALL_DATA = $(INSTALL) -m 644
 DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
 
-all: $(all_targets) 
+all: $(all_targets)
 	@echo
 	@echo "Build complete."
 	@echo "Don't forget to run 'make test'."
 	@echo
-	
+
 build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
 
 build-binaries: $(PHP_BINARIES)
@@ -86,7 +86,7 @@ PHP_TEST_SHARED_EXTENSIONS =  ` \
 PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
 
 test: all
-	-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
+	@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
 		INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
 		if test "$$INI_FILE"; then \
 			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
@@ -102,7 +102,9 @@ test: all
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
 			$(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
+		TEST_RESULT_EXIT_CODE=$$?; \
 		rm $(top_builddir)/tmp-php.ini; \
+		exit $$TEST_RESULT_EXIT_CODE; \
 	else \
 		echo "ERROR: Cannot run tests without CLI sapi."; \
 	fi
@@ -110,14 +112,36 @@ test: all
 clean:
 	find . -name \*.gcno -o -name \*.gcda | xargs rm -f
 	find . -name \*.lo -o -name \*.o | xargs rm -f
-	find . -name \*.la -o -name \*.a | xargs rm -f 
+	find . -name \*.la -o -name \*.a | xargs rm -f
 	find . -name \*.so | xargs rm -f
 	find . -name .libs -a -type d|xargs rm -rf
-	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
+	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
 
 distclean: clean
-	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
+	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
+	rm -f php7.spec main/build-defs.h scripts/phpize
+	rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
+	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
+	rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
+	rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h
+	rm -f ext/phar/phar.phar ext/phar/phar.php
+	if test "$(srcdir)" != "$(builddir)"; then \
+	  rm -f ext/phar/phar/phar.inc; \
+	fi
 	$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
 
-.PHONY: all clean install distclean test
+prof-gen:
+	CCACHE_DISABLE=1 $(MAKE) PROF_FLAGS=-fprofile-generate all
+
+prof-clean:
+	find . -name \*.lo -o -name \*.o | xargs rm -f
+	find . -name \*.la -o -name \*.a | xargs rm -f
+	find . -name \*.so | xargs rm -f
+	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
+
+prof-use:
+	CCACHE_DISABLE=1 $(MAKE) PROF_FLAGS=-fprofile-use all
+
+
+.PHONY: all clean install distclean test prof-gen prof-clean prof-use
 .NOEXPORT:

coregrade/src/Makefile.objects

@@ -1,78 +1,58 @@
 core/XmlElements.lo: /home/oameye/coregrade/coregrade/src/core/XmlElements.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/XmlElements.cc -o core/XmlElements.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/XmlElements.cc -o core/XmlElements.lo 
 core/XmlParser.lo: /home/oameye/coregrade/coregrade/src/core/XmlParser.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/XmlParser.cc -o core/XmlParser.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/XmlParser.cc -o core/XmlParser.lo 
 core/cfg.lo: /home/oameye/coregrade/coregrade/src/core/cfg.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/cfg.cc -o core/cfg.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/cfg.cc -o core/cfg.lo 
 core/cgi.lo: /home/oameye/coregrade/coregrade/src/core/cgi.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/cgi.cc -o core/cgi.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/cgi.cc -o core/cgi.lo 
 core/clog.lo: /home/oameye/coregrade/coregrade/src/core/clog.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/clog.cc -o core/clog.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/clog.cc -o core/clog.lo 
 core/coregrade.lo: /home/oameye/coregrade/coregrade/src/core/coregrade.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/coregrade.cc -o core/coregrade.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/coregrade.cc -o core/coregrade.lo 
 core/coregrade_api.lo: /home/oameye/coregrade/coregrade/src/core/coregrade_api.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/coregrade_api.cc -o core/coregrade_api.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/coregrade_api.cc -o core/coregrade_api.lo 
 core/cvariables.lo: /home/oameye/coregrade/coregrade/src/core/cvariables.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/cvariables.cc -o core/cvariables.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/cvariables.cc -o core/cvariables.lo 
 core/exceptions.lo: /home/oameye/coregrade/coregrade/src/core/exceptions.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/exceptions.cc -o core/exceptions.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/exceptions.cc -o core/exceptions.lo 
 core/hmac_sha2.lo: /home/oameye/coregrade/coregrade/src/core/hmac_sha2.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/hmac_sha2.cc -o core/hmac_sha2.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/hmac_sha2.cc -o core/hmac_sha2.lo 
 core/input.lo: /home/oameye/coregrade/coregrade/src/core/input.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/input.cc -o core/input.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/input.cc -o core/input.lo 
 core/list.lo: /home/oameye/coregrade/coregrade/src/core/list.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/list.cc -o core/list.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/list.cc -o core/list.lo 
 core/pgsql.lo: /home/oameye/coregrade/coregrade/src/core/pgsql.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/pgsql.cc -o core/pgsql.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/pgsql.cc -o core/pgsql.lo 
 core/pgsql_wrapper.lo: /home/oameye/coregrade/coregrade/src/core/pgsql_wrapper.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/pgsql_wrapper.cc -o core/pgsql_wrapper.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/pgsql_wrapper.cc -o core/pgsql_wrapper.lo 
 core/safestring.lo: /home/oameye/coregrade/coregrade/src/core/safestring.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/safestring.cc -o core/safestring.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/safestring.cc -o core/safestring.lo 
 core/sha2.lo: /home/oameye/coregrade/coregrade/src/core/sha2.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/sha2.cc -o core/sha2.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/sha2.cc -o core/sha2.lo 
 core/sha512.lo: /home/oameye/coregrade/coregrade/src/core/sha512.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/sha512.cc -o core/sha512.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/sha512.cc -o core/sha512.lo 
 core/smtp.lo: /home/oameye/coregrade/coregrade/src/core/smtp.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/smtp.cc -o core/smtp.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/smtp.cc -o core/smtp.lo 
 core/timer.lo: /home/oameye/coregrade/coregrade/src/core/timer.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/timer.cc -o core/timer.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/timer.cc -o core/timer.lo 
 core/util.lo: /home/oameye/coregrade/coregrade/src/core/util.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/util.cc -o core/util.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/util.cc -o core/util.lo 
 core/vars.lo: /home/oameye/coregrade/coregrade/src/core/vars.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/vars.cc -o core/vars.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/core/vars.cc -o core/vars.lo 
 shared_tool/account.lo: /home/oameye/coregrade/coregrade/src/shared_tool/account.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/account.cc -o shared_tool/account.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/account.cc -o shared_tool/account.lo 
 shared_tool/coregrade_api_main.lo: /home/oameye/coregrade/coregrade/src/shared_tool/coregrade_api_main.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/coregrade_api_main.cc -o shared_tool/coregrade_api_main.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/coregrade_api_main.cc -o shared_tool/coregrade_api_main.lo 
 shared_tool/email.lo: /home/oameye/coregrade/coregrade/src/shared_tool/email.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/email.cc -o shared_tool/email.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/email.cc -o shared_tool/email.lo 
-shared_tool/envC.lo: /home/oameye/coregrade/coregrade/src/shared_tool/envC.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/envC.cc -o shared_tool/envC.lo 
 shared_tool/groups.lo: /home/oameye/coregrade/coregrade/src/shared_tool/groups.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/groups.cc -o shared_tool/groups.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/groups.cc -o shared_tool/groups.lo 
-shared_tool/interswitch.lo: /home/oameye/coregrade/coregrade/src/shared_tool/interswitch.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/interswitch.cc -o shared_tool/interswitch.lo 
-shared_tool/interswitchBasicHttpBinding_USCOREQuickTellerServiceProxy.lo: /home/oameye/coregrade/coregrade/src/shared_tool/interswitchBasicHttpBinding_USCOREQuickTellerServiceProxy.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/interswitchBasicHttpBinding_USCOREQuickTellerServiceProxy.cc -o shared_tool/interswitchBasicHttpBinding_USCOREQuickTellerServiceProxy.lo 
-shared_tool/interswitchC.lo: /home/oameye/coregrade/coregrade/src/shared_tool/interswitchC.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/interswitchC.cc -o shared_tool/interswitchC.lo 
-shared_tool/interswitch_sendmoney.lo: /home/oameye/coregrade/coregrade/src/shared_tool/interswitch_sendmoney.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/interswitch_sendmoney.cc -o shared_tool/interswitch_sendmoney.lo 
 shared_tool/namespaces.lo: /home/oameye/coregrade/coregrade/src/shared_tool/namespaces.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/namespaces.cc -o shared_tool/namespaces.lo 
+	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.0.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/namespaces.cc -o shared_tool/namespaces.lo 
-shared_tool/paylid.lo: /home/oameye/coregrade/coregrade/src/shared_tool/paylid.cc
+$(phplibdir)/coregrade_api_oameye.la: ./coregrade_api_oameye.la
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/paylid.cc -o shared_tool/paylid.lo 
+	$(LIBTOOL) --mode=install cp ./coregrade_api_oameye.la $(phplibdir)
-shared_tool/paylidC.lo: /home/oameye/coregrade/coregrade/src/shared_tool/paylidC.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/paylidC.cc -o shared_tool/paylidC.lo 
-shared_tool/paylidpaylidwsdlBindingProxy.lo: /home/oameye/coregrade/coregrade/src/shared_tool/paylidpaylidwsdlBindingProxy.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/paylidpaylidwsdlBindingProxy.cc -o shared_tool/paylidpaylidwsdlBindingProxy.lo 
-shared_tool/storeface.lo: /home/oameye/coregrade/coregrade/src/shared_tool/storeface.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/storeface.cc -o shared_tool/storeface.lo 
-shared_tool/topups.lo: /home/oameye/coregrade/coregrade/src/shared_tool/topups.cc
-	$(LIBTOOL) --mode=compile $(CXX) -I/home/oameye/coregrade/coregrade/src/libconfig-1.3.1 -I. -I/home/oameye/coregrade/coregrade/src $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)  -c /home/oameye/coregrade/coregrade/src/shared_tool/topups.cc -o shared_tool/topups.lo 
-$(phplibdir)/coregrade_api.la: ./coregrade_api.la
-	$(LIBTOOL) --mode=install cp ./coregrade_api.la $(phplibdir)
 
-./coregrade_api.la: $(shared_objects_coregrade_api) $(COREGRADE_API_SHARED_DEPENDENCIES)
+./coregrade_api_oameye.la: $(shared_objects_coregrade_api_oameye) $(COREGRADE_API_OAMEYE_SHARED_DEPENDENCIES)
-	$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_coregrade_api) $(COREGRADE_API_SHARED_LIBADD)
+	$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS)  -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_coregrade_api_oameye) $(COREGRADE_API_OAMEYE_SHARED_LIBADD)
 

coregrade/src/autom4te.cache/requests

@@ -15,63 +15,134 @@
                         'configure.in'
                       ],
                       {
-                        'AM_PROG_F77_C_O' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AC_INIT' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        '_AM_COND_IF' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AC_SUBST' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        'AM_PATH_GUILE' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'm4_sinclude' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AM_NLS' => 1,
-                        'AC_FC_PP_DEFINE' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        '_m4_warn' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'LT_INIT' => 1,
-                        'include' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AM_PROG_AR' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'AH_OUTPUT' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'm4_pattern_allow' => 1,
                         'AM_PROG_CC_C_O' => 1,
-                        'sinclude' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AM_POT_TOOLS' => 1,
+                        'AC_CONFIG_LINKS' => 1,
                         'm4_include' => 1,
                         '_AM_COND_ELSE' => 1,
-                        'AC_SUBST_TRACE' => 1
+                        'AM_GNU_GETTEXT' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'AC_FC_PP_DEFINE' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        'AC_SUBST' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        'AC_FC_FREEFORM' => 1,
+                        '_m4_warn' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AC_SUBST_TRACE' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AC_INIT' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_PROG_F77_C_O' => 1,
+                        'include' => 1,
+                        '_AM_COND_IF' => 1,
+                        'sinclude' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'm4_sinclude' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
+                        '_AM_COND_ENDIF' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AM_PROG_MOC' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AC_LIBSOURCE' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AM_PATH_GUILE' => 1,
+                        'AM_PROG_AR' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        'AM_NLS' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'LT_INIT' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1
+                      }
+                    ], 'Autom4te::Request' ),
+             bless( [
+                      '1',
+                      1,
+                      [
+                        '/usr/share/autoconf'
+                      ],
+                      [
+                        '/usr/share/autoconf/autoconf/autoconf.m4f',
+                        'aclocal.m4',
+                        'configure.ac'
+                      ],
+                      {
+                        'LT_INIT' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        'AM_NLS' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
+                        'AM_PATH_GUILE' => 1,
+                        'AM_PROG_AR' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AC_LIBSOURCE' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AM_PROG_MOC' => 1,
+                        '_AM_COND_ENDIF' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'm4_sinclude' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        'sinclude' => 1,
+                        'include' => 1,
+                        '_AM_COND_IF' => 1,
+                        'AM_PROG_F77_C_O' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AC_INIT' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AC_SUBST_TRACE' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'm4_pattern_forbid' => 1,
+                        '_m4_warn' => 1,
+                        'AC_FC_FREEFORM' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        'AC_SUBST' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        'AC_FC_PP_DEFINE' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        '_AM_COND_ELSE' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        'm4_include' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'AM_PROG_CC_C_O' => 1
                       }
                     ], 'Autom4te::Request' )
            );

coregrade/src/build/mkdep.awk

@@ -1,5 +1,5 @@
 #  +----------------------------------------------------------------------+
-#  | PHP Version 5                                                        |
+#  | PHP Version 7                                                        |
 #  +----------------------------------------------------------------------+
 #  | Copyright (c) 2000-2006 The PHP Group                                |
 #  +----------------------------------------------------------------------+
@@ -35,16 +35,16 @@
 	}
 
 	dif=i-1
-		
+
 	for (; i <= NF; i++)
 		filenames[i-dif]=$i
-	
+
 	no_files=NF-dif
-	
+
 	for(i = 1; i <= no_files; i++) {
 		if (system("test -r " filenames[i]) != 0)
 			continue
-		
+
 		target=filenames[i]
 		sub(srcdir "/", "", target)
 		target2=target
@@ -53,7 +53,7 @@
 
 		for (e in used)
 			delete used[e]
-		
+
 		cmdx=cmd " " filenames[i]
 		done=0
 		while ((cmdx | getline) > 0) {
@@ -66,10 +66,10 @@
 					done=1
 					printf(" \\\n\t" substr($3,2,length($3)-2))
 					used[$3] = 1;
-				}	
+				}
 			}
 		}
 		if (done == 1)
 			print "\n"
 	}
-} 
+}

coregrade/src/build/scan_makefile_in.awk

@@ -2,7 +2,7 @@ BEGIN {
 	mode=0
 	sources=""
 }
-	
+
 mode == 0 && /^LTLIBRARY_SOURCES.*\\$/ {
 	if (match($0, "[^=]*$")) {
 	sources=substr($0, RSTART, RLENGTH-1)

coregrade/src/build/shtool

@@ -376,11 +376,11 @@ while [ $# -gt 0 ]; do
             eval "opt_${opt_OPT}=yes"
             ;;
         ':' )
-            #   option with argument (multiple occurances override)
+            #   option with argument (multiple occurrences override)
             eval "opt_${opt_OPT}=\"\$opt_ARG\""
             ;;
         '+' )
-            #   option with argument (multiple occurances append)
+            #   option with argument (multiple occurrences append)
             eval "opt_${opt_OPT}=\"\$opt_${opt_OPT}\${ASC_NL}\$opt_ARG\""
             ;;
         * )
@@ -1003,7 +1003,14 @@ mkdir )
                     if [ ".$opt_t" = .yes ]; then
                         echo "mkdir $pathcomp" 1>&2
                     fi
-                    mkdir $pathcomp || errstatus=$?
+					# See https://bugs.php.net/51076
+					# The fix is from Debian who have sent it
+					# upstream, too; but upstream seems dead.
+                    mkdir $pathcomp || {
+                        _errstatus=$?
+                        [ -d "$pathcomp" ] || errstatus=${_errstatus}
+                        unset _errstatus
+                    }
                     if [ ".$opt_o" != . ]; then
                         if [ ".$opt_t" = .yes ]; then
                             echo "chown $opt_o $pathcomp" 1>&2

coregrade/src/confdefs.h

@@ -5,7 +5,7 @@
 #define PACKAGE_STRING ""
 #define PACKAGE_BUGREPORT ""
 #define PACKAGE_URL ""
-#define COMPILE_DL_COREGRADE_API 1
+#define COMPILE_DL_COREGRADE_API_OAMEYE 1
 #define STDC_HEADERS 1
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_STAT_H 1

coregrade/src/config.guess

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2013-06-10'
+timestamp='2014-11-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@ timestamp='2013-06-10'
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 #
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 
 
 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +149,7 @@ Linux|GNU|GNU/*)
 	LIBC=gnu
 	#endif
 	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
 	;;
 esac
 
@@ -579,8 +579,9 @@ EOF
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/oslevel ] ; then
+	if [ -x /usr/bin/lslpp ] ; then
-		IBM_REV=`/usr/bin/oslevel`
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@@ -826,7 +827,7 @@ EOF
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
@@ -969,10 +970,10 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    or1k:Linux:*:*)
+    openrisc*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo or1k-unknown-linux-${LIBC}
 	exit ;;
-    or32:Linux:*:*)
+    or32:Linux:*:* | or1k*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
@@ -1260,16 +1261,26 @@ EOF
 	if test "$UNAME_PROCESSOR" = unknown ; then
 	    UNAME_PROCESSOR=powerpc
 	fi
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		grep IS_64BIT_ARCH >/dev/null
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-	    then
+		    grep IS_64BIT_ARCH >/dev/null
-		case $UNAME_PROCESSOR in
+		then
-		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    case $UNAME_PROCESSOR in
-		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+			i386) UNAME_PROCESSOR=x86_64 ;;
-		esac
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
 	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
 	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
@@ -1361,154 +1372,6 @@ EOF
 	exit ;;
 esac
 
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
 cat >&2 <<EOF
 $0: unable to guess system type
 

coregrade/src/config.h

@@ -1,8 +1,8 @@
 /* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Whether to build coregrade_api as dynamic module */
+/* Whether to build coregrade_api_oameye as dynamic module */
-#define COMPILE_DL_COREGRADE_API 1
+#define COMPILE_DL_COREGRADE_API_OAMEYE 1
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
@@ -34,8 +34,7 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
-   */
 #define LT_OBJDIR ".libs/"
 
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */

coregrade/src/config.h.in

@@ -1,7 +1,7 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Whether to build coregrade_api as dynamic module */
+/* Whether to build coregrade_api_oameye as dynamic module */
-#undef COMPILE_DL_COREGRADE_API
+#undef COMPILE_DL_COREGRADE_API_OAMEYE
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
@@ -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. */

coregrade/src/config.log

@@ -4,17 +4,17 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by configure, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
-  $ ./configure --enable-coregrade_api
+  $ ./configure 
 
 ## --------- ##
 ## Platform. ##
 ## --------- ##
 
-hostname = localhost.localdomain
+hostname = cregradedev
 uname -m = x86_64
-uname -r = 3.10.0-1062.9.1.el7.x86_64
+uname -r = 4.18.0-193.14.2.el8_2.x86_64
 uname -s = Linux
-uname -v = #1 SMP Fri Dec 6 15:49:49 UTC 2019
+uname -v = #1 SMP Sun Jul 26 03:54:29 UTC 2020
 
 /usr/bin/uname -p = x86_64
 /bin/uname -X     = unknown
@@ -39,83 +39,85 @@ PATH: /home/oameye/bin
 ## Core tests. ##
 ## ----------- ##
 
-configure:2209: checking for grep that handles long lines and -e
+configure:2217: checking for grep that handles long lines and -e
-configure:2267: result: /usr/bin/grep
+configure:2275: result: /usr/bin/grep
-configure:2272: checking for egrep
+configure:2280: checking for egrep
-configure:2334: result: /usr/bin/grep -E
+configure:2342: result: /usr/bin/grep -E
-configure:2339: checking for a sed that does not truncate output
+configure:2347: checking for a sed that does not truncate output
-configure:2403: result: /usr/bin/sed
+configure:2411: result: /usr/bin/sed
-configure:2537: checking for cc
+configure:2550: checking for cc
-configure:2553: found /usr/bin/cc
+configure:2566: found /usr/bin/cc
-configure:2564: result: cc
+configure:2577: result: cc
-configure:2595: checking for C compiler version
+configure:2608: checking for C compiler version
-configure:2604: cc --version >&5
+configure:2617: cc --version >&5
-cc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-39)
+cc (GCC) 8.3.1 20191121 (Red Hat 8.3.1-5)
-Copyright (C) 2015 Free Software Foundation, Inc.
+Copyright (C) 2018 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-configure:2615: $? = 0
+configure:2628: $? = 0
-configure:2604: cc -v >&5
+configure:2617: cc -v >&5
 Using built-in specs.
 COLLECT_GCC=cc
-COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.8.5/lto-wrapper
+COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/8/lto-wrapper
+OFFLOAD_TARGET_NAMES=nvptx-none
+OFFLOAD_TARGET_DEFAULT=1
 Target: x86_64-redhat-linux
-Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-languages=c,c++,objc,obj-c++,java,fortran,ada,go,lto --enable-plugin --enable-initfini-array --disable-libgcj --with-isl=/builddir/build/BUILD/gcc-4.8.5-20150702/obj-x86_64-redhat-linux/isl-install --with-cloog=/builddir/build/BUILD/gcc-4.8.5-20150702/obj-x86_64-redhat-linux/cloog-install --enable-gnu-indirect-function --with-tune=generic --with-arch_32=x86-64 --build=x86_64-redhat-linux
+Configured with: ../configure --enable-bootstrap --enable-languages=c,c++,fortran,lto --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-shared --enable-threads=posix --enable-checking=release --enable-multilib --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-gcc-major-version-only --with-linker-hash-style=gnu --enable-plugin --enable-initfini-array --with-isl --disable-libmpx --enable-offload-targets=nvptx-none --without-cuda-driver --enable-gnu-indirect-function --enable-cet --with-tune=generic --with-arch_32=x86-64 --build=x86_64-redhat-linux
 Thread model: posix
-gcc version 4.8.5 20150623 (Red Hat 4.8.5-39) (GCC) 
+gcc version 8.3.1 20191121 (Red Hat 8.3.1-5) (GCC) 
-configure:2615: $? = 0
+configure:2628: $? = 0
-configure:2604: cc -V >&5
+configure:2617: cc -V >&5
 cc: error: unrecognized command line option '-V'
 cc: fatal error: no input files
 compilation terminated.
-configure:2615: $? = 4
+configure:2628: $? = 1
-configure:2604: cc -qversion >&5
+configure:2617: cc -qversion >&5
-cc: error: unrecognized command line option '-qversion'
+cc: error: unrecognized command line option '-qversion'; did you mean '--version'?
 cc: fatal error: no input files
 compilation terminated.
-configure:2615: $? = 4
+configure:2628: $? = 1
-configure:2635: checking whether the C compiler works
+configure:2648: checking whether the C compiler works
-configure:2657: cc    conftest.c  >&5
+configure:2670: cc    conftest.c  >&5
-configure:2661: $? = 0
+configure:2674: $? = 0
-configure:2709: result: yes
+configure:2722: result: yes
-configure:2712: checking for C compiler default output file name
+configure:2725: checking for C compiler default output file name
-configure:2714: result: a.out
+configure:2727: result: a.out
-configure:2720: checking for suffix of executables
+configure:2733: checking for suffix of executables
-configure:2727: cc -o conftest    conftest.c  >&5
+configure:2740: cc -o conftest    conftest.c  >&5
-configure:2731: $? = 0
+configure:2744: $? = 0
-configure:2753: result: 
+configure:2766: result: 
-configure:2775: checking whether we are cross compiling
+configure:2788: checking whether we are cross compiling
-configure:2783: cc -o conftest    conftest.c  >&5
+configure:2796: cc -o conftest    conftest.c  >&5
-configure:2787: $? = 0
+configure:2800: $? = 0
-configure:2794: ./conftest
+configure:2807: ./conftest
-configure:2798: $? = 0
+configure:2811: $? = 0
-configure:2813: result: no
+configure:2826: result: no
-configure:2818: checking for suffix of object files
+configure:2831: checking for suffix of object files
-configure:2840: cc -c   conftest.c >&5
+configure:2853: cc -c   conftest.c >&5
-configure:2844: $? = 0
+configure:2857: $? = 0
-configure:2865: result: o
+configure:2878: result: o
-configure:2869: checking whether we are using the GNU C compiler
+configure:2882: checking whether we are using the GNU C compiler
-configure:2888: cc -c   conftest.c >&5
+configure:2901: cc -c   conftest.c >&5
-configure:2888: $? = 0
+configure:2901: $? = 0
-configure:2897: result: yes
+configure:2910: result: yes
-configure:2906: checking whether cc accepts -g
+configure:2919: checking whether cc accepts -g
-configure:2926: cc -c -g  conftest.c >&5
+configure:2939: cc -c -g  conftest.c >&5
-configure:2926: $? = 0
+configure:2939: $? = 0
-configure:2967: result: yes
+configure:2980: result: yes
-configure:2984: checking for cc option to accept ISO C89
+configure:2997: checking for cc option to accept ISO C89
-configure:3047: cc  -c -g -O2  conftest.c >&5
+configure:3060: cc  -c -g -O2  conftest.c >&5
-configure:3047: $? = 0
+configure:3060: $? = 0
-configure:3060: result: none needed
+configure:3073: result: none needed
-configure:3086: checking how to run the C preprocessor
+configure:3099: checking how to run the C preprocessor
-configure:3117: cc -E  conftest.c
+configure:3130: cc -E  conftest.c
-configure:3117: $? = 0
+configure:3130: $? = 0
-configure:3131: cc -E  conftest.c
+configure:3144: cc -E  conftest.c
-conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory
+conftest.c:9:10: fatal error: ac_nonexistent.h: No such file or directory
  #include <ac_nonexistent.h>
-                            ^
+          ^~~~~~~~~~~~~~~~~~
 compilation terminated.
-configure:3131: $? = 1
+configure:3144: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@@ -126,15 +128,15 @@ configure: failed program was:
 | #define PACKAGE_URL ""
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:3156: result: cc -E
+configure:3169: result: cc -E
-configure:3176: cc -E  conftest.c
+configure:3189: cc -E  conftest.c
-configure:3176: $? = 0
+configure:3189: $? = 0
-configure:3190: cc -E  conftest.c
+configure:3203: cc -E  conftest.c
-conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory
+conftest.c:9:10: fatal error: ac_nonexistent.h: No such file or directory
  #include <ac_nonexistent.h>
-                            ^
+          ^~~~~~~~~~~~~~~~~~
 compilation terminated.
-configure:3190: $? = 1
+configure:3203: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@@ -145,22 +147,22 @@ configure: failed program was:
 | #define PACKAGE_URL ""
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:3221: checking for icc
+configure:3234: checking for icc
-configure:3230: result: no
+configure:3243: result: no
-configure:3244: checking for suncc
+configure:3257: checking for suncc
-configure:3253: result: no
+configure:3266: result: no
-configure:3271: checking whether cc understands -c and -o together
+configure:3284: checking whether cc understands -c and -o together
-configure:3299: cc -c conftest.c -o conftest2.o >&5
+configure:3312: cc -c conftest.c -o conftest2.o >&5
-configure:3303: $? = 0
+configure:3316: $? = 0
-configure:3309: cc -c conftest.c -o conftest2.o >&5
+configure:3322: cc -c conftest.c -o conftest2.o >&5
-configure:3313: $? = 0
+configure:3326: $? = 0
-configure:3368: result: yes
+configure:3381: result: yes
-configure:3382: checking for system library directory
+configure:3395: checking for system library directory
-configure:3397: result: lib
+configure:3410: result: lib
-configure:3404: checking if compiler supports -R
+configure:3417: checking if compiler supports -R
-configure:3423: cc -o conftest -g -O2   conftest.c -R /usr/lib  >&5
+configure:3436: cc -o conftest -g -O2   conftest.c -R /usr/lib  >&5
 cc: error: unrecognized command line option '-R'
-configure:3423: $? = 1
+configure:3436: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@@ -178,84 +180,86 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:3433: result: no
+configure:3446: result: no
-configure:3438: checking if compiler supports -Wl,-rpath,
+configure:3451: checking if compiler supports -Wl,-rpath,
-configure:3457: cc -o conftest -g -O2   conftest.c -Wl,-rpath,/usr/lib  >&5
+configure:3470: cc -o conftest -g -O2   conftest.c -Wl,-rpath,/usr/lib  >&5
-configure:3457: $? = 0
+configure:3470: $? = 0
-configure:3467: result: yes
+configure:3480: result: yes
-configure:3512: checking build system type
+configure:3525: checking build system type
-configure:3526: result: x86_64-unknown-linux-gnu
+configure:3539: result: x86_64-unknown-linux-gnu
-configure:3546: checking host system type
+configure:3559: checking host system type
-configure:3559: result: x86_64-unknown-linux-gnu
+configure:3572: result: x86_64-unknown-linux-gnu
-configure:3579: checking target system type
+configure:3592: checking target system type
-configure:3592: result: x86_64-unknown-linux-gnu
+configure:3605: result: x86_64-unknown-linux-gnu
-configure:3695: checking for PHP prefix
+configure:3708: checking for PHP prefix
-configure:3697: result: /usr
+configure:3710: result: /usr
-configure:3699: checking for PHP includes
+configure:3712: checking for PHP includes
-configure:3701: result: -I/usr/include/php -I/usr/include/php/main -I/usr/include/php/TSRM -I/usr/include/php/Zend -I/usr/include/php/ext -I/usr/include/php/ext/date/lib
+configure:3714: result: -I/usr/include/php -I/usr/include/php/main -I/usr/include/php/TSRM -I/usr/include/php/Zend -I/usr/include/php/ext -I/usr/include/php/ext/date/lib
-configure:3703: checking for PHP extension directory
+configure:3716: checking for PHP extension directory
-configure:3705: result: /usr/lib64/php/modules
+configure:3718: result: /usr/lib64/php/modules
-configure:3707: checking for PHP installed headers prefix
+configure:3720: checking for PHP installed headers prefix
-configure:3709: result: /usr/include/php
+configure:3722: result: /usr/include/php
-configure:3712: checking if debug is enabled
+configure:3725: checking if debug is enabled
-configure:3738: result: no
+configure:3751: result: no
-configure:3741: checking if zts is enabled
+configure:3754: checking if zts is enabled
-configure:3767: result: no
+configure:3780: result: no
-configure:3838: checking for re2c
+configure:3851: checking for re2c
-configure:3868: result: no
+configure:3881: result: no
-configure:3893: WARNING: You will need re2c 0.13.4 or later if you want to regenerate PHP parsers.
+configure:3906: WARNING: You will need re2c 0.13.4 or later if you want to regenerate PHP parsers.
-configure:3907: checking for gawk
+configure:3920: checking for gawk
-configure:3924: found /usr/bin/gawk
+configure:3937: found /usr/bin/gawk
-configure:3935: result: gawk
+configure:3948: result: gawk
-configure:3978: checking Whether to enable the "coregrade_api" extension
+configure:3991: checking Whether to enable the "coregrade_api_oameye" extension
-configure:4017: result: yes, shared
+configure:4030: result: yes, shared
-configure:4084: checking for g++
+configure:4097: checking for g++
-configure:4100: found /usr/bin/g++
+configure:4113: found /usr/bin/g++
-configure:4111: result: g++
+configure:4124: result: g++
-configure:4138: checking for C++ compiler version
+configure:4151: checking for C++ compiler version
-configure:4147: g++ --version >&5
+configure:4160: g++ --version >&5
-g++ (GCC) 4.8.5 20150623 (Red Hat 4.8.5-39)
+g++ (GCC) 8.3.1 20191121 (Red Hat 8.3.1-5)
-Copyright (C) 2015 Free Software Foundation, Inc.
+Copyright (C) 2018 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-configure:4158: $? = 0
+configure:4171: $? = 0
-configure:4147: g++ -v >&5
+configure:4160: g++ -v >&5
 Using built-in specs.
 COLLECT_GCC=g++
-COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.8.5/lto-wrapper
+COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/8/lto-wrapper
+OFFLOAD_TARGET_NAMES=nvptx-none
+OFFLOAD_TARGET_DEFAULT=1
 Target: x86_64-redhat-linux
-Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-languages=c,c++,objc,obj-c++,java,fortran,ada,go,lto --enable-plugin --enable-initfini-array --disable-libgcj --with-isl=/builddir/build/BUILD/gcc-4.8.5-20150702/obj-x86_64-redhat-linux/isl-install --with-cloog=/builddir/build/BUILD/gcc-4.8.5-20150702/obj-x86_64-redhat-linux/cloog-install --enable-gnu-indirect-function --with-tune=generic --with-arch_32=x86-64 --build=x86_64-redhat-linux
+Configured with: ../configure --enable-bootstrap --enable-languages=c,c++,fortran,lto --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-shared --enable-threads=posix --enable-checking=release --enable-multilib --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-gcc-major-version-only --with-linker-hash-style=gnu --enable-plugin --enable-initfini-array --with-isl --disable-libmpx --enable-offload-targets=nvptx-none --without-cuda-driver --enable-gnu-indirect-function --enable-cet --with-tune=generic --with-arch_32=x86-64 --build=x86_64-redhat-linux
 Thread model: posix
-gcc version 4.8.5 20150623 (Red Hat 4.8.5-39) (GCC) 
+gcc version 8.3.1 20191121 (Red Hat 8.3.1-5) (GCC) 
-configure:4158: $? = 0
+configure:4171: $? = 0
-configure:4147: g++ -V >&5
+configure:4160: g++ -V >&5
 g++: error: unrecognized command line option '-V'
 g++: fatal error: no input files
 compilation terminated.
-configure:4158: $? = 4
+configure:4171: $? = 1
-configure:4147: g++ -qversion >&5
+configure:4160: g++ -qversion >&5
-g++: error: unrecognized command line option '-qversion'
+g++: error: unrecognized command line option '-qversion'; did you mean '--version'?
 g++: fatal error: no input files
 compilation terminated.
-configure:4158: $? = 4
+configure:4171: $? = 1
-configure:4162: checking whether we are using the GNU C++ compiler
+configure:4175: checking whether we are using the GNU C++ compiler
-configure:4181: g++ -c   conftest.cpp >&5
+configure:4194: g++ -c   conftest.cpp >&5
-configure:4181: $? = 0
+configure:4194: $? = 0
-configure:4190: result: yes
+configure:4203: result: yes
-configure:4199: checking whether g++ accepts -g
+configure:4212: checking whether g++ accepts -g
-configure:4219: g++ -c -g  conftest.cpp >&5
+configure:4232: g++ -c -g  conftest.cpp >&5
-configure:4219: $? = 0
+configure:4232: $? = 0
-configure:4260: result: yes
+configure:4273: result: yes
-configure:4288: checking how to run the C++ preprocessor
+configure:4301: checking how to run the C++ preprocessor
-configure:4315: g++ -E  conftest.cpp
+configure:4328: g++ -E  conftest.cpp
-configure:4315: $? = 0
+configure:4328: $? = 0
-configure:4329: g++ -E  conftest.cpp
+configure:4342: g++ -E  conftest.cpp
-conftest.cpp:9:28: fatal error: ac_nonexistent.h: No such file or directory
+conftest.cpp:9:10: fatal error: ac_nonexistent.h: No such file or directory
  #include <ac_nonexistent.h>
-                            ^
+          ^~~~~~~~~~~~~~~~~~
 compilation terminated.
-configure:4329: $? = 1
+configure:4342: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@@ -266,15 +270,15 @@ configure: failed program was:
 | #define PACKAGE_URL ""
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:4354: result: g++ -E
+configure:4367: result: g++ -E
-configure:4374: g++ -E  conftest.cpp
+configure:4387: g++ -E  conftest.cpp
-configure:4374: $? = 0
+configure:4387: $? = 0
-configure:4388: g++ -E  conftest.cpp
+configure:4401: g++ -E  conftest.cpp
-conftest.cpp:9:28: fatal error: ac_nonexistent.h: No such file or directory
+conftest.cpp:9:10: fatal error: ac_nonexistent.h: No such file or directory
  #include <ac_nonexistent.h>
-                            ^
+          ^~~~~~~~~~~~~~~~~~
 compilation terminated.
-configure:4388: $? = 1
+configure:4401: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@@ -285,185 +289,185 @@ configure: failed program was:
 | #define PACKAGE_URL ""
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:5112: checking how to print strings
+configure:5075: checking how to print strings
-configure:5139: result: printf
+configure:5102: result: printf
-configure:5160: checking for a sed that does not truncate output
+configure:5123: checking for a sed that does not truncate output
-configure:5224: result: /usr/bin/sed
+configure:5187: result: /usr/bin/sed
-configure:5242: checking for fgrep
+configure:5205: checking for fgrep
-configure:5304: result: /usr/bin/grep -F
+configure:5267: result: /usr/bin/grep -F
-configure:5339: checking for ld used by cc
+configure:5302: checking for ld used by cc
-configure:5406: result: /usr/bin/ld
+configure:5369: result: /usr/bin/ld
-configure:5413: checking if the linker (/usr/bin/ld) is GNU ld
+configure:5376: checking if the linker (/usr/bin/ld) is GNU ld
-configure:5428: result: yes
+configure:5391: result: yes
-configure:5440: checking for BSD- or MS-compatible name lister (nm)
+configure:5403: checking for BSD- or MS-compatible name lister (nm)
-configure:5489: result: /usr/bin/nm -B
+configure:5457: result: /usr/bin/nm -B
-configure:5619: checking the name lister (/usr/bin/nm -B) interface
+configure:5587: checking the name lister (/usr/bin/nm -B) interface
-configure:5626: cc -c -g -O2  conftest.c >&5
+configure:5594: cc -c -g -O2  conftest.c >&5
-configure:5629: /usr/bin/nm -B "conftest.o"
+configure:5597: /usr/bin/nm -B "conftest.o"
-configure:5632: output
+configure:5600: output
 0000000000000000 B some_variable
-configure:5639: result: BSD nm
+configure:5607: result: BSD nm
-configure:5642: checking whether ln -s works
+configure:5610: checking whether ln -s works
-configure:5646: result: yes
+configure:5614: result: yes
-configure:5654: checking the maximum length of command line arguments
+configure:5622: checking the maximum length of command line arguments
-configure:5784: result: 1572864
+configure:5753: result: 1572864
-configure:5801: checking whether the shell understands some XSI constructs
+configure:5801: checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format
-configure:5811: result: yes
+configure:5841: result: func_convert_file_noop
-configure:5815: checking whether the shell understands "+="
+configure:5848: checking how to convert x86_64-unknown-linux-gnu file names to toolchain format
-configure:5821: result: yes
+configure:5868: result: func_convert_file_noop
-configure:5856: checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format
+configure:5875: checking for /usr/bin/ld option to reload object files
-configure:5896: result: func_convert_file_noop
+configure:5882: result: -r
-configure:5903: checking how to convert x86_64-unknown-linux-gnu file names to toolchain format
+configure:5956: checking for objdump
-configure:5923: result: func_convert_file_noop
+configure:5972: found /usr/bin/objdump
-configure:5930: checking for /usr/bin/ld option to reload object files
+configure:5983: result: objdump
-configure:5937: result: -r
+configure:6015: checking how to recognize dependent libraries
-configure:6011: checking for objdump
+configure:6215: result: pass_all
-configure:6027: found /usr/bin/objdump
+configure:6300: checking for dlltool
-configure:6038: result: objdump
+configure:6330: result: no
-configure:6070: checking how to recognize dependent libraries
+configure:6360: checking how to associate runtime and link libraries
-configure:6272: result: pass_all
+configure:6387: result: printf %s\n
-configure:6357: checking for dlltool
+configure:6447: checking for ar
-configure:6387: result: no
+configure:6463: found /usr/bin/ar
-configure:6417: checking how to associate runtime and link libraries
+configure:6474: result: ar
-configure:6444: result: printf %s\n
+configure:6511: checking for archiver @FILE support
-configure:6504: checking for ar
+configure:6528: cc -c -g -O2  conftest.c >&5
-configure:6520: found /usr/bin/ar
+configure:6528: $? = 0
-configure:6531: result: ar
+configure:6531: ar cru libconftest.a @conftest.lst >&5
-configure:6568: checking for archiver @FILE support
+configure:6534: $? = 0
-configure:6585: cc -c -g -O2  conftest.c >&5
+configure:6539: ar cru libconftest.a @conftest.lst >&5
-configure:6585: $? = 0
-configure:6588: ar cru libconftest.a @conftest.lst >&5
-configure:6591: $? = 0
-configure:6596: ar cru libconftest.a @conftest.lst >&5
 ar: conftest.o: No such file or directory
-configure:6599: $? = 1
+configure:6542: $? = 1
-configure:6611: result: @
+configure:6554: result: @
-configure:6669: checking for strip
+configure:6612: checking for strip
-configure:6685: found /usr/bin/strip
+configure:6628: found /usr/bin/strip
-configure:6696: result: strip
+configure:6639: result: strip
-configure:6768: checking for ranlib
+configure:6711: checking for ranlib
-configure:6784: found /usr/bin/ranlib
+configure:6727: found /usr/bin/ranlib
-configure:6795: result: ranlib
+configure:6738: result: ranlib
-configure:6872: checking for gawk
+configure:6815: checking for gawk
-configure:6899: result: gawk
+configure:6842: result: gawk
-configure:6939: checking command to parse /usr/bin/nm -B output from cc object
+configure:6882: checking command to parse /usr/bin/nm -B output from cc object
-configure:7059: cc -c -g -O2  conftest.c >&5
+configure:7035: cc -c -g -O2  conftest.c >&5
-configure:7062: $? = 0
+configure:7038: $? = 0
-configure:7066: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' | sed '/ __gnu_lto/d' \> conftest.nm
+configure:7042: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' | sed '/ __gnu_lto/d' \> conftest.nm
-configure:7069: $? = 0
+configure:7045: $? = 0
-configure:7135: cc -o conftest -g -O2   -Wl,-rpath,/home/oameye/coregrade/coregrade/src/libconfig-1.3.1/.libs/ -L/home/oameye/coregrade/coregrade/src/libconfig-1.3.1/.libs/ conftest.c conftstm.o >&5
+configure:7111: cc -o conftest -g -O2   conftest.c conftstm.o >&5
-configure:7138: $? = 0
+configure:7114: $? = 0
-configure:7176: result: ok
+configure:7152: result: ok
-configure:7213: checking for sysroot
+configure:7199: checking for sysroot
-configure:7243: result: no
+configure:7229: result: no
-configure:7320: cc -c -g -O2  conftest.c >&5
+configure:7236: checking for a working dd
-configure:7323: $? = 0
+configure:7274: result: /usr/bin/dd
-configure:7499: checking for mt
+configure:7278: checking how to truncate binary pipes
-configure:7529: result: no
+configure:7293: result: /usr/bin/dd bs=4096 count=1
-configure:7549: checking if : is a manifest tool
+configure:7429: cc -c -g -O2  conftest.c >&5
-configure:7555: : '-?'
+configure:7432: $? = 0
-configure:7563: result: no
+configure:7622: checking for mt
-configure:8200: checking for ANSI C header files
+configure:7652: result: no
-configure:8220: cc -c -g -O2  conftest.c >&5
+configure:7672: checking if : is a manifest tool
-configure:8220: $? = 0
+configure:7678: : '-?'
-configure:8293: cc -o conftest -g -O2   -Wl,-rpath,/home/oameye/coregrade/coregrade/src/libconfig-1.3.1/.libs/ -L/home/oameye/coregrade/coregrade/src/libconfig-1.3.1/.libs/ conftest.c -lconfig++ -lstdc++  >&5
+configure:7686: result: no
-configure:8293: $? = 0
+configure:8358: checking for ANSI C header files
-configure:8293: ./conftest
+configure:8378: cc -c -g -O2  conftest.c >&5
-configure:8293: $? = 0
+configure:8378: $? = 0
-configure:8304: result: yes
+configure:8451: cc -o conftest -g -O2   conftest.c -lstdc++  >&5
-configure:8317: checking for sys/types.h
+configure:8451: $? = 0
-configure:8317: cc -c -g -O2  conftest.c >&5
+configure:8451: ./conftest
-configure:8317: $? = 0
+configure:8451: $? = 0
-configure:8317: result: yes
+configure:8462: result: yes
-configure:8317: checking for sys/stat.h
+configure:8475: checking for sys/types.h
-configure:8317: cc -c -g -O2  conftest.c >&5
+configure:8475: cc -c -g -O2  conftest.c >&5
-configure:8317: $? = 0
+configure:8475: $? = 0
-configure:8317: result: yes
+configure:8475: result: yes
-configure:8317: checking for stdlib.h
+configure:8475: checking for sys/stat.h
-configure:8317: cc -c -g -O2  conftest.c >&5
+configure:8475: cc -c -g -O2  conftest.c >&5
-configure:8317: $? = 0
+configure:8475: $? = 0
-configure:8317: result: yes
+configure:8475: result: yes
-configure:8317: checking for string.h
+configure:8475: checking for stdlib.h
-configure:8317: cc -c -g -O2  conftest.c >&5
+configure:8475: cc -c -g -O2  conftest.c >&5
-configure:8317: $? = 0
+configure:8475: $? = 0
-configure:8317: result: yes
+configure:8475: result: yes
-configure:8317: checking for memory.h
+configure:8475: checking for string.h
-configure:8317: cc -c -g -O2  conftest.c >&5
+configure:8475: cc -c -g -O2  conftest.c >&5
-configure:8317: $? = 0
+configure:8475: $? = 0
-configure:8317: result: yes
+configure:8475: result: yes
-configure:8317: checking for strings.h
+configure:8475: checking for memory.h
-configure:8317: cc -c -g -O2  conftest.c >&5
+configure:8475: cc -c -g -O2  conftest.c >&5
-configure:8317: $? = 0
+configure:8475: $? = 0
-configure:8317: result: yes
+configure:8475: result: yes
-configure:8317: checking for inttypes.h
+configure:8475: checking for strings.h
-configure:8317: cc -c -g -O2  conftest.c >&5
+configure:8475: cc -c -g -O2  conftest.c >&5
-configure:8317: $? = 0
+configure:8475: $? = 0
-configure:8317: result: yes
+configure:8475: result: yes
-configure:8317: checking for stdint.h
+configure:8475: checking for inttypes.h
-configure:8317: cc -c -g -O2  conftest.c >&5
+configure:8475: cc -c -g -O2  conftest.c >&5
-configure:8317: $? = 0
+configure:8475: $? = 0
-configure:8317: result: yes
+configure:8475: result: yes
-configure:8317: checking for unistd.h
+configure:8475: checking for stdint.h
-configure:8317: cc -c -g -O2  conftest.c >&5
+configure:8475: cc -c -g -O2  conftest.c >&5
-configure:8317: $? = 0
+configure:8475: $? = 0
-configure:8317: result: yes
+configure:8475: result: yes
-configure:8331: checking for dlfcn.h
+configure:8475: checking for unistd.h
-configure:8331: cc -c -g -O2  conftest.c >&5
+configure:8475: cc -c -g -O2  conftest.c >&5
-configure:8331: $? = 0
+configure:8475: $? = 0
-configure:8331: result: yes
+configure:8475: result: yes
-configure:8548: checking for objdir
+configure:8489: checking for dlfcn.h
-configure:8563: result: .libs
+configure:8489: cc -c -g -O2  conftest.c >&5
-configure:8834: checking if cc supports -fno-rtti -fno-exceptions
+configure:8489: $? = 0
-configure:8852: cc -c -g -O2  -fno-rtti -fno-exceptions conftest.c >&5
+configure:8489: result: yes
-cc1: warning: command line option '-fno-rtti' is valid for C++/ObjC++ but not for C [enabled by default]
+configure:8756: checking for objdir
-configure:8856: $? = 0
+configure:8771: result: .libs
-configure:8869: result: no
+configure:9035: checking if cc supports -fno-rtti -fno-exceptions
-configure:9196: checking for cc option to produce PIC
+configure:9053: cc -c -g -O2  -fno-rtti -fno-exceptions conftest.c >&5
-configure:9203: result: -fPIC -DPIC
+cc1: warning: command line option '-fno-rtti' is valid for C++/ObjC++ but not for C
-configure:9211: checking if cc PIC flag -fPIC -DPIC works
+configure:9057: $? = 0
-configure:9229: cc -c -g -O2  -fPIC -DPIC -DPIC conftest.c >&5
+configure:9070: result: no
-configure:9233: $? = 0
+configure:9428: checking for cc option to produce PIC
-configure:9246: result: yes
+configure:9435: result: -fPIC -DPIC
-configure:9275: checking if cc static flag -static works
+configure:9443: checking if cc PIC flag -fPIC -DPIC works
-configure:9303: result: no
+configure:9461: cc -c -g -O2  -fPIC -DPIC -DPIC conftest.c >&5
-configure:9318: checking if cc supports -c -o file.o
+configure:9465: $? = 0
-configure:9339: cc -c -g -O2  -o out/conftest2.o conftest.c >&5
+configure:9478: result: yes
-configure:9343: $? = 0
+configure:9507: checking if cc static flag -static works
-configure:9365: result: yes
+configure:9535: result: no
-configure:9373: checking if cc supports -c -o file.o
+configure:9550: checking if cc supports -c -o file.o
-configure:9420: result: yes
+configure:9571: cc -c -g -O2  -o out/conftest2.o conftest.c >&5
-configure:9453: checking whether the cc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
+configure:9575: $? = 0
-configure:10606: result: yes
+configure:9597: result: yes
-configure:10643: checking whether -lc should be explicitly linked in
+configure:9605: checking if cc supports -c -o file.o
-configure:10651: cc -c -g -O2  conftest.c >&5
+configure:9652: result: yes
-configure:10654: $? = 0
+configure:9685: checking whether the cc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
-configure:10669: cc -shared  -fPIC -DPIC conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /usr/bin/grep  -lc  \>/dev/null 2\>\&1
+configure:10944: result: yes
-configure:10672: $? = 0
+configure:10981: checking whether -lc should be explicitly linked in
-configure:10686: result: no
+configure:10989: cc -c -g -O2  conftest.c >&5
-configure:10846: checking dynamic linker characteristics
+configure:10992: $? = 0
-configure:11357: cc -o conftest -g -O2   -Wl,-rpath,/home/oameye/coregrade/coregrade/src/libconfig-1.3.1/.libs/ -L/home/oameye/coregrade/coregrade/src/libconfig-1.3.1/.libs/ -Wl,-rpath -Wl,/foo conftest.c -lconfig++ -lstdc++  >&5
+configure:11007: cc -shared  -fPIC -DPIC conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /usr/bin/grep  -lc  \>/dev/null 2\>\&1
-configure:11357: $? = 0
+configure:11010: $? = 0
-configure:11583: result: GNU/Linux ld.so
+configure:11024: result: no
-configure:11690: checking how to hardcode library paths into programs
+configure:11184: checking dynamic linker characteristics
-configure:11715: result: immediate
+configure:11765: cc -o conftest -g -O2   -Wl,-rpath -Wl,/foo conftest.c -lstdc++  >&5
-configure:12255: checking whether stripping libraries is possible
+configure:11765: $? = 0
-configure:12260: result: yes
+configure:12005: result: GNU/Linux ld.so
-configure:12295: checking if libtool supports shared libraries
+configure:12127: checking how to hardcode library paths into programs
-configure:12297: result: yes
+configure:12152: result: immediate
-configure:12300: checking whether to build shared libraries
+configure:12700: checking whether stripping libraries is possible
-configure:12321: result: yes
+configure:12705: result: yes
-configure:12324: checking whether to build static libraries
+configure:12740: checking if libtool supports shared libraries
-configure:12328: result: no
+configure:12742: result: yes
-configure:12351: checking how to run the C++ preprocessor
+configure:12745: checking whether to build shared libraries
-configure:12417: result: g++ -E
+configure:12770: result: yes
-configure:12437: g++ -E  conftest.cpp
+configure:12773: checking whether to build static libraries
-configure:12437: $? = 0
+configure:12777: result: no
-configure:12451: g++ -E  conftest.cpp
+configure:12800: checking how to run the C++ preprocessor
-conftest.cpp:22:28: fatal error: ac_nonexistent.h: No such file or directory
+configure:12866: result: g++ -E
+configure:12886: g++ -E  conftest.cpp
+configure:12886: $? = 0
+configure:12900: g++ -E  conftest.cpp
+conftest.cpp:22:10: fatal error: ac_nonexistent.h: No such file or directory
  #include <ac_nonexistent.h>
-                            ^
+          ^~~~~~~~~~~~~~~~~~
 compilation terminated.
-configure:12451: $? = 1
+configure:12900: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME ""
@@ -472,7 +476,7 @@ configure: failed program was:
 | #define PACKAGE_STRING ""
 | #define PACKAGE_BUGREPORT ""
 | #define PACKAGE_URL ""
-| #define COMPILE_DL_COREGRADE_API 1
+| #define COMPILE_DL_COREGRADE_API_OAMEYE 1
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -487,35 +491,35 @@ configure: failed program was:
 | #define LT_OBJDIR ".libs/"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:12620: checking for ld used by g++
+configure:13062: checking for ld used by g++
-configure:12687: result: /usr/bin/ld -m elf_x86_64
+configure:13129: result: /usr/bin/ld -m elf_x86_64
-configure:12694: checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld
+configure:13136: checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld
-configure:12709: result: yes
+configure:13151: result: yes
-configure:12764: checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
+configure:13206: checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
-configure:13769: result: yes
+configure:14279: result: yes
-configure:13805: g++ -c -g -O2  conftest.cpp >&5
+configure:14315: g++ -c -g -O2  conftest.cpp >&5
-configure:13808: $? = 0
+configure:14318: $? = 0
-configure:14328: checking for g++ option to produce PIC
+configure:14799: checking for g++ option to produce PIC
-configure:14335: result: -fPIC -DPIC
+configure:14806: result: -fPIC -DPIC
-configure:14343: checking if g++ PIC flag -fPIC -DPIC works
+configure:14814: checking if g++ PIC flag -fPIC -DPIC works
-configure:14361: g++ -c -g -O2  -fPIC -DPIC -DPIC conftest.cpp >&5
+configure:14832: g++ -c -g -O2  -fPIC -DPIC -DPIC conftest.cpp >&5
-configure:14365: $? = 0
+configure:14836: $? = 0
-configure:14378: result: yes
+configure:14849: result: yes
-configure:14401: checking if g++ static flag -static works
+configure:14872: checking if g++ static flag -static works
-configure:14429: result: no
+configure:14900: result: no
-configure:14441: checking if g++ supports -c -o file.o
+configure:14912: checking if g++ supports -c -o file.o
-configure:14462: g++ -c -g -O2  -o out/conftest2.o conftest.cpp >&5
+configure:14933: g++ -c -g -O2  -o out/conftest2.o conftest.cpp >&5
-configure:14466: $? = 0
+configure:14937: $? = 0
-configure:14488: result: yes
+configure:14959: result: yes
-configure:14493: checking if g++ supports -c -o file.o
+configure:14964: checking if g++ supports -c -o file.o
-configure:14540: result: yes
+configure:15011: result: yes
-configure:14570: checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
+configure:15041: checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
-configure:14606: result: yes
+configure:15081: result: yes
-configure:14747: checking dynamic linker characteristics
+configure:15222: checking dynamic linker characteristics
-configure:15418: result: GNU/Linux ld.so
+configure:15970: result: GNU/Linux ld.so
-configure:15471: checking how to hardcode library paths into programs
+configure:16035: checking how to hardcode library paths into programs
-configure:15496: result: immediate
+configure:16060: result: immediate
-configure:15796: creating ./config.status
+configure:16359: creating ./config.status
 
 ## ---------------------- ##
 ## Running config.status. ##
@@ -530,11 +534,11 @@ generated by GNU Autoconf 2.69.  Invocation command line was
   CONFIG_COMMANDS = 
   $ ./config.status 
 
-on localhost.localdomain
+on cregradedev
 
-config.status:942: creating config.h
+config.status:944: creating config.h
-config.status:1032: config.h is unchanged
+config.status:1034: config.h is unchanged
-config.status:1046: executing libtool commands
+config.status:1048: executing libtool commands
 
 ## ---------------- ##
 ## Cache variables. ##
@@ -563,6 +567,8 @@ ac_cv_env_LDFLAGS_set=
 ac_cv_env_LDFLAGS_value=
 ac_cv_env_LIBS_set=
 ac_cv_env_LIBS_value=
+ac_cv_env_LT_SYS_LIBRARY_PATH_set=
+ac_cv_env_LT_SYS_LIBRARY_PATH_value=
 ac_cv_env_build_alias_set=
 ac_cv_env_build_alias_value=
 ac_cv_env_host_alias_set=
@@ -586,6 +592,7 @@ ac_cv_path_EGREP='/usr/bin/grep -E'
 ac_cv_path_FGREP='/usr/bin/grep -F'
 ac_cv_path_GREP=/usr/bin/grep
 ac_cv_path_SED=/usr/bin/sed
+ac_cv_path_lt_DD=/usr/bin/dd
 ac_cv_prog_AWK=gawk
 ac_cv_prog_CPP='cc -E'
 ac_cv_prog_CXXCPP='g++ -E'
@@ -626,12 +633,14 @@ lt_cv_prog_gnu_ldcxx=yes
 lt_cv_sharedlib_from_linklib_cmd='printf %s\n'
 lt_cv_shlibpath_overrides_runpath=no
 lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[	 ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[	 ][	 ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'' | sed '\''/ __gnu_lto/d'\'''
-lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\)[ ]*$/  {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/  {"\2", (void *) \&\2},/p'\'''
+lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \(.*\) .*$/  {"\1", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(.*\)$/  {"\1", (void *) \&\1},/p'\'''
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \([^ ]*\)[ ]*$/  {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \(lib[^ ]*\)$/  {"\2", (void *) \&\2},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/  {"lib\2", (void *) \&\2},/p'\'''
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \(.*\) .*$/  {"\1", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(lib.*\)$/  {"\1", (void *) \&\1},/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(.*\)$/  {"lib\1", (void *) \&\1},/p'\'''
-lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\'''
+lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\'''
+lt_cv_sys_global_symbol_to_import=
 lt_cv_sys_max_cmd_len=1572864
 lt_cv_to_host_file_cmd=func_convert_file_noop
 lt_cv_to_tool_file_cmd=func_convert_file_noop
+lt_cv_truncate_bin='/usr/bin/dd bs=4096 count=1'
 php_cv_cc_dashr=no
 php_cv_cc_rpath=yes
 
@@ -643,8 +652,8 @@ AR='ar'
 AWK='gawk'
 CC='cc'
 CFLAGS='-g -O2'
-CONFIGURE_COMMAND=' '\''./configure'\''  '\''--enable-coregrade_api'\'''
+CONFIGURE_COMMAND=' '\''./configure'\'' '
-CONFIGURE_OPTIONS=' '\''--enable-coregrade_api'\'''
+CONFIGURE_OPTIONS=''
 CPP='cc -E'
 CPPFLAGS=' -DHAVE_CONFIG_H'
 CXX='g++'
@@ -662,13 +671,14 @@ EXEEXT=''
 FGREP='/usr/bin/grep -F'
 GREP='/usr/bin/grep'
 LD='/usr/bin/ld -m elf_x86_64'
-LDFLAGS=' -Wl,-rpath,/home/oameye/coregrade/coregrade/src/libconfig-1.3.1/.libs/ -L/home/oameye/coregrade/coregrade/src/libconfig-1.3.1/.libs/'
+LDFLAGS=''
 LIBOBJS=''
-LIBS='-lconfig++ -lstdc++ '
+LIBS='-lstdc++ '
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 LIPO=''
 LN_S='ln -s'
 LTLIBOBJS=''
+LT_SYS_LIBRARY_PATH=''
 MANIFEST_TOOL=':'
 NM='/usr/bin/nm -B'
 NMEDIT=''
@@ -743,7 +753,7 @@ target_vendor='unknown'
 #define PACKAGE_STRING ""
 #define PACKAGE_BUGREPORT ""
 #define PACKAGE_URL ""
-#define COMPILE_DL_COREGRADE_API 1
+#define COMPILE_DL_COREGRADE_API_OAMEYE 1
 #define STDC_HEADERS 1
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_STAT_H 1

coregrade/src/config.m4

@@ -1,31 +1,33 @@
-PHP_ARG_ENABLE(coregrade_api,
+PHP_ARG_ENABLE(coregrade_api_oameye,
-    [Whether to enable the "coregrade_api" extension],
+    [Whether to enable the "coregrade_api_oameye" extension],
-    [  --enable-coregrade_api      Enable "coregrade_api" extension support])
+    [  --enable-coregrade_api_oameye      Enable "coregrade_api_oameye" extension support])
 
-if test $PHP_COREGRADE_API != "no"; then
+if test $PHP_COREGRADE_API_OAMEYE != "no"; then
     PHP_REQUIRE_CXX()
-    PHP_SUBST(COREGRADE_API_SHARED_LIBADD)
+    PHP_SUBST(COREGRADE_API_OAMEYE_SHARED_LIBADD)
-    PHP_ADD_LIBRARY(stdc++, 1, COREGRADE_API_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(stdc++, 1, COREGRADE_API_OAMEYE_SHARED_LIBADD)
     PHP_ADD_INCLUDE(/usr/include/pgsql)
-    PHP_ADD_LIBRARY_WITH_PATH(pq, /usr/lib64,  COREGRADE_API_SHARED_LIBADD)
+    PHP_ADD_LIBRARY_WITH_PATH(pq, /usr/lib64,  COREGRADE_API_OAMEYE_SHARED_LIBADD)
-    PHP_ADD_LIBRARY(curl, 1, COREGRADE_API_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(curl, 1, COREGRADE_API_OAMEYE_SHARED_LIBADD)
-    PHP_ADD_LIBRARY(config++, 1, COREGRADE_API_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(config++, 1, COREGRADE_API_OAMEYE_SHARED_LIBADD)
-    PHP_ADD_LIBRARY(gsoapssl++, 1, COREGRADE_API_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(json-c, 1, COREGRADE_API_OAMEYE_SHARED_LIBADD)
-    PHP_ADD_LIBRARY(ssl, 1, COREGRADE_API_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(ssl, 1, COREGRADE_API_OAMEYE_SHARED_LIBADD)
-    PHP_ADD_LIBRARY(z, 1, COREGRADE_API_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(z, 1, COREGRADE_API_OAMEYE_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(pcrecpp, 1, COREGRADE_API_OAMEYE_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(gcc_s, 1, COREGRADE_API_OAMEYE_SHARED_LIBADD)
 
-    LIBCFG_DIR="`pwd`/libconfig-1.3.1"
+    #LIBCFG_DIR="`pwd`/libconfig-1.3.1"
 
-    PHP_ADD_LIBRARY_WITH_PATH(config++, "$LIBCFG_DIR/.libs/")
+    #PHP_ADD_LIBRARY_WITH_PATH(config++, "$LIBCFG_DIR/.libs/")
 
     PHP_NEW_EXTENSION(
-	coregrade_api, 
+	coregrade_api_oameye, 
 	core/*.cc shared_tool/*.cc, 
 	$ext_shared,
-	,-I@ext_srcdir@/libconfig-1.3.1)
+	,-I@ext_srcdir@/libconfig-1.0.1)
-    PHP_DEFINE([COREGRADE_API_NS],[\"coregrade_api_`id -u -n`\"],[])
+    PHP_DEFINE([COREGRADE_API_OAMEYE_NS],[\"coregrade_api_oameye\"],[])
     PHP_DEFINE([COREGRADE_CONFIG],[\"`pwd|sed s/src//`etc/\"],[])
-    PHP_DEFINE([COREGRADE_LOG],[\"`pwd|sed s/src//`logs/coregrade_api.log\"],[])
+    PHP_DEFINE([COREGRADE_LOG],[\"`pwd|sed s/src//`logs/coregrade_api_oameye.log\"],[])
     PHP_DEFINE([TMPL_PREFIX],[\"`pwd|sed s/src//`email/\"],[])
     PHP_DEFINE([FILELOG_MAX_LEVEL],[9],[])
 fi

coregrade/src/config.nice

@@ -3,5 +3,4 @@
 # Created by configure
 
 './configure' \
-'--enable-coregrade_api' \
 "$@"

coregrade/src/config.status

@@ -421,7 +421,7 @@ $config_commands
 
 Report bugs to the package provider."
 
-ac_cs_config="'--enable-coregrade_api'"
+ac_cs_config=""
 ac_cs_version="\
 config.status
 configured by ./configure, generated by GNU Autoconf 2.69,
@@ -503,7 +503,7 @@ if $ac_cs_silent; then
 fi
 
 if $ac_cs_recheck; then
-  set X /bin/sh './configure'  '--enable-coregrade_api' $ac_configure_extra_args --no-create --no-recursion
+  set X /bin/sh './configure'  $ac_configure_extra_args --no-create --no-recursion
   shift
   $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
   CONFIG_SHELL='/bin/sh'
@@ -532,12 +532,13 @@ _ASBOX
 sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
 double_quote_subst='s/\(["`\\]\)/\\\1/g'
 delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-macro_version='2.4.2'
+macro_version='2.4.6'
-macro_revision='1.3337'
+macro_revision='2.4.6'
 enable_shared='yes'
 enable_static='no'
 pic_mode='default'
 enable_fast_install='yes'
+shared_archive_member_spec=''
 SHELL='/bin/sh'
 ECHO='printf %s\n'
 PATH_SEPARATOR=':'
@@ -586,11 +587,14 @@ CFLAGS='-g -O2'
 compiler='g++'
 GCC='yes'
 lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[	 ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[	 ][	 ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'' | sed '\''/ __gnu_lto/d'\'''
-lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\'''
+lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\'''
-lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\)[ ]*$/  {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/  {"\2", (void *) \&\2},/p'\'''
+lt_cv_sys_global_symbol_to_import=''
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \([^ ]*\)[ ]*$/  {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \(lib[^ ]*\)$/  {"\2", (void *) \&\2},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/  {"lib\2", (void *) \&\2},/p'\'''
+lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \(.*\) .*$/  {"\1", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(.*\)$/  {"\1", (void *) \&\1},/p'\'''
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \(.*\) .*$/  {"\1", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(lib.*\)$/  {"\1", (void *) \&\1},/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(.*\)$/  {"lib\1", (void *) \&\1},/p'\'''
+lt_cv_nm_interface='BSD nm'
 nm_file_list_spec='@'
 lt_sysroot=''
+lt_cv_truncate_bin='/usr/bin/dd bs=4096 count=1'
 objdir='.libs'
 MAGIC_CMD='file'
 lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -610,22 +614,22 @@ shrext_cmds='.so'
 extract_expsyms_cmds=''
 archive_cmds_need_lc='no'
 enable_shared_with_static_runtimes='no'
-export_dynamic_flag_spec='${wl}--export-dynamic'
+export_dynamic_flag_spec='$wl--export-dynamic'
-whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
 compiler_needs_object='no'
 old_archive_from_new_cmds=''
 old_archive_from_expsyms_cmds=''
-archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+            $CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 module_cmds=''
 module_expsym_cmds=''
 with_gnu_ld='yes'
 allow_undefined_flag=''
 no_undefined_flag=''
-hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 hardcode_libdir_separator=''
 hardcode_direct='no'
 hardcode_direct_absolute='no'
@@ -649,16 +653,17 @@ runpath_var='LD_RUN_PATH'
 shlibpath_var='LD_LIBRARY_PATH'
 shlibpath_overrides_runpath='no'
 libname_spec='lib$name'
-library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-soname_spec='${libname}${release}${shared_ext}$major'
+soname_spec='$libname$release$shared_ext$major'
 install_override_mode=''
 postinstall_cmds=''
 postuninstall_cmds=''
 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 finish_eval=''
 hardcode_into_libs='yes'
-sys_lib_search_path_spec='/usr/lib/gcc/x86_64-redhat-linux/4.8.5 /usr/lib64 /lib64 '
+sys_lib_search_path_spec='/usr/lib/gcc/x86_64-redhat-linux/8 /usr/lib64 /lib64 /usr/lib /lib '
-sys_lib_dlsearch_path_spec='/lib64 /usr/lib64 /lib /usr/lib /usr/lib64//bind9-export/ /usr/lib64/dyninst /usr/lib64/mysql '
+configure_time_dlsearch_path='/lib64 /usr/lib64 /lib /usr/lib /usr/lib64//bind9-export/ /usr/lib64/dyninst           '
+configure_time_lt_sys_library_path=''
 hardcode_action='immediate'
 enable_dlopen='unknown'
 enable_dlopen_self='unknown'
@@ -684,19 +689,19 @@ lt_prog_compiler_static_CXX=''
 lt_cv_prog_compiler_c_o_CXX='yes'
 archive_cmds_need_lc_CXX='no'
 enable_shared_with_static_runtimes_CXX='no'
-export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+export_dynamic_flag_spec_CXX='$wl--export-dynamic'
-whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
 compiler_needs_object_CXX='no'
 old_archive_from_new_cmds_CXX=''
 old_archive_from_expsyms_cmds_CXX=''
-archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 module_cmds_CXX=''
 module_expsym_cmds_CXX=''
 with_gnu_ld_CXX='yes'
 allow_undefined_flag_CXX=''
 no_undefined_flag_CXX=''
-hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
 hardcode_libdir_separator_CXX=''
 hardcode_direct_CXX='no'
 hardcode_direct_absolute_CXX='no'
@@ -713,12 +718,12 @@ prelink_cmds_CXX=''
 postlink_cmds_CXX=''
 file_list_spec_CXX=''
 hardcode_action_CXX='immediate'
-compiler_lib_search_dirs_CXX='/usr/lib/gcc/x86_64-redhat-linux/4.8.5 /usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../..'
+compiler_lib_search_dirs_CXX='/usr/lib/gcc/x86_64-redhat-linux/8 /usr/lib/gcc/x86_64-redhat-linux/8/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib/gcc/x86_64-redhat-linux/8/../../..'
-predep_objects_CXX='/usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.8.5/crtbeginS.o'
+predep_objects_CXX='/usr/lib/gcc/x86_64-redhat-linux/8/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/8/crtbeginS.o'
-postdep_objects_CXX='/usr/lib/gcc/x86_64-redhat-linux/4.8.5/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../lib64/crtn.o'
+postdep_objects_CXX='/usr/lib/gcc/x86_64-redhat-linux/8/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/8/../../../../lib64/crtn.o'
 predeps_CXX=''
 postdeps_CXX='-lstdc++ -lm -lgcc_s -lc -lgcc_s'
-compiler_lib_search_path_CXX='-L/usr/lib/gcc/x86_64-redhat-linux/4.8.5 -L/usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../..'
+compiler_lib_search_path_CXX='-L/usr/lib/gcc/x86_64-redhat-linux/8 -L/usr/lib/gcc/x86_64-redhat-linux/8/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/8/../../..'
 
 LTCC='cc'
 LTCFLAGS='-g -O2'
@@ -733,10 +738,10 @@ _LTECHO_EOF'
 }
 
 # Quote evaled strings.
-for var in SHELL ECHO PATH_SEPARATOR SED GREP EGREP FGREP LD NM LN_S lt_SP2NL lt_NL2SP reload_flag OBJDUMP deplibs_check_method file_magic_cmd file_magic_glob want_nocaseglob DLLTOOL sharedlib_from_linklib_cmd AR AR_FLAGS archiver_list_spec STRIP RANLIB CC CFLAGS compiler lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl lt_cv_sys_global_symbol_to_c_name_address lt_cv_sys_global_symbol_to_c_name_address_lib_prefix nm_file_list_spec lt_prog_compiler_no_builtin_flag lt_prog_compiler_pic lt_prog_compiler_wl lt_prog_compiler_static lt_cv_prog_compiler_c_o need_locks MANIFEST_TOOL DSYMUTIL NMEDIT LIPO OTOOL OTOOL64 shrext_cmds export_dynamic_flag_spec whole_archive_flag_spec compiler_needs_object with_gnu_ld allow_undefined_flag no_undefined_flag hardcode_libdir_flag_spec hardcode_libdir_separator exclude_expsyms include_expsyms file_list_spec variables_saved_for_relink libname_spec library_names_spec soname_spec install_override_mode finish_eval old_striplib striplib compiler_lib_search_dirs predep_objects postdep_objects predeps postdeps compiler_lib_search_path LD_CXX reload_flag_CXX compiler_CXX lt_prog_compiler_no_builtin_flag_CXX lt_prog_compiler_pic_CXX lt_prog_compiler_wl_CXX lt_prog_compiler_static_CXX lt_cv_prog_compiler_c_o_CXX export_dynamic_flag_spec_CXX whole_archive_flag_spec_CXX compiler_needs_object_CXX with_gnu_ld_CXX allow_undefined_flag_CXX no_undefined_flag_CXX hardcode_libdir_flag_spec_CXX hardcode_libdir_separator_CXX exclude_expsyms_CXX include_expsyms_CXX file_list_spec_CXX compiler_lib_search_dirs_CXX predep_objects_CXX postdep_objects_CXX predeps_CXX postdeps_CXX compiler_lib_search_path_CXX; do
+for var in SHELL ECHO PATH_SEPARATOR SED GREP EGREP FGREP LD NM LN_S lt_SP2NL lt_NL2SP reload_flag OBJDUMP deplibs_check_method file_magic_cmd file_magic_glob want_nocaseglob DLLTOOL sharedlib_from_linklib_cmd AR AR_FLAGS archiver_list_spec STRIP RANLIB CC CFLAGS compiler lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl lt_cv_sys_global_symbol_to_import lt_cv_sys_global_symbol_to_c_name_address lt_cv_sys_global_symbol_to_c_name_address_lib_prefix lt_cv_nm_interface nm_file_list_spec lt_cv_truncate_bin lt_prog_compiler_no_builtin_flag lt_prog_compiler_pic lt_prog_compiler_wl lt_prog_compiler_static lt_cv_prog_compiler_c_o need_locks MANIFEST_TOOL DSYMUTIL NMEDIT LIPO OTOOL OTOOL64 shrext_cmds export_dynamic_flag_spec whole_archive_flag_spec compiler_needs_object with_gnu_ld allow_undefined_flag no_undefined_flag hardcode_libdir_flag_spec hardcode_libdir_separator exclude_expsyms include_expsyms file_list_spec variables_saved_for_relink libname_spec library_names_spec soname_spec install_override_mode finish_eval old_striplib striplib compiler_lib_search_dirs predep_objects postdep_objects predeps postdeps compiler_lib_search_path LD_CXX reload_flag_CXX compiler_CXX lt_prog_compiler_no_builtin_flag_CXX lt_prog_compiler_pic_CXX lt_prog_compiler_wl_CXX lt_prog_compiler_static_CXX lt_cv_prog_compiler_c_o_CXX export_dynamic_flag_spec_CXX whole_archive_flag_spec_CXX compiler_needs_object_CXX with_gnu_ld_CXX allow_undefined_flag_CXX no_undefined_flag_CXX hardcode_libdir_flag_spec_CXX hardcode_libdir_separator_CXX exclude_expsyms_CXX include_expsyms_CXX file_list_spec_CXX compiler_lib_search_dirs_CXX predep_objects_CXX postdep_objects_CXX predeps_CXX postdeps_CXX compiler_lib_search_path_CXX; do
     case `eval \\$ECHO \\""\\$$var"\\"` in
     *[\\\`\"\$]*)
-      eval "lt_$var=\\\"\`\$ECHO \"\$$var\" | \$SED \"\$sed_quote_subst\"\`\\\""
+      eval "lt_$var=\\\"\`\$ECHO \"\$$var\" | \$SED \"\$sed_quote_subst\"\`\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_$var=\\\"\$$var\\\""
@@ -745,10 +750,10 @@ for var in SHELL ECHO PATH_SEPARATOR SED GREP EGREP FGREP LD NM LN_S lt_SP2NL lt
 done
 
 # Double-quote double-evaled strings.
-for var in reload_cmds old_postinstall_cmds old_postuninstall_cmds old_archive_cmds extract_expsyms_cmds old_archive_from_new_cmds old_archive_from_expsyms_cmds archive_cmds archive_expsym_cmds module_cmds module_expsym_cmds export_symbols_cmds prelink_cmds postlink_cmds postinstall_cmds postuninstall_cmds finish_cmds sys_lib_search_path_spec sys_lib_dlsearch_path_spec reload_cmds_CXX old_archive_cmds_CXX old_archive_from_new_cmds_CXX old_archive_from_expsyms_cmds_CXX archive_cmds_CXX archive_expsym_cmds_CXX module_cmds_CXX module_expsym_cmds_CXX export_symbols_cmds_CXX prelink_cmds_CXX postlink_cmds_CXX; do
+for var in reload_cmds old_postinstall_cmds old_postuninstall_cmds old_archive_cmds extract_expsyms_cmds old_archive_from_new_cmds old_archive_from_expsyms_cmds archive_cmds archive_expsym_cmds module_cmds module_expsym_cmds export_symbols_cmds prelink_cmds postlink_cmds postinstall_cmds postuninstall_cmds finish_cmds sys_lib_search_path_spec configure_time_dlsearch_path configure_time_lt_sys_library_path reload_cmds_CXX old_archive_cmds_CXX old_archive_from_new_cmds_CXX old_archive_from_expsyms_cmds_CXX archive_cmds_CXX archive_expsym_cmds_CXX module_cmds_CXX module_expsym_cmds_CXX export_symbols_cmds_CXX prelink_cmds_CXX postlink_cmds_CXX; do
     case `eval \\$ECHO \\""\\$$var"\\"` in
     *[\\\`\"\$]*)
-      eval "lt_$var=\\\"\`\$ECHO \"\$$var\" | \$SED -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      eval "lt_$var=\\\"\`\$ECHO \"\$$var\" | \$SED -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_$var=\\\"\$$var\\\""
@@ -757,19 +762,16 @@ for var in reload_cmds old_postinstall_cmds old_postuninstall_cmds old_archive_c
 done
 
 ac_aux_dir='.'
-xsi_shell='yes'
-lt_shell_append='yes'
 
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
 # commands through without removal of \ escapes INIT.
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
 
     PACKAGE=''
     VERSION=''
-    TIMESTAMP=''
     RM='rm -f'
     ofile='libtool'
 
@@ -839,7 +841,7 @@ D["PACKAGE_VERSION"]=" \"\""
 D["PACKAGE_STRING"]=" \"\""
 D["PACKAGE_BUGREPORT"]=" \"\""
 D["PACKAGE_URL"]=" \"\""
-D["COMPILE_DL_COREGRADE_API"]=" 1"
+D["COMPILE_DL_COREGRADE_API_OAMEYE"]=" 1"
 D["STDC_HEADERS"]=" 1"
 D["HAVE_SYS_TYPES_H"]=" 1"
 D["HAVE_SYS_STAT_H"]=" 1"
@@ -1052,55 +1054,53 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
   case $ac_file$ac_mode in
     "libtool":C)
 
-    # See if we are running on zsh, and set the options which allow our
+    # See if we are running on zsh, and set the options that allow our
     # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
+    if test -n "${ZSH_VERSION+set}"; then
       setopt NO_GLOB_SUBST
     fi
 
-    cfgfile="${ofile}T"
+    cfgfile=${ofile}T
     trap "$RM \"$cfgfile\"; exit 1" 1 2 15
     $RM "$cfgfile"
 
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
-
+# Generated automatically by $as_me ($PACKAGE) $VERSION
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
 # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
 #
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+# As a special exception to the GNU General Public License, if you
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# distribute this file as part of a program or library that is built
-#                 Foundation, Inc.
+# using GNU Libtool, you may include this file under the  same
-#   Written by Gordon Matzigkeit, 1996
+# distribution terms that you use for the rest of that program.
 #
-#   This file is part of GNU Libtool.
+# GNU Libtool is distributed in the hope that it will be useful, but
-#
+# WITHOUT ANY WARRANTY; without even the implied warranty of
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
 # The names of the tagged configurations supported by this script.
-available_tags="CXX "
+available_tags='CXX '
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
 
 # ### BEGIN LIBTOOL CONFIG
 
@@ -1120,6 +1120,9 @@ pic_mode=$pic_mode
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
 # Shell to use when invoking shell scripts.
 SHELL=$lt_SHELL
 
@@ -1237,18 +1240,27 @@ global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
 # Transform the output of nm in a proper C declaration.
 global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
 # Transform the output of nm in a C name address pair.
 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 
 # Transform the output of nm in a C name address pair when lib prefix is needed.
 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
 
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
 # Specify filename containing input files for \$NM.
 nm_file_list_spec=$lt_nm_file_list_spec
 
-# The root where to search for dependent libraries,and in which our libraries should be installed.
+# The root where to search for dependent libraries,and where our libraries should be installed.
 lt_sysroot=$lt_sysroot
 
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
 
@@ -1339,8 +1351,11 @@ hardcode_into_libs=$hardcode_into_libs
 # Compile-time system search path for libraries.
 sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-# Run-time system search path for libraries.
+# Detected run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
 
 # Whether dlopen is supported.
 dlopen_support=$enable_dlopen
@@ -1433,13 +1448,13 @@ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary.
 hardcode_direct=$hardcode_direct
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
 # library is relocated.
 hardcode_direct_absolute=$hardcode_direct_absolute
 
@@ -1503,6 +1518,65 @@ compiler_lib_search_path=$lt_compiler_lib_search_path
 
 # ### END LIBTOOL CONFIG
 
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
 _LT_EOF
 
   case $host_os in
@@ -1511,7 +1585,7 @@ _LT_EOF
 # AIX sometimes has problems with the GCC collect2 program.  For some
 # reason, if we set the COLLECT_NAMES environment variable, the problems
 # vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
   COLLECT_NAMES=
   export COLLECT_NAMES
 fi
@@ -1520,7 +1594,7 @@ _LT_EOF
   esac
 
 
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
 
 
   # We use sed instead of cat because bash on DJGPP gets confused if
@@ -1530,165 +1604,6 @@ ltmain="$ac_aux_dir/ltmain.sh"
   sed '$q' "$ltmain" >> "$cfgfile" \
      || (rm -f "$cfgfile"; exit 1)
 
-  if test x"$xsi_shell" = xyes; then
-  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\    # positional parameters, so assign one to ordinary parameter first.\
-\    func_stripname_result=${3}\
-\    func_stripname_result=${func_stripname_result#"${1}"}\
-\    func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\    func_split_long_opt_name=${1%%=*}\
-\    func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\    func_split_short_opt_arg=${1#??}\
-\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\    case ${1} in\
-\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\      *)    func_lo2o_result=${1} ;;\
-\    esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
-    func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
-    func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
-    func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
-    eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\    func_quote_for_eval "${2}"\
-\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
-
    mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
@@ -1775,13 +1690,13 @@ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary.
 hardcode_direct=$hardcode_direct_CXX
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
 # library is relocated.
 hardcode_direct_absolute=$hardcode_direct_absolute_CXX
 

coregrade/src/config.sub

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2013-08-10'
+timestamp='2014-12-03'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ timestamp='2013-08-10'
 # of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -261,10 +261,11 @@ case $basic_machine in
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
 	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0 | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -282,8 +283,10 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipsr5900 | mipsr5900el \
@@ -295,11 +298,11 @@ case $basic_machine in
 	| nds32 | nds32le | nds32be \
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
+	| open8 | or1k | or1knd | or32 \
-	| or1k | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
+	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -310,6 +313,7 @@ case $basic_machine in
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -324,7 +328,10 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -377,10 +384,11 @@ case $basic_machine in
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0-* | hppa64-* \
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
@@ -400,8 +408,10 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipsr5900-* | mipsr5900el-* \
@@ -413,6 +423,7 @@ case $basic_machine in
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -430,6 +441,7 @@ case $basic_machine in
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
+	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -767,6 +779,9 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@@ -822,6 +837,10 @@ case $basic_machine in
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -1006,7 +1025,7 @@ case $basic_machine in
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
 		;;
-	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
@@ -1367,14 +1386,14 @@ case $os in
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1392,7 +1411,7 @@ case $os in
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -windows* | -osx | -abug | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@@ -1592,9 +1611,6 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
-	or1k-*)
-		os=-elf
-		;;
 	or32-*)
 		os=-coff
 		;;

coregrade/src/core/coregrade_api.cc

@@ -12,225 +12,261 @@
 
 #include <ext/standard/info.h>
 
-using namespace std;
-
 zend_object_handlers coregrade_object_handlers;
 
-struct coregrade_object {
+typedef struct _coregrade_object {
-    zend_object std;
     CoreGrade *coregrade;
-};
+    zend_object std;
+} coregrade_object;
+
+static inline coregrade_object *php_coregrade_obj_from_obj(zend_object *obj) {
+    return (coregrade_object*)((char*)(obj) - XtOffsetOf(coregrade_object, std));
+}
+
+#define Z_TSTOBJ_P(zv)  php_coregrade_obj_from_obj(Z_OBJ_P((zv)))
 
 zend_class_entry *coregrade_ce;
 
-void coregrade_free_storage(void *object TSRMLS_DC)
-{
-    coregrade_object *obj = (coregrade_object *)object;
-    delete obj->coregrade; 
-
-    zend_hash_destroy(obj->std.properties);
-    FREE_HASHTABLE(obj->std.properties);
-
-    efree(obj);
-}
-
-zend_object_value coregrade_create_handler(zend_class_entry *type TSRMLS_DC)
-{
-    zval *tmp;
-    zend_object_value retval;
-
-    coregrade_object *obj = (coregrade_object *)emalloc(sizeof(coregrade_object));
-    memset(obj, 0, sizeof(coregrade_object));
-    obj->std.ce = type;
-
-    ALLOC_HASHTABLE(obj->std.properties);
-    zend_hash_init(obj->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
-#if PHP_VERSION_ID < 50399
-    zend_hash_copy(obj->std.properties, &type->default_properties,
-        (copy_ctor_func_t)zval_add_ref, (void *)&tmp, sizeof(zval *));
-#else
-    object_properties_init((zend_object*) &(obj->std), type);
-#endif
-    retval.handle = zend_objects_store_put(obj, NULL,
-        coregrade_free_storage, NULL TSRMLS_CC);
-    retval.handlers = &coregrade_object_handlers;
-
-    return retval;
-}
-
 #define SET_ENV( env ) \
-if (zend_hash_find(Z_ARRVAL_PP(array), env, sizeof(env), (void **) &token) == SUCCESS) {\
+if (NULL != (token = zend_hash_str_find(_SERVER, env, sizeof(env)-1))) {\
-    setenv( env, Z_STRVAL_PP(token), 1 ); \
+    setenv( env, Z_STRVAL_P(token), 1 ); \
-    logfmt( logINFO, env " = %s", Z_STRVAL_PP(token) ); \
+    logfmt( logINFO, env " = %s", Z_STRVAL_P(token) ); \
 } else {\
     unsetenv( env );\
 }
 
+// ------------------------------------------------------------------
+// ------------------------------------------------------------------
 PHP_METHOD(CoreGrade, __construct)
 {
-    CoreGrade *coregrade = NULL;
+    HashTable *_SERVER;
-    zval *object = getThis();
+    zval *token;
+    zval *id = getThis();
+    coregrade_object *intern;
 
-    coregrade = new CoreGrade();
+    intern = Z_TSTOBJ_P(id);
-    coregrade_object *obj = (coregrade_object *)zend_object_store_get_object(object TSRMLS_CC);
+    if(intern != NULL) {
-    obj->coregrade = coregrade;
+        intern->coregrade = new CoreGrade();
-
+        // Load some _SERVER data into environment
-    zval **array;
+        zend_string *_server = zend_string_init("_SERVER", strlen("_SERVER"), 0);
-    zval **token;
+        zend_is_auto_global(_server);
-
+        if (Z_TYPE(PG(http_globals)[TRACK_VARS_SERVER]) == IS_UNDEF) {
-    zend_is_auto_global("_SERVER", sizeof("_SERVER")-1 TSRMLS_CC);
+            logfmt( logINFO, "_SERVER not found" );
-    if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &array) == SUCCESS &&
+        } else {
-                Z_TYPE_PP(array) == IS_ARRAY) {
+            logfmt( logINFO, "_SERVER found" );
-	logfmt( logINFO, "_SERVER found" );
+            _SERVER = Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]);
-	SET_ENV( "REMOTE_ADDR" );
+            SET_ENV( "REMOTE_ADDR" );
-	SET_ENV( "SERVER_NAME" );
+            SET_ENV( "SERVER_NAME" );
-	SET_ENV( "HTTP_COOKIE" );
+            SET_ENV( "HTTP_COOKIE" );
-	SET_ENV( "QUERY_STRING" );
+            SET_ENV( "QUERY_STRING" );
-	SET_ENV( "HTTP_X_FORWARDED_FOR" );
+            SET_ENV( "HTTP_X_FORWARDED_FOR" );
-    } else {
+        }
-	logfmt( logINFO, "_SERVER not found" );
+        zend_string_release(_server);
     }
 }
+
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
 PHP_METHOD(CoreGrade, coregrade_api)
 {
     zval *param, *param_out;
+    zval *id = getThis();
+    coregrade_object *intern;
     CVars input, output;
-    CoreGrade *coregrade;
+
-    coregrade_object *obj = (coregrade_object *)zend_object_store_get_object(
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &param, &param_out) == FAILURE) {
-	getThis() TSRMLS_CC);
+        // Bad parameters
-    coregrade = obj->coregrade;
+	RETURN_NULL();
-    if (coregrade != NULL) {
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, const_cast<char *>("zz"), &param, &param_out ) == FAILURE ) {
-	    // Bad parameters
-	    RETURN_NULL();
-	}
-	if (!PZVAL_IS_REF(param_out)) {
-	    // out is not a reference
-            /* This is not relevant in PHP 5.4 */
-#if PHP_VERSION_ID < 50399
-	    zend_error(E_WARNING, "Second parameter wasn't passed by reference");
-	    RETURN_NULL();
-#endif
-	}
-	HashTable *hash; 
-	char *key;
-	uint key_len;
-	zval **value;
-	
-	convert_to_array_ex( &param );
-	hash = HASH_OF( param );
-	zend_hash_internal_pointer_reset( hash );
-	
-	while ( zend_hash_get_current_key( hash, &key, /*num_index*/ NULL, /*duplicate*/ false ) == HASH_KEY_IS_STRING ) {
-	    zend_hash_get_current_data( hash, (void**)&value );
-	    convert_to_string_ex( value );
-	    input[ key ] = Z_STRVAL_PP(value);
-	    zend_hash_move_forward( hash );
-	}
-	
-	long retval = coregrade->coregrade_api(input, output);
-	
-	convert_to_array_ex( &param_out ); 
-	
-	CVars::iterator i; 
-	int j = 0;
-	char out_key[200], out_value[200];
-	for ( i=output.begin(); i != output.end() && j<200 ; i++ ) {
-	    j++;
-	    logfmt( logINFO, "RET: %s=%s", i->first.c_str(), i->second.c_str() );
-	    strsafecpy( out_key, i->first.c_str(), sizeof(out_key) );
-	    strsafecpy( out_value, i->second.c_str(), sizeof(out_value) );
-	    add_assoc_string( param_out, out_key, out_value, true );
-	}
-	
-	RETURN_LONG(retval);
     }
+
+    intern = Z_TSTOBJ_P(id);
+    if(intern != NULL) {
+        // Convert input
+
+        HashTable *hash;
+        zend_string *key, val;
+        ulong num_key;
+        uint key_len;
+        zval *value;
+        convert_to_array_ex( param );
+        hash = HASH_OF( param );
+        zend_hash_internal_pointer_reset( hash );
+        ZEND_HASH_FOREACH_KEY_VAL(hash, num_key, key, value) {
+            if (key) { //HASH_KEY_IS_STRING
+                if (Z_TYPE_P(value) == IS_STRING) { 
+                    input[ ZSTR_VAL(key) ] = Z_STRVAL_P(value);
+                    /*
+                } else if (Z_TYPE_P(value) == IS_LONG) {
+                    input[ ZSTR_VAL(key) ] = Z_LVAL_P(value);
+                } else if (Z_TYPE_P(value) == IS_DOUBLE) {
+                    input[ ZSTR_VAL(key) ] = Z_DVAL_P(value);
+                } else if (Z_TYPE_P(value) == _IS_BOOL) {
+                    input[ ZSTR_VAL(key) ] = Z_BVAL(value) ? 1L : 0L;
+                } else if (Z_TYPE_P(value) == IS_NULL) {
+                    input[ ZSTR_VAL(key) ] = ""; */
+                } else {
+                    //logfmt( logINFO, "Item %s has unsupported value type", ZSTR_VAL(key) );
+                    convert_to_string(value);
+                    input[ ZSTR_VAL(key) ] = Z_STRVAL_P(value);
+                }
+            }
+        } ZEND_HASH_FOREACH_END();
+
+        long retval = intern->coregrade->coregrade_api(input, output);
+
+        // Convert output
+        convert_to_array_ex( param_out ); 
+        CVars::iterator i;
+        int j = 0;
+        const int out_size = output.size(); // 200
+        const int out_value_size = 200;
+        char out_key[out_value_size], out_value[out_value_size];
+        for ( i=output.begin(); i != output.end() && j<out_size ; i++ ) {
+            bzero(out_key, out_value_size);
+            bzero(out_value, out_value_size);
+            j++;
+            logfmt( logINFO, "RET: %s=%s", i->first.c_str(), i->second.c_str() );
+            strsafecpy( out_key, i->first.c_str(), out_value_size );
+            strsafecpy( out_value, i->second.c_str(), out_value_size );
+            add_assoc_string( param_out, out_key, out_value);
+        }                
+
+        RETURN_LONG(retval);
+    }
+
     RETURN_NULL();
 }
+
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
 PHP_METHOD(CoreGrade, cfgReadChar)
 {
-    CoreGrade *coregrade;
+    unsigned char *parameter;
-    coregrade_object *obj = (coregrade_object *)zend_object_store_get_object(
+    zval *id = getThis();
-        getThis() TSRMLS_CC);
+    coregrade_object *intern;
-    coregrade = obj->coregrade;
+
-    if (coregrade != NULL) {
+    if (zend_parse_parameters(
-	char *parameter;
+      ZEND_NUM_ARGS() TSRMLS_CC, "s", &parameter) == FAILURE) {
-	int parameter_len;
+          RETURN_NULL();
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, const_cast<char *>("s"), &parameter, &parameter_len) == FAILURE) {
+    }
-	    RETURN_NULL();
+
-	}
+    intern = Z_TSTOBJ_P(id);
-	if (parameter_len == 0) {
+    if(intern != NULL) {
-	    RETURN_NULL();
+        std::string s = intern->coregrade->cfgReadChar((char*)parameter);
-	}
+        RETURN_STRING(s.c_str());
-	RETURN_STRING(coregrade->cfgReadChar(parameter),1);
     }
     RETURN_NULL();
 }
+
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
 PHP_METHOD(CoreGrade, cfgReadLong)
 {
-    CoreGrade *coregrade;
+    unsigned char *parameter;
-    coregrade_object *obj = (coregrade_object *)zend_object_store_get_object(
+    zval *id = getThis();
-        getThis() TSRMLS_CC);
+    coregrade_object *intern;
-    coregrade = obj->coregrade;
+
-    if (coregrade != NULL) {
+    if (zend_parse_parameters(
-	char *parameter;
+      ZEND_NUM_ARGS() TSRMLS_CC, "s", &parameter) == FAILURE) {
-	int parameter_len;
+          RETURN_NULL();
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, const_cast<char *>("s"), &parameter, &parameter_len) == FAILURE) {
+    }
-	    RETURN_NULL();
+
-	}
+    intern = Z_TSTOBJ_P(id);
-	if (parameter_len == 0) {
+    if(intern != NULL) {
-	    RETURN_NULL();
+        RETURN_LONG(intern->coregrade->cfgReadLong((char*)parameter));
-	}
-	RETURN_LONG(coregrade->cfgReadLong(parameter));
     }
     RETURN_NULL();
 }
+
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
 PHP_METHOD(CoreGrade, logMessage)
 {
-    CoreGrade *coregrade;
+    unsigned char *message;
-    coregrade_object *obj = (coregrade_object *)zend_object_store_get_object(
+    zval *id = getThis();
-        getThis() TSRMLS_CC);
+    coregrade_object *intern;
-    coregrade = obj->coregrade;
+
-    if (coregrade != NULL) {
+    if (zend_parse_parameters(
-	char *message;
+      ZEND_NUM_ARGS() TSRMLS_CC, "s", &message) == FAILURE) {
-	int message_len;
+          RETURN_FALSE;
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, const_cast<char *>("s"), &message, &message_len) == FAILURE) {
-	    RETURN_FALSE;
-	}
-	if (message_len == 0) {
-	    RETURN_FALSE;
-	}
-	coregrade->logMessage((const char *)message);
     }
-    RETURN_TRUE;
+
+    intern = Z_TSTOBJ_P(id);
+    if(intern != NULL) {
+        intern->coregrade->logMessage((char*)message);
+        RETURN_TRUE;
+    }
+    RETURN_FALSE;
 }
-#if PHP_VERSION_ID < 50399
+
-function_entry coregrade_methods[] = {
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
-#else
+const zend_function_entry coregrade_methods[] = {
-zend_function_entry coregrade_methods[] = {
+    PHP_ME(CoreGrade, __construct,   NULL, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
-#endif
+    PHP_ME(CoreGrade,  coregrade_api, NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(CoreGrade,  __construct,     NULL, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
+    PHP_ME(CoreGrade,  cfgReadChar,  NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(CoreGrade,  coregrade_api,         NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(CoreGrade,  cfgReadLong,  NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(CoreGrade,  cfgReadChar,     NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(CoreGrade,  logMessage,   NULL, ZEND_ACC_PUBLIC)
-    PHP_ME(CoreGrade,  cfgReadLong,     NULL, ZEND_ACC_PUBLIC)
+    PHP_FE_END
-    PHP_ME(CoreGrade,  logMessage,      NULL, ZEND_ACC_PUBLIC)
-    {NULL, NULL, NULL}
 };
 
-PHP_MINIT_FUNCTION(coregrade_api)
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
+zend_object *coregrade_object_new(zend_class_entry *ce TSRMLS_DC)
+{
+    coregrade_object *intern = (coregrade_object*)ecalloc(1,
+            sizeof(coregrade_object) +
+            zend_object_properties_size(ce));
+
+    zend_object_std_init(&intern->std, ce TSRMLS_CC);
+    object_properties_init(&intern->std, ce);
+
+    intern->std.handlers = &coregrade_object_handlers;
+
+    return &intern->std;
+}
+
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
+static void coregrade_object_destroy(zend_object *object)
+{
+    coregrade_object *my_obj;
+    my_obj = (coregrade_object*)((char *)
+        object - XtOffsetOf(coregrade_object, std));
+
+    // Call __destruct() from user-land.
+    zend_objects_destroy_object(object);
+}
+
+static void coregrade_object_free(zend_object *object)
+{
+    coregrade_object *my_obj;
+    my_obj = (coregrade_object *)((char *)
+        object - XtOffsetOf(coregrade_object, std));
+    delete my_obj->coregrade;
+    // Free the object using Zend macro.
+    zend_object_std_dtor(object); 
+}
+
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
+PHP_MINIT_FUNCTION(coregrade_api_oameye)
 {
     zend_class_entry ce;
-    INIT_NS_CLASS_ENTRY(ce, COREGRADE_API_NS, "CoreGrade", coregrade_methods); 
+    INIT_NS_CLASS_ENTRY(ce, COREGRADE_API_OAMEYE_NS, "CoreGrade", coregrade_methods);
-    //INIT_CLASS_ENTRY(ce, "CoreGrade", coregrade_methods);
     coregrade_ce = zend_register_internal_class(&ce TSRMLS_CC);
-    coregrade_ce->create_object = coregrade_create_handler;
+    coregrade_ce->create_object = coregrade_object_new;
-    memcpy(&coregrade_object_handlers,
+
-        zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+    memcpy(&coregrade_object_handlers, 
-    coregrade_object_handlers.clone_obj = NULL;
+        zend_get_std_object_handlers(), 
+        sizeof(coregrade_object_handlers));
+
+    // Handler for free'ing the object.
+    coregrade_object_handlers.free_obj = coregrade_object_free;
+
+    // Handler for the destructor.
+    coregrade_object_handlers.dtor_obj = coregrade_object_destroy; 
+
+    // Offset into the engine.
+    coregrade_object_handlers.offset = XtOffsetOf(coregrade_object, std); 
+
     return SUCCESS;
 }
 
-PHP_MINFO_FUNCTION(coregrade_api)
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
+PHP_MINFO_FUNCTION(coregrade_api_oameye)
 {
     php_info_print_table_start();
     php_info_print_table_row(2, "COREGRADE API support", "enabled");
@@ -238,29 +274,31 @@ PHP_MINFO_FUNCTION(coregrade_api)
     php_info_print_table_row(2, "Config File", COREGRADE_CONFIG"coregrade_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, "COREGRADE API Version", PHP_COREGRADE_API_EXTVER);
+    php_info_print_table_row(2, "Namespace", COREGRADE_API_OAMEYE_NS);
+    php_info_print_table_row(2, "Version", PHP_COREGRADE_API_OAMEYE_EXTVER);
     php_info_print_table_end();
 }
 
-zend_module_entry coregrade_api_module_entry = {
+// ------------------------------------------------------------------ // ------------------------------------------------------------------
+zend_module_entry coregrade_api_oameye_module_entry = {
 #if ZEND_MODULE_API_NO >= 20010901
     STANDARD_MODULE_HEADER,
 #endif
-    COREGRADE_API_NS,
+    PHP_COREGRADE_API_OAMEYE_EXTNAME,
     NULL,                  /* Functions */
-    PHP_MINIT(coregrade_api),
+    PHP_MINIT(coregrade_api_oameye),
     NULL,                  /* MSHUTDOWN */
     NULL,                  /* RINIT */
     NULL,                  /* RSHUTDOWN */
-    PHP_MINFO(coregrade_api),    /* MINFO */
+    PHP_MINFO(coregrade_api_oameye), /* MINFO */
 #if ZEND_MODULE_API_NO >= 20010901
-    PHP_COREGRADE_API_EXTVER,
+    PHP_COREGRADE_API_OAMEYE_EXTVER,
 #endif
     STANDARD_MODULE_PROPERTIES
 };
 
-#ifdef COMPILE_DL_COREGRADE_API
+//#ifdef COMPILE_DL_COREGRADE_API_OAMEYE
 extern "C" {
-ZEND_GET_MODULE(coregrade_api)
+  ZEND_GET_MODULE(coregrade_api_oameye)
 }
-#endif
+//#endif

coregrade/src/core/pgsql_wrapper.cc

@@ -9,6 +9,15 @@
 #include <cstring>
 #include <cstdlib>
 
+void map_to_cvars(map<const char *,const char *>f, CVars &rec)
+{
+  map<const char *,const char *>::iterator it;
+  for(it = f.begin(); it != f.end(); it++) {
+    logfmt( logINFO, "f[%s] = %s", it->first, it->second );
+    rec[it->first] = it->second;
+  }
+}
+
 void load_db_record( const char * table, CVars &rec, const char * where, ... )
 {
   logfmt( FLOG_MAX, "void load_db_record( const char * table, CVars &rec, const char * where, ... )");
@@ -162,7 +171,7 @@ long insert_db_record( int mode, const char *table, const char *seq, CVars &rec
       throw err("Binary parameters are not supported");
     }
     else
-      vals += string("'") + esc(i->second.c_str()) + "'";
+      vals += string("E'") + esc(i->second.c_str()) + "'";
 
     /*strcatf( cols, sizeof(cols), "%s%s", first?"":",", i->first.c_str() );
     strcatf( vals, sizeof(vals), "%s'%s'", first?"":",", i->second.c_str() );*/
@@ -217,7 +226,7 @@ void v_update_db_record( int mode, const char * table, CVars &rec, const char *i
     cols += string(first?"":",") + i->first + "=";
 
     if ( ! i->second.binary() )
-      cols += string("'") + esc(i->second.c_str()) + "'";
+      cols += string("E'") + esc(i->second.c_str()) + "'";
     else
     {
 /*
@@ -339,6 +348,7 @@ char * CEscape::EscapeReal( const char * cmd, char * _esc, int sz )
 
     strnsafecpy( d, c, c1-c, dend-d );
     d += strlen(d);
+    //if (*(c1+0)=='\'') strcatf( d, dend-d, "'%c", *c1 );
     strcatf( d, dend-d, "\\%c", *c1 );
     d += strlen(d);
     c = c1+1;

coregrade/src/include/php_coregrade_api.h

@@ -1,8 +1,8 @@
-#ifndef PHP_COREGRADE_API_H
+#ifndef PHP_COREGRADE_API_OAMEYE_H
-#define PHP_COREGRADE_API_H
+#define PHP_COREGRADE_API_OAMEYE_H
 
-#define PHP_COREGRADE_API_EXTNAME  "coregrade_api"
+#define PHP_COREGRADE_API_OAMEYE_EXTNAME  "coregrade_api_oameye"
-#define PHP_COREGRADE_API_EXTVER   "0.1"
+#define PHP_COREGRADE_API_OAMEYE_EXTVER   "0.1"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -12,7 +12,8 @@ extern "C" {
 #include "php.h"
 }
 
-extern zend_module_entry coregrade_api_module_entry;
+extern zend_module_entry coregrade_api_oameye_module_entry;
-#define phpext_coregrade_api_ptr &coregrade_api_module_entry;
+#define coregrade_api_oameye_module_ptr &coregrade_api_oameye_module_entry
+#define phpext_coregrade_api_oameye_ptr coregrade_api_oameye_module_ptr
 
-#endif /* PHP_COREGRADE_API_H */
+#endif /* PHP_COREGRADE_API_OAMEYE_H */

coregrade/src/include/php_coregrade_api_ns.h

@@ -1 +1 @@
-#define COREGRADE_API_NS "coregrade_api_oameye"
+#define COREGRADE_API_OAMEYE_NS "coregrade_api_oameye"

coregrade/src/include/php_coregrade_log.h

@@ -1 +1 @@
-#define COREGRADE_LOG "/home/oameye/coregrade/coregrade/logs/coregrade_api.log"
+#define COREGRADE_LOG "/home/oameye/coregrade/coregrade/logs/coregrade_api_oameye.log"