Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 74039 | Differences between
and this patch

Collapse All | Expand All

(-)configure.ac (-24 / +90 lines)
Lines 107-119 AC_ARG_ENABLE(lynx, Link Here
107
  yes) lynx=yes ;;
107
  yes) lynx=yes ;;
108
  no)  lynx=no ;;
108
  no)  lynx=no ;;
109
  *) AC_MSG_ERROR(bad value ${enableval} for --disable-lynx) ;;
109
  *) AC_MSG_ERROR(bad value ${enableval} for --disable-lynx) ;;
110
esac],[lynx=yes])
110
esac],[lynx=auto])
111
111
112
if test x$lynx = xyes ; then
112
if test x$lynx != xno ; then
113
   AC_CHECK_PROG(have_lynx, lynx, yes, no)
113
   AC_CHECK_PROG(have_lynx, lynx, yes, no)
114
114
115
   if test x$have_lynx = xno ; then
115
   if test x$have_lynx = xno ; then
116
     AC_MSG_WARN([*** lynx not found, plain text README will not be built ***])
116
       if test x$lynx = xyes ; then
117
           AC_MSG_ERROR([*** lynx not found])
118
       else
119
           AC_MSG_WARN([*** lynx not found, plain text README will not be built ***])
120
       fi
117
   fi
121
   fi
118
fi
122
fi
119
123
Lines 291-298 AC_ARG_WITH( Link Here
291
        AC_HELP_STRING([--without-caps],[Omit support for POSIX capabilities.]))
295
        AC_HELP_STRING([--without-caps],[Omit support for POSIX capabilities.]))
292
296
293
if test "x${with_caps}" != "xno"; then
297
if test "x${with_caps}" != "xno"; then
294
    AC_SEARCH_LIBS([cap_init], [cap])
298
    AC_SEARCH_LIBS([cap_init], [cap], [], [
295
    AC_CHECK_HEADERS([sys/capability.h])
299
                    if test "x${with_caps}" = "xyes" ; then
300
                        AC_MSG_ERROR([*** POSIX caps libraries not found])
301
                    fi])
302
    AC_CHECK_HEADERS([sys/capability.h], [], [
303
                    if test "x${with_caps}" = "xyes" ; then
304
                        AC_MSG_ERROR([*** POSIX caps headers not found])
305
                    fi])
296
fi
306
fi
297
307
298
#### pkg-config ####
308
#### pkg-config ####
Lines 321-340 AC_SUBST(LIBSNDFILE_LIBS) Link Here
321
331
322
#### OSS support (optional) ####
332
#### OSS support (optional) ####
323
333
324
AC_CHECK_HEADERS([sys/soundcard.h], [
334
AC_ARG_ENABLE([oss], 
325
HAVE_OSS=1
335
    AC_HELP_STRING([--disable-oss], [Disable optional OSS support]), 
326
AC_DEFINE([HAVE_OSS], 1, [Have OSS?])
336
    [case "${enableval}" in yes) oss=yes ;; no) oss=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --disable-oss) ;; esac],[oss=auto])
327
], [HAVE_OSS=0])
337
if test "x${oss}" != xno ; then
338
    AC_CHECK_HEADERS([sys/soundcard.h], [
339
    HAVE_OSS=1
340
    AC_DEFINE([HAVE_OSS], 1, [Have OSS?])
341
    ], [HAVE_OSS=0 ; if test "x$oss" = xyes ; then AC_MSG_ERROR([*** OSS support not found]) ; fi])
342
else HAVE_OSS=0; fi
328
AC_SUBST(HAVE_OSS)
343
AC_SUBST(HAVE_OSS)
329
AM_CONDITIONAL([HAVE_OSS], [test "x$HAVE_OSS" = x1])
344
AM_CONDITIONAL([HAVE_OSS], [test "x$HAVE_OSS" = x1])
330
345
331
346
332
#### ALSA support (optional) ####
347
#### ALSA support (optional) ####
333
348
334
PKG_CHECK_MODULES(ASOUNDLIB, [ alsa >= 1.0.0 ], [
349
AC_ARG_ENABLE([alsa], 
335
HAVE_ALSA=1
350
    AC_HELP_STRING([--disable-alsa], [Disable optional ALSA support]), 
336
AC_DEFINE([HAVE_ALSA], 1, [Have ALSA?])
351
    [case "${enableval}" in yes) alsa=yes ;; no) alsa=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --disable-alsa) ;; esac],[alsa=auto])
337
], [HAVE_ALSA=0])
352
if test "x${alsa}" != xno ; then
353
    PKG_CHECK_MODULES(ASOUNDLIB, [ alsa >= 1.0.0 ], [
354
    HAVE_ALSA=1
355
    AC_DEFINE([HAVE_ALSA], 1, [Have ALSA?])
356
    ], [HAVE_ALSA=0 ; if test "x$alsa" = xyes ; then AC_MSG_ERROR([*** ALSA support not found]) ; fi])
357
else HAVE_ALSA=0 ; fi
338
AC_SUBST(ASOUNDLIB_CFLAGS)
358
AC_SUBST(ASOUNDLIB_CFLAGS)
339
AC_SUBST(ASOUNDLIB_LIBS) 
359
AC_SUBST(ASOUNDLIB_LIBS) 
340
AC_SUBST(HAVE_ALSA)
360
AC_SUBST(HAVE_ALSA)
Lines 342-357 AM_CONDITIONAL([HAVE_ALSA], [test "x$HAV Link Here
342
362
343
#### Solaris audio support (optional) ####
363
#### Solaris audio support (optional) ####
344
364
345
AC_CHECK_HEADERS([sys/audio.h], [
365
AC_ARG_ENABLE([solaris], 
346
HAVE_SOLARIS=1
366
    AC_HELP_STRING([--disable-solaris], [Disable optional Solaris audio support]), 
347
AC_DEFINE([HAVE_SOLARIS], 1, [Have Solaris audio?])
367
    [case "${enableval}" in yes) solaris=yes ;; no) solaris=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --disable-solaris) ;; esac],[solaris=auto])
348
], [HAVE_SOLARIS=0])
368
if test "x${solaris}" != xno ; then
369
    AC_CHECK_HEADERS([sys/audio.h], [
370
    HAVE_SOLARIS=1
371
    AC_DEFINE([HAVE_SOLARIS], 1, [Have Solaris audio?])
372
    ], [HAVE_SOLARIS=0 ; if test "x$solaris" = xyes ; then AC_MSG_ERROR([*** Solaris audio support not found]) ; fi])
373
else HAVE_SOLARIS=0 ; fi
349
AC_SUBST(HAVE_SOLARIS)
374
AC_SUBST(HAVE_SOLARIS)
350
AM_CONDITIONAL([HAVE_SOLARIS], [test "x$HAVE_SOLARIS" = x1])
375
AM_CONDITIONAL([HAVE_SOLARIS], [test "x$HAVE_SOLARIS" = x1])
351
376
352
#### GLib 2 support (optional) ####
377
#### GLib 2 support (optional) ####
353
378
354
PKG_CHECK_MODULES(GLIB20, [ glib-2.0 >= 2.4.0 ], HAVE_GLIB20=1, HAVE_GLIB20=0)
379
AC_ARG_ENABLE([glib2], 
380
    AC_HELP_STRING([--disable-glib2], [Disable optional GLib 2 support]), 
381
    [case "${enableval}" in yes) glib2=yes ;; no) glib2=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --disable-glib2) ;; esac],[glib2=auto])
382
if test "x${glib2}" != xno ; then
383
    PKG_CHECK_MODULES(GLIB20, [ glib-2.0 >= 2.4.0 ], HAVE_GLIB20=1, [HAVE_GLIB20=0 ; if test "x$glib2" = xyes ; then AC_MSG_ERROR([*** GLib 2 support not found]) ; fi])
384
else HAVE_GLIB20=0 ; fi
355
AC_SUBST(GLIB20_CFLAGS)
385
AC_SUBST(GLIB20_CFLAGS)
356
AC_SUBST(GLIB20_LIBS)
386
AC_SUBST(GLIB20_LIBS)
357
AC_SUBST(HAVE_GLIB20)
387
AC_SUBST(HAVE_GLIB20)
Lines 359-365 AM_CONDITIONAL([HAVE_GLIB20], [test "x$H Link Here
359
389
360
#### GLib 1 support (optional) ####
390
#### GLib 1 support (optional) ####
361
391
362
PKG_CHECK_MODULES(GLIB12, [ glib >= 1.2.0 ], HAVE_GLIB12=1, HAVE_GLIB12=0)
392
AC_ARG_ENABLE([glib1], 
393
    AC_HELP_STRING([--disable-glib1], [Disable optional GLib 1 support]), 
394
    [case "${enableval}" in yes) glib1=yes ;; no) glib1=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --disable-glib1) ;; esac],[glib1=auto])
395
if test "x${glib1}" != xno ; then
396
    PKG_CHECK_MODULES(GLIB12, [ glib >= 1.2.0 ], HAVE_GLIB12=1, [HAVE_GLIB12=0 ; if test "x$glib1" = xyes ; then AC_MSG_ERROR([*** GLib 1 support not found]) ; fi])
397
else HAVE_GLIB12=0 ; fi
363
AC_SUBST(GLIB12_CFLAGS)
398
AC_SUBST(GLIB12_CFLAGS)
364
AC_SUBST(GLIB12_LIBS)
399
AC_SUBST(GLIB12_LIBS)
365
AC_SUBST(HAVE_GLIB12)
400
AC_SUBST(HAVE_GLIB12)
Lines 367-373 AM_CONDITIONAL([HAVE_GLIB12], [test "x$H Link Here
367
402
368
#### Howl support (optional) ####
403
#### Howl support (optional) ####
369
404
370
PKG_CHECK_MODULES(HOWL, [ howl >= 0.9.8 ], HAVE_HOWL=1, HAVE_HOWL=0)
405
AC_ARG_ENABLE([howl], 
406
    AC_HELP_STRING([--disable-howl], [Disable optional Howl support]), 
407
    [case "${enableval}" in yes) howl=yes ;; no) howl=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --disable-howl) ;; esac],[howl=auto])
408
if test "x${howl}" != xno ; then
409
    PKG_CHECK_MODULES(HOWL, [ howl >= 0.9.8 ], HAVE_HOWL=1, PKG_CHECK_MODULES(HOWL, [ avahi-compat-howl >= 0.9.8 ], HAVE_HOWL=1, [HAVE_HOWL=0 ; if test "x$howl" = xyes ; then AC_MSG_ERROR([*** Howl support not found]) ; fi]))
410
else HAVE_HOWL=0 ; fi
371
AC_SUBST(HOWL_CFLAGS)
411
AC_SUBST(HOWL_CFLAGS)
372
AC_SUBST(HOWL_LIBS)
412
AC_SUBST(HOWL_LIBS)
373
AC_SUBST(HAVE_HOWL)
413
AC_SUBST(HAVE_HOWL)
Lines 381-387 AC_SUBST(LIBOIL_LIBS) Link Here
381
421
382
### JACK (optional) ####
422
### JACK (optional) ####
383
423
384
PKG_CHECK_MODULES(JACK, [ jack >= 0.100 ], HAVE_JACK=1, HAVE_JACK=0)
424
AC_ARG_ENABLE([jack], 
425
    AC_HELP_STRING([--disable-jack], [Disable optional JACK support]), 
426
    [case "${enableval}" in yes) jack=yes ;; no) jack=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --disable-jack) ;; esac],[jack=auto])
427
if test "x${jack}" != xno ; then
428
    PKG_CHECK_MODULES(JACK, [ jack >= 0.100 ], HAVE_JACK=1, [HAVE_JACK=0 ; if test "x$jack" = xyes ; then AC_MSG_ERROR([*** JACK support not found]) ; fi])
429
else HAVE_JACK=0 ; fi
385
AC_SUBST(JACK_CFLAGS)
430
AC_SUBST(JACK_CFLAGS)
386
AC_SUBST(JACK_LIBS)
431
AC_SUBST(JACK_LIBS)
387
AC_SUBST(HAVE_JACK)
432
AC_SUBST(HAVE_JACK)
Lines 389-395 AM_CONDITIONAL([HAVE_JACK], [test "x$HAV Link Here
389
434
390
#### Async DNS support (optional) ####
435
#### Async DNS support (optional) ####
391
436
392
PKG_CHECK_MODULES(LIBASYNCNS, [ libasyncns >= 0.1 ], HAVE_LIBASYNCNS=1, HAVE_LIBASYNCNS=0)
437
AC_ARG_ENABLE([asyncns], 
438
    AC_HELP_STRING([--disable-asyncns], [Disable optional Async DNS support]), 
439
    [case "${enableval}" in yes) asyncns=yes ;; no) asyncns=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --disable-asyncns) ;; esac],[asyncns=auto])
440
if test "x${asyncns}" != xno ; then
441
    PKG_CHECK_MODULES(LIBASYNCNS, [ libasyncns >= 0.1 ], HAVE_LIBASYNCNS=1, [HAVE_LIBASYNCNS=0 ; if test "x$asyncns" = xyes ; then AC_MSG_ERROR([*** Async DNS support not found]) ; fi])
442
else HAVE_LIBASYNCNS=0 ; fi
393
AC_SUBST(LIBASYNCNS_CFLAGS)
443
AC_SUBST(LIBASYNCNS_CFLAGS)
394
AC_SUBST(LIBASYNCNS_LIBS)
444
AC_SUBST(LIBASYNCNS_LIBS)
395
AC_SUBST(HAVE_LIBASYNCNS)
445
AC_SUBST(HAVE_LIBASYNCNS)
Lines 401-412 fi Link Here
401
451
402
#### TCP wrappers (optional) ####
452
#### TCP wrappers (optional) ####
403
453
404
ACX_LIBWRAP
454
AC_ARG_ENABLE([tcpwrap], 
455
    AC_HELP_STRING([--disable-tcpwrap], [Disable optional TCP wrappers support]), 
456
    [case "${enableval}" in yes) tcpwrap=yes ;; no) tcpwrap=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --disable-tcpwrap) ;; esac],[tcpwrap=auto])
457
if test "x${tcpwrap}" != xno ; then
458
    ACX_LIBWRAP
459
    if test "x${LIBWRAP_LIBS}" = x && test "x$tcpwrap" = xyes ; then
460
        AC_MSG_ERROR([*** TCP wrappers support not found])
461
    fi
462
else LIBWRAP_LIBS= ; fi
405
AC_SUBST(LIBWRAP_LIBS)
463
AC_SUBST(LIBWRAP_LIBS)
406
464
407
#### LIRC support (optional) ####
465
#### LIRC support (optional) ####
408
466
409
ACX_LIRC
467
AC_ARG_ENABLE([lirc], 
468
    AC_HELP_STRING([--disable-lirc], [Disable optional LIRC support]), 
469
    [case "${enableval}" in yes) lirc=yes ;; no) lirc=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --disable-lirc) ;; esac],[lirc=auto])
470
if test "x${lirc}" != xno ; then
471
    ACX_LIRC
472
    if test "x${HAVE_LIRC}" = x0 && test "x$lirc" = xyes ; then
473
        AC_MSG_ERROR([*** LIRC support not found])
474
    fi
475
else HAVE_LIRC=0 ; fi
410
AC_SUBST(LIRC_CFLAGS)
476
AC_SUBST(LIRC_CFLAGS)
411
AC_SUBST(LIRC_LIBS)
477
AC_SUBST(LIRC_LIBS)
412
AM_CONDITIONAL([HAVE_LIRC], [test "x$HAVE_LIRC" = x1])
478
AM_CONDITIONAL([HAVE_LIRC], [test "x$HAVE_LIRC" = x1])

Return to bug 74039