Revision 55837756

b/configure.ac
324 324
        [AS_HELP_STRING([--enable-htools-rapi],
325 325
        [enable use of RAPI in htools (needs curl, default: no)])],
326 326
        [],
327
        [enable_htools_rapi=no])
327
        [enable_htools_rapi=check])
328 328

  
329 329
# --enable-confd
330 330
ENABLE_CONFD=
......
349 349

  
350 350
AM_CONDITIONAL([ENABLE_CONFD], [test x$enable_confd = xTrue])
351 351

  
352
# --enable-split-query
353
ENABLE_SPLIT_QUERY=
354
AC_ARG_ENABLE([split-query],
355
  [AS_HELP_STRING([--enable-split-query],
356
  [enable use of custom query daemon via confd])],
357
  [[case "$enableval" in
358
      no)
359
        enable_split_query=False
360
        ;;
361
      yes)
362
        enable_split_query=True
363
        ;;
364
      *)
365
        echo "Invalid value for enable-confd '$enableval'"
366
        exit 1
367
        ;;
368
    esac
369
  ]],
370
  [enable_split_query=False])
371
AC_SUBST(ENABLE_SPLIT_QUERY, $enable_split_query)
372

  
373
if test x$enable_split_query = xTrue -a x$enable_confd != xTrue; then
374
  AC_MSG_ERROR([Split queries require the confd daemon])
375
fi
376

  
377 352
# --with-disk-separator=...
378 353
AC_ARG_WITH([disk-separator],
379 354
  [AS_HELP_STRING([--with-disk-separator=STRING],
......
548 523
fi
549 524
AC_SUBST(HTOOLS)
550 525

  
526
# --enable-split-query
527
ENABLE_SPLIT_QUERY=
528
AC_ARG_ENABLE([split-query],
529
  [AS_HELP_STRING([--enable-split-query],
530
  [enable use of custom query daemon via confd])],
531
  [[case "$enableval" in
532
      no)
533
        enable_split_query=False
534
        ;;
535
      yes)
536
        enable_split_query=True
537
        ;;
538
      *)
539
        echo "Invalid value for enable-confd '$enableval'"
540
        exit 1
541
        ;;
542
    esac
543
  ]],
544
  [[case "x${enable_confd}x${HTOOLS_NOCURL}x" in
545
     xTruexx)
546
       enable_split_query=True
547
       ;;
548
     *)
549
       enable_split_query=False
550
       ;;
551
   esac]])
552
AC_SUBST(ENABLE_SPLIT_QUERY, $enable_split_query)
553

  
554
if test x$enable_split_query = xTrue -a x$enable_confd != xTrue; then
555
  AC_MSG_ERROR([Split queries require the confd daemon])
556
fi
557

  
558
if test x$enable_split_query = xTrue -a x$HTOOLS_NOCURL != x; then
559
  AC_MSG_ERROR([Split queries require the htools-rapi feature (curl library)])
560
fi
561

  
562
if test x$enable_split_query = xTrue; then
563
  AC_MSG_NOTICE([Split query functionality enabled])
564
fi
565

  
551 566
# Check for HsColour
552 567
HTOOLS_APIDOC=no
553 568
AC_ARG_VAR(HSCOLOUR, [HsColour path])

Also available in: Unified diff