Project

General

Profile

Bug #214 » lighttpd-1.4.0-fix-configure.diff

lighttpd-1.4.0-fix-configure.diff -- ka0ttic - Anonymous, 2005-08-21 11:35

View differences:

configure.in 2005-08-21 00:46:55.000000000 -0400
84 84
MYSQL_INCLUDE=""
85 85
MYSQL_LIBS=""
86 86

  
87
WITH_MYSQL=no
88

  
89 87
AC_MSG_CHECKING(for MySQL support)
90 88
AC_ARG_WITH(mysql,
91 89
    AC_HELP_STRING([--with-mysql@<:@=PATH@:>@],[Include MySQL support. PATH is the path to 'mysql_config']),
92
    [
93
    WITH_MYSQL=$withval
94
    AC_MSG_RESULT(yes)
95
],[AC_MSG_RESULT(no)])
90
    [WITH_MYSQL=$withval],[WITH_MYSQL=no])
96 91

  
97 92
if test "$WITH_MYSQL" != "no"; then
93
  AC_MSG_RESULT(yes)  
98 94
  if test "$WITH_MYSQL" = "yes"; then
99 95
    AC_PATH_PROG(MYSQL_CONFIG, mysql_config)
100 96
  else
......
127 123
  CPPFLAGS="$old_CPPFLAGS"
128 124

  
129 125
  AC_DEFINE([HAVE_MYSQL], [1], [mysql support])
126
else
127
  AC_MSG_RESULT(no)
130 128
fi
131 129

  
132 130
AC_SUBST(MYSQL_LIBS)
133 131
AC_SUBST(MYSQL_INCLUDE)
134 132

  
135

  
133
dnl Check for LDAP
136 134
AC_MSG_CHECKING(for LDAP support)
137 135
AC_ARG_WITH(ldap, AC_HELP_STRING([--with-ldap],[enable LDAP support]),
138
[AC_MSG_RESULT(yes)
136
[WITH_LDAP=$withval], [WITH_LDAP=no])
137
AC_MSG_RESULT([$withval])
138
if test "$WITH_LDAP" != "no"; then
139 139
 AC_CHECK_LIB(ldap, ldap_bind, [
140 140
  AC_CHECK_HEADERS([ldap.h],[
141 141
    LDAP_LIB=-lldap
......
152 152
  ])
153 153
 ])
154 154
 AC_SUBST(LBER_LIB)
155
fi
155 156

  
156
],[AC_MSG_RESULT(no)])
157

  
157
dnl Check for xattr
158 158
AC_MSG_CHECKING(for extended attributes support)
159 159
AC_ARG_WITH(attr, AC_HELP_STRING([--with-attr],[enable extended attribute support]),
160
[AC_MSG_RESULT(yes)
160
[WITH_ATTR=$withval],[WITH_ATTR=no])
161
AC_MSG_RESULT($withval)
162
if test "$WITH_ATTR" != "no"; then
161 163
 AC_CHECK_LIB(attr, attr_get, [
162 164
	AC_CHECK_HEADERS([attr/attributes.h],[
163 165
		ATTR_LIB=-lattr
......
165 167
		AC_DEFINE([HAVE_ATTR_ATTRIBUTES_H], [1])
166 168
	])
167 169
 ])
168
],[AC_MSG_RESULT(no)])
169
AC_SUBST(ATTR_LIB)
170
 AC_SUBST(ATTR_LIB)
171
fi
170 172

  
173
dnl Check for valgrind
171 174
AC_MSG_CHECKING(for valgrind)
172
AC_ARG_WITH(valgrind, AC_HELP_STRING([--with-valgrind],[enable internal
173
support for valgrind]),
174
[AC_MSG_RESULT(yes)
175
AC_ARG_WITH(valgrind, AC_HELP_STRING([--with-valgrind],[enable internal support for valgrind]),
176
[WITH_VALGRIND=$withval],[WITH_VALGRIND=no])
177
AC_MSG_RESULT([$WITH_VALGRIND])
178
if test "$WITH_VALGRIND" != "no"; then
175 179
 AC_CHECK_HEADERS([valgrind/valgrind.h])
176
],[AC_MSG_RESULT(no)])
180
fi
177 181

  
182
dnl Check for openssl
178 183
AC_MSG_CHECKING(for OpenSSL)
179
dnl check for openssl
180
    AC_ARG_WITH(openssl,
184
AC_ARG_WITH(openssl,
181 185
    AC_HELP_STRING([--with-openssl@<:@=DIR@:>@],[Include openssl support (default no)]),
182
[
183
    if test "$withval" != "no"; then
184
        if test "$withval" != "yes"; then
185
            CPPFLAGS="$CPPFLAGS -I$withval/include"
186
            LDFLAGS="$LDFLAGS -L$withval/lib"
187
	fi
188
	
189
        use_openssl=yes
190
	AC_MSG_RESULT($withval)
191
    else
192
        use_openssl=no
193
        AC_MSG_RESULT(no)
186
    [WITH_OPENSSL=$withval],[WITH_OPENSSL=no])
187

  
188
if test "$WITH_OPENSSL" != "no"; then
189
    use_openssl=yes
190
    if test "$WITH_OPENSSL" != "yes"; then
191
	CPPFLAGS="$CPPFLAGS -I$WITH_OPENSSL/include"
192
	LDFLAGS="$LDFLAGS -L$WITH_OPENSSL/lib"
194 193
    fi
195
],[
194
else
196 195
    use_openssl=no
197
    AC_MSG_RESULT(no)
198
])
199
    
196
fi
197
AC_MSG_RESULT([$use_openssl])
198

  
200 199
AC_ARG_WITH(openssl-includes,
201 200
    AC_HELP_STRING([--with-openssl-includes=DIR],[OpenSSL includes]),
202 201
    [ use_openssl=yes CPPFLAGS="$CPPFLAGS -I$withval" ]
......
260 259
  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
261 260
fi
262 261

  
262
dnl Check for gamin
263 263
AC_MSG_CHECKING(for gamin)
264 264
AC_ARG_WITH(gamin, AC_HELP_STRING([--with-gamin],[gamin for reducing number of stat() calls]),
265
[AC_MSG_RESULT(yes)
265
[WITH_GAMIN=$withval],[WITH_GAMIN=no])
266
AC_MSG_RESULT([$WITH_GAMIN])
267
if test "$WITH_GAMIN" != "no"; then
266 268
 PKG_CHECK_MODULES(FAM, gamin >= 0.1.0, [
267 269
    AC_DEFINE([HAVE_LIBFAM], [1], [libfam])
268 270
    AC_DEFINE([HAVE_FAM_H], [1], [fam.h])
269 271
 ])
270
],[AC_MSG_RESULT(no)])
271
AC_SUBST(FAM_LIB)
272

  
273

  
272
fi
274 273

  
274
dnl Check for gdbm
275 275
AC_MSG_CHECKING(for gdbm)
276 276
AC_ARG_WITH(gdbm, AC_HELP_STRING([--with-gdbm],[gdbm storage for mod_trigger_b4_dl]),
277
[AC_MSG_RESULT(yes)
277
[WITH_GDBM=$withval],[WITH_GDBM=no])
278
AC_MSG_RESULT([$WITH_GDBM])
279
if test "$WITH_GDBM" != "no"; then
278 280
 AC_CHECK_LIB(gdbm, gdbm_open, [
279 281
         AC_CHECK_HEADERS([gdbm.h],[
280 282
                 GDBM_LIB=-lgdbm
......
282 284
		 AC_DEFINE([HAVE_GDBM_H], [1])
283 285
         ])
284 286
 ])
285
],[AC_MSG_RESULT(no)])
286
AC_SUBST(GDBM_LIB)
287
 AC_SUBST(GDBM_LIB)
288
fi
287 289

  
290
dnl Check for memcache
288 291
AC_MSG_CHECKING(for memcache)
289 292
AC_ARG_WITH(memcache, AC_HELP_STRING([--with-memcache],[memcached storage for mod_trigger_b4_dl]),
290
[AC_MSG_RESULT(yes)
293
[WITH_MEMCACHE=$withval],[WITH_MEMCACHE=no])
294
AC_MSG_RESULT([$WITH_MEMCACHE])
295
if test "$WITH_MEMCACHE" != "no"; then
291 296
 AC_CHECK_LIB(memcache, mc_new, [
292 297
         AC_CHECK_HEADERS([memcache.h],[
293 298
                 MEMCACHE_LIB=-lmemcache
......
295 300
		 AC_DEFINE([HAVE_MEMCACHE_H], [1])
296 301
         ])
297 302
 ])
298
],[AC_MSG_RESULT(no)])
299
AC_SUBST(MEMCACHE_LIB)
303
 AC_SUBST(MEMCACHE_LIB)
304
fi
300 305

  
306
dnl Check for lua
301 307
AC_MSG_CHECKING(for lua)
302 308
AC_ARG_WITH(lua, AC_HELP_STRING([--with-lua],[lua engine for mod_cml]),
303
[AC_MSG_RESULT(yes)
309
[WITH_LUA=$withval],[WITH_LUA=no])
310
AC_MSG_RESULT([$WITH_LUA])
311
if test "$WITH_LUA" != "no"; then
304 312
 AC_CHECK_LIB(lua, lua_open, [
305 313
         AC_CHECK_HEADERS([lua.h],[
306 314
	         LUA_LIB="-llua -llualib -lm"
......
308 316
		 AC_DEFINE([HAVE_LUA_H], [1])
309 317
         ])
310 318
 ])
311
],[AC_MSG_RESULT(no)])
312
AC_SUBST(LUA_LIB)
313

  
319
 AC_SUBST(LUA_LIB)
320
fi
314 321

  
315 322
AC_SEARCH_LIBS(socket,socket)
316 323
AC_SEARCH_LIBS(gethostbyname,nsl socket)
......
487 494
if test ! "x$GDBM_LIB" = x; then
488 495
	enable_feature="$enable_feature $features"
489 496
else
490
	enable_feature="$enable_feature $features"
497
	disable_feature="$disable_feature $features"
491 498
fi
492 499

  
493 500
features="storage-memcache"
494 501
if test ! "x$MEMCACHE_LIB" = x; then
495 502
	enable_feature="$enable_feature $features"
496 503
else
497
	enable_feature="$enable_feature $features"
504
	disable_feature="$disable_feature $features"
498 505
fi
499 506

  
500 507
features="compress-gzip compress-deflate"
......
548 555
fi
549 556

  
550 557
features="stat-cache-fam"
551
if test ! "x$FAM_LIB" = x; then
558
if test ! "x$FAM_LIBS" = x; then
552 559
	enable_feature="$enable_feature $features"
553 560
else
554 561
	disable_feature="$disable_feature $features"
(1-1/2)