Changeset 87

Show
Ignore:
Timestamp:
04/19/04 01:24:36 (9 years ago)
Author:
benoitg
Message:

2004-04-19 Benoit Gr�goire <bock@…>

  • Properly integrate libhttpd into the source tree ;) Note that this will create a proper system wide shared librery for libghttpd. Still to be done: 1- Store Mina's patch somewhere, in case we want to upgrade libhttpd. 2-Add configure option not to build httpd, and use an already installed one.
Location:
trunk/wifidog
Files:
10 added
5 removed
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/wifidog/ChangeLog

    r85 r87  
    11# $Header$ 
     22004-04-19  Benoit Gr�goire  <bock@step.polymtl.ca> 
     3        * Properly integrate libhttpd into the source tree ;)  Note that this will create a proper system wide shared librery for libghttpd.  Still to be done:  1- Store Mina's patch somewhere,  in case we want to upgrade libhttpd.  2-Add configure option not to build httpd, and use an already installed one. 
     4 
    252004-04-18  Alexandre Carmel-Veilleux <acv@acv.ca> 
    36        * Fixed pthread_cond_timedwait. The mutex needed to be locked as 

  • trunk/wifidog/Makefile.am

    r77 r87  
    11# $Header$ 
    22 
    3 SUBDIRS = src . doc  
     3SUBDIRS = libhttpd src . doc  
    44 
    55docdir = ${prefix}/share/doc/wifidog-@VERSION@ 

  • trunk/wifidog/configure.in

    r79 r87  
    8888AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(You need the pthread library) ) 
    8989 
     90# libhttpd dependencies 
     91echo "Begining libhttpd dependencies check" 
     92AC_CHECK_HEADERS(string.h strings.h stdarg.h unistd.h) 
     93AC_HAVE_LIBRARY(socket) 
     94AC_HAVE_LIBRARY(nsl) 
     95echo "libhttpd dependencies check complete" 
     96 
    9097AC_OUTPUT(              Makefile  
    9198                        wifidog.spec 
    9299                        src/Makefile 
     100                        libhttpd/Makefile 
    93101                        doc/Makefile 
    94102                        ) 

  • trunk/wifidog/src/Makefile.am

    r79 r87  
    88EXTRA_DIST = fw.access fw.counters fw.destroy fw.init 
    99 
    10 #wifidog_LDADD = $(top_builddir)/lib/libofx.la 
     10AM_CPPFLAGS = \ 
     11        -I${top_srcdir}/libhttpd/ 
     12wifidog_LDADD = $(top_builddir)/libhttpd/libhttpd.la 
     13 
    1114wifidog_SOURCES = commandline.c \ 
    1215        conf.c \ 
    … …  
    1720        http.c \ 
    1821        auth.c \ 
    19         userclasses.c \ 
    20         httpd_api.c \ 
    21         httpd_proto.c \ 
    22         httpd_acl.c 
     22        userclasses.c 
    2323 
    2424noinst_HEADERS = commandline.h \ 
    … …  
    3131        http.h \ 
    3232        auth.h \ 
    33         userclasses.h \ 
    34         httpd_priv.h \ 
    35         httpd.h 
     33        userclasses.h 
    3634 
    37 #AM_CPPFLAGS = \ 
    38 #       -I${top_srcdir}/inc