Changeset 1695

Show
Ignore:
Timestamp:
07/28/08 10:31:49 (5 months ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r1694 r1695  
     12008-07-28  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * configure.in, cherokee/util.c: Added a new entry to support IRIX 
     4        compilation. (Patch by BSDero <bsdero@gmail.com>) 
     5 
     6        * cherokee/main.c, cherokee/main_guardian.c, 
     7        cherokee/main_tweak.c, cget/main.c: Getopt inclusion has been 
     8        rewritten in order to easy compilation on system with no 
     9        getopt_long support. (Patch by BSDero <bsdero@gmail.com>) 
     10 
    1112008-07-25  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
    212 

  • cherokee/trunk/cget/main.c

    r1491 r1695  
    4141#endif 
    4242 
    43 #include <getopt.h> 
     43#ifdef HAVE_GETOPT_LONG 
     44# include <getopt.h> 
     45#else  
     46# include "getopt/getopt.h" 
     47#endif 
     48 
    4449#include <stdio.h> 
    4550#include <stdlib.h> 

  • cherokee/trunk/cherokee/main.c

    r1589 r1695  
    2929#include "info.h" 
    3030 
    31 #ifdef HAVE_GETOPT_H 
     31#ifdef HAVE_GETOPT_LONG 
    3232# include <getopt.h> 
     33#else  
     34# include "getopt/getopt.h" 
    3335#endif 
    3436 

  • cherokee/trunk/cherokee/main_guardian.c

    r1693 r1695  
    3131#include "server.h" 
    3232 
    33 #ifdef HAVE_GETOPT_H 
     33#ifdef HAVE_GETOPT_LONG 
    3434# include <getopt.h> 
     35#else  
     36# include "getopt/getopt.h" 
    3537#endif 
    3638 

  • cherokee/trunk/cherokee/main_tweak.c

    r1614 r1695  
    2727#endif 
    2828 
    29 #ifdef HAVE_GETOPT_H 
     29#ifdef HAVE_GETOPT_LONG 
    3030# include <getopt.h> 
     31#else  
     32# include "getopt/getopt.h" 
    3133#endif 
    3234 

  • cherokee/trunk/cherokee/util.c

    r1614 r1695  
    676676         
    677677 
    678 # ifdef SOLARIS 
     678# if defined(SOLARIS) || defined(IRIX) 
    679679        /* Solaris 10: 
    680680         * struct hostent *gethostbyname_r 

  • cherokee/trunk/configure.in

    r1692 r1695  
    110110          ;; 
    111111        *-*-hpux*) 
     112          libdl="-ldl" 
     113          ;; 
     114     *-*-irix6*) 
     115          AC_DEFINE(IRIX, 1, [It is SGI Irix]) 
     116          setenv_is_threadsafe="yes" 
    112117          libdl="-ldl" 
    113118          ;; 
    …… 
    456461dnl Check for GNU getopt_long() 
    457462dnl 
    458 #AC_SEARCH_LIBS(getopt_long, [iberty gnugetopt]) 
    459463AC_CHECK_HEADERS(getopt.h) 
    460464AC_CHECK_FUNC(getopt_long, have_getopt_long="yes")