Changeset 41

Show
Ignore:
Timestamp:
05/05/06 17:50:18 (9 years ago)
Author:
jesus
Message:

autoconf support

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/config.c

    r40 r41  
    99*/ 
    1010 
    11  
    12 #include <stdio.h> 
    13 #include <string.h> 
    14 #include <sys/types.h> 
    15 #include <sys/stat.h> 
    16 #include <fcntl.h> 
    17 #include <sys/file.h> 
    18 #include <sys/param.h> 
    19 #include <unistd.h> 
    20 #include <signal.h> 
     11#include "sld_config.h" 
    2112 
    2213#ifdef PERL 
     
    2617#include "python.h" 
    2718#endif 
    28 #include "config.h" 
    2919#include "skiplist.h" 
    3020#include "timefuncs.h" 
  • trunk/config_gram.l

    r38 r41  
    1010*/ 
    1111 
    12 #include <string.h> 
    13  
    14 #include "config.h" 
     12#include "sld_config.h" 
    1513#include "y.tab.h" 
    1614 
  • trunk/config_gram.y

    r38 r41  
    1010*/ 
    1111 
    12 #include "config.h" 
    13 #include <stdio.h> 
    14 #include <string.h> 
     12#include "sld_config.h" 
    1513 
    1614extern int line_num, semantic_errors; 
  • trunk/echash.c

    r39 r41  
    2525 */ 
    2626 
    27 #include "config.h" 
    28 #include "memory.h" 
    29 #include "util.h" 
     27#include "sld_config.h" 
    3028#include "echash.h" 
    3129 
  • trunk/hash.c

    r38 r41  
    1212*/ 
    1313 
    14 #include <stdlib.h> 
    15 #include <stdio.h> 
    16 #include <string.h> 
    17 #include <unistd.h> 
    18  
     14#include "sld_config.h" 
    1915#include "hash.h" 
    2016 
  • trunk/perl.c

    r37 r41  
    11#include "perl.h" 
     2#include <EXTERN.h> 
     3#include <perl.h> 
    24 
    35EXTERN_C void xs_init(); 
  • trunk/perl.h

    r37 r41  
    22#define __PERL_H_ 
    33 
    4 #include <EXTERN.h> 
    5 #include <perl.h> 
    6  
    74void perl_startup(); 
    85void perl_shutdown(); 
     6#ifndef I32 
     7#define I32 int 
     8#endif 
    99I32 perl_inc(char *path); 
    1010I32 perl_use(char *module); 
  • trunk/skiplist.c

    r40 r41  
    99 */ 
    1010 
    11 #include <stdio.h> 
    12 #include <stdlib.h> 
    13 #include <string.h> 
    14 #include <assert.h> 
     11#include "sld_config.h" 
    1512#include "skiplist.h" 
    1613 
  • trunk/spreadlogd.c

    r40 r41  
    99*/ 
    1010 
    11 #include <stdio.h> 
    12 #include <stdlib.h> 
    13 #include <string.h> 
    14 #include <signal.h> 
    15 #include <unistd.h> 
    16 #include <sys/time.h> 
    17 #include <sys/resource.h> 
    18 #include <sp.h> 
    19 #include <errno.h> 
    20 #include <event.h> 
    21  
    22 #include "config.h" 
     11#include "sld_config.h" 
    2312#include "module.h" 
    2413 
     
    4130char *module_dir = NULL; 
    4231 
    43 static char *default_configfile = "/etc/spreadlogd.conf"; 
     32static char *default_configfile = ETCDIR "/spreadlogd.conf"; 
    4433static int connectandjoin(SpreadConfiguration *sc, void *uv); 
    4534static void handle_message(int fd, short event, void *arg); 
     
    4837void usage(char *progname) { 
    4938  fprintf(stderr, "%s\t\tVERSION: %s\n \ 
    50 \t-c configfile\t\t[default /etc/spreadlogd.conf]\n \ 
     39\t-c configfile\t\t[default " ETCDIR "/spreadlogd.conf]\n \ 
    5140\t-s\t\t\tskip locking (flock) files (NOT RECOMMENDED)\n \ 
    5241\t-v\t\t\tverbose mode\n \ 
  • trunk/timefuncs.c

    r13 r41  
    99*/ 
    1010 
    11 #include <stdio.h> 
    12 #include <string.h> 
    13 #include <time.h> 
    14 #include <sys/time.h> 
    15 #include <unistd.h> 
    16  
     11#include "sld_config.h" 
    1712#include "timefuncs.h" 
    1813