OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   26-Mar-2007 09:46:04
  Branch: HEAD                             Handle: 2007032608460300

  Modified files:
    openpkg-src/lighttpd    lighttpd.spec

  Log:
    add optional LDAP support

  Summary:
    Revision    Changes     Path
    1.34        +18 -6      openpkg-src/lighttpd/lighttpd.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/lighttpd/lighttpd.spec
  ============================================================================
  $ cvs diff -u -r1.33 -r1.34 lighttpd.spec
  --- openpkg-src/lighttpd/lighttpd.spec        4 Feb 2007 15:31:27 -0000       
1.33
  +++ openpkg-src/lighttpd/lighttpd.spec        26 Mar 2007 07:46:03 -0000      
1.34
  @@ -33,7 +33,7 @@
   Group:        Web
   License:      MIT-style
   Version:      1.4.13
  -Release:      20070204
  +Release:      20070326
   
   #   package options
   %option       with_fsl    yes
  @@ -41,6 +41,7 @@
   %option       with_bzip2  no
   %option       with_ipv6   no
   %option       with_mysql  no
  +%option       with_ldap   no
   %option       with_ssl    no
   %option       with_lua    no
   
  @@ -69,6 +70,10 @@
   BuildPreReq:  mysql, zlib
   PreReq:       mysql, zlib
   %endif
  +%if "%{with_ldap}" == "yes"
  +BuildPreReq:  openldap, openssl
  +PreReq:       openldap, openssl
  +%endif
   %if "%{with_pcre}" == "yes"
   BuildPreReq:  pcre
   PreReq:       pcre
  @@ -109,11 +114,14 @@
   
   %build
       #   configure program
  -    CC="%{l_cc}" \
  -    CFLAGS="%{l_cflags -O}" \
  -    CXXFLAGS="%{l_cxxflags -O}" \
  -    LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
  -    LIBS="%{l_fsl_libs}" \
  +    export CC="%{l_cc}"
  +    export CFLAGS="%{l_cflags -O}"
  +    export CXXFLAGS="%{l_cxxflags -O}"
  +    export LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}"
  +    export LIBS="%{l_fsl_libs}"
  +%if "%{with_ldap}" == "yes"
  +    LIBS="$LIBS -lldap -llber -lssl -lcrypto"
  +%endif
       ./configure \
           --prefix=%{l_prefix} \
           --sysconfdir=%{l_prefix}/etc/lighttpd \
  @@ -123,7 +131,11 @@
   %else
           --disable-ipv6 \
   %endif
  +%if "%{with_ldap}" == "yes"
  +        --with-ldap \
  +%else
           --without-ldap \
  +%endif
   %if "%{with_mysql}" == "yes"
           --with-mysql=%{l_prefix}/bin/mysql_config \
   %else
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to