Show
Ignore:
Timestamp:
07/27/06 16:45:55 (2 years ago)
Author:
bart
Message:

* Wrong ifdef in compile fix for php 5.2
* Update config.w32, VC6 and VC2005 project files
* Fix debug build for win32, this fixes ticket #149
* Removed a debug statement and added return value in optimizer.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • eaccelerator/trunk/config.w32

    r239 r249  
    33 
    44ARG_ENABLE("eaccelerator", "Enable eaccelerator support", "no"); 
    5 ARG_ENABLE("eloader", "Enable eloader support", "no"); 
    65 
    76ARG_WITH("eaccelerator-crash-detection", "Include eaccelerator crash detection", "yes"); 
    87ARG_WITH("eaccelerator-optimizer", "Include eaccelerator optimizer", "yes"); 
    9 ARG_WITH("eaccelerator-encoder", "Include eaccelerator encoder", "yes"); 
    10 ARG_WITH("eaccelerator-loader", "Include eaccelerator loader", "yes"); 
    118ARG_WITH("eaccelerator-shared-memory", "Include eaccelerator shared memory functions", "no"); 
    129ARG_WITH("eaccelerator-sessions", "Include eaccelerator sessions", "no"); 
    …… 
    1613ARG_WITH("eaccelerator-debug", "Enable the debug code so eaccelerator logs verbosely", "no"); 
    1714 
    18 if (PHP_EACCELERATOR != "no" && PHP_ELOADER != "no") { 
    19         ERROR("You can't enable eaccelerator and eloader support at the same time."); 
    20 } 
    21  
    2215if (PHP_EACCELERATOR != "no") { 
    23         EXTENSION("eaccelerator", "eaccelerator.c optimize.c encoder.c loader.c opcodes.c content.c mm.c session.c shm.c debug.c cache.c ea_restore.c ea_store.c ea_info.c ea_dasm.c", PHP_EACCELERATOR_SHARED); 
     16        EXTENSION("eaccelerator", "eaccelerator.c optimize.c opcodes.c content.c mm.c session.c shm.c debug.c cache.c ea_restore.c ea_store.c ea_info.c ea_dasm.c", PHP_EACCELERATOR_SHARED); 
    2417        AC_DEFINE("HAVE_EACCELERATOR", 1, "Define if you like to use eAccelerator"); 
    2518 
    …… 
    2922        if (PHP_EACCELERATOR_OPTIMIZER != "no") { 
    3023                AC_DEFINE("WITH_EACCELERATOR_OPTIMIZER", 1, "Define if you like to use peephole opcode optimization"); 
    31         } 
    32         if (PHP_EACCELERATOR_ENCODER != "no") { 
    33                 AC_DEFINE("WITH_EACCELERATOR_ENCODER", 1, "Define if you like to use eAccelerator enoder"); 
    34         } 
    35         if (PHP_EACCELERATOR_LOADER != "no" && PHP_ELOADER == "no") { 
    36                 AC_DEFINE("WITH_EACCELERATOR_LOADER", 1, "Define if you like to load files encoded by eAccelerator encoder"); 
    3724        } 
    3825        if (PHP_EACCELERATOR_SHARED_MEMORY != "no" || PHP_EACCELERATOR_CONTENT_CACHING != "no") { 
    …… 
    5744        AC_DEFINE("HAVE_EXT_SESSION_PHP_SESSION_H", 1, "Define if you have the <ext/session/php_session.h> header file."); 
    5845} 
    59  
    60 if (PHP_ELOADER != "no") { 
    61         EXTENSION("eloader", "loader.c opcodes.c ea_restore.c", PHP_ELOADER_SHARED, "/D HAVE_EACCELERATOR_STANDALONE_LOADER"); 
    62         AC_DEFINE("HAVE_EACCELERATOR", 1, "Define if you like to use eAccelerator"); 
    63  
    64         AC_DEFINE("WITH_EACCELERATOR_LOADER", 1, "Define if you like to load files encoded by eAccelerator encoder"); 
    65 }