Changeset 4089

Show
Ignore:
Timestamp:
Sat Nov 12 13:36:00 2005
Author:
mugur
Message:

fixed ticket:1522 - Remove M4 from list of dependencies

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/campsite/configure

    r4088 r4089  
    161 161 if [ "$c_define_start_env" != "--define_start_env" ]; then  
    162 162  
    163   for m in ls m4 gcc gpp pear curl; do  
      163 for m in ls gcc gpp pear curl; do  
    163 163     check4_$m  
    164 164     [ $? -ne 0 ] && echo $output && exit 1  
    227 227 export PROCESSOR_TYPE=\`uname -m\`  
    228 228 export MAKE=$MAKE  
    229   export M4=$M4  
    230 229 export IMPLEMENTATION_PARTS=$IMPLEMENTATION_PARTS  
    231 230 export HAVE_GETHOSTBYADDR_R=$HAVE_GETHOSTBYADDR_R  

  • trunk/campsite/INSTALL

    r4035 r4089  
    23 23    must be installed. On Mandrake fileutils package must be installed.  
    24 24  
    25   3. m4 macro tool  
    26      Usually the m4 binary is located in /usr/bin directory.  
    27      On rpm systems m4 package should be installed.  
    28    
    29   4. g++ compiler  
      25 3. g++ compiler  
    30 26    Usually the g++ binary is located in /usr/bin directory.  
    31 27    On rpm systems gcc-c++ package should be installed.  
    32 28  
    33   5. MySQL server  
      29 4. MySQL server  
    33 29    On rpm systems, MySQL, MySQL-shared, MySQL-devel and  
    34 30    MySQL-client packages should be installed.  
    40 36    started. Start it typing safe_mysqld as root.  
    41 37  
    42   6. Apache server  
      38 5. Apache server  
    42 38    On rpm systems, apache or http packages should be installed.  
    43 39    Configure the Web server (see INSTALLATION 3.) and (re)start  
    44 40    the httpd daemon.  
    45 41  
    46   7. PHP  
      42 6. PHP  
    46 42    Campsite requires PHP 4.3 or newer; the following PHP modules  
    47 43    must be installed: php-cli (command line), php-pear, php-adodb,  

  • trunk/campsite/install_conf/check4_functions

    r3970 r4089  
    73 73 # END OF check4_make  
    74 74  
    75   # FUNCTION: check4_m4  
    76   # Description: check if m4 executable is installed  
    77   # Parameters: none  
    78   # Variables set:  
    79   #   M4 - m4 full path  
    80   #   output - error message (if any)  
    81   check4_m4()  
    82   {  
    83   is_checked m4 && return 0  
    84   if [ $BSD -eq 1 ]; then  
    85       check4_file gm4 --executable --path "/bin:/usr/bin:/usr/local/bin"  
    86   else  
    87       check4_file m4 --executable --path "/bin:/usr/bin:/usr/local/bin:/opt/bin"  
    88   fi  
    89   result=$? && [ $result -ne 0 ] && output="Could not find m4 utility. Please install m4 package." && return 1  
    90   export M4=$file_path  
    91   set_checked m4  
    92   return 0  
    93   }  
    94   # END OF check4_m4  
    95    
    96 75 # FUNCTION: check4_mkdir  
    97 76 # Description: check if mkdir executable is installed  

  • trunk/campsite/install_conf/.modules.dep

    r3218 r4089  
    3 3 EVENT_HANDLERS:implementation/mailnotify::crond make libz libmysqlclient libcrypt:gpp mysql_h socket_h  
    4 4 SEARCH_ENGINE:implementation/search::crond make libz libmysqlclient libcrypt:gpp mysql_h socket_h  
    5   ADMIN_INTERFACE:implementation/management::make apache iconv pear libz libmysqlclient libcrypt convert:m4 gpp mysql_h socket_h stl libnsl xml curl  
      5 ADMIN_INTERFACE:implementation/management::make apache iconv pear libz libmysqlclient libcrypt convert:gpp mysql_h socket_h stl libnsl xml curl