diff options
-rw-r--r-- | configure.ac | 77 |
1 files changed, 29 insertions, 48 deletions
diff --git a/configure.ac b/configure.ac index c322f57ac..b43aa84be 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -557,26 +557,19 @@ AC_ARG_WITH(jansson, | |||
557 | AC_CHECK_LIB([jansson], [json_loads], | 557 | AC_CHECK_LIB([jansson], [json_loads], |
558 | jansson=1))]) | 558 | jansson=1))]) |
559 | AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1]) | 559 | AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1]) |
560 | if test "x$jansson" = x1 | 560 | AS_IF([test "x$jansson" = x1], |
561 | then | 561 | [AC_DEFINE([HAVE_JANSSON],[1],[Have jansson library])], |
562 | AC_DEFINE([HAVE_JANSSON],[1],[Have jansson library]) | 562 | [AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library])]) |
563 | else | ||
564 | AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library]) | ||
565 | fi | ||
566 | 563 | ||
567 | 564 | ||
568 | # check for libpulse(audio) library | 565 | # check for libpulse(audio) library |
569 | pulse=0 | 566 | pulse=0 |
570 | AC_CHECK_LIB(pulse,pa_stream_peek, | 567 | AC_CHECK_LIB(pulse,pa_stream_peek, |
571 | [AC_CHECK_HEADER([pulse/simple.h],pulse=1)]) | 568 | [AC_CHECK_HEADER([pulse/simple.h],pulse=1)]) |
572 | if test "$build_target" = "mingw" | 569 | AS_IF([test "$build_target" = "mingw"], |
573 | then | 570 | [pulse=0]) |
574 | pulse=0 | 571 | AS_IF([test "$pulse" = 1], |
575 | fi | 572 | [AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library])]) |
576 | if test "$pulse" = 1 | ||
577 | then | ||
578 | AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library]) | ||
579 | fi | ||
580 | 573 | ||
581 | # check for libopus(audio) library | 574 | # check for libopus(audio) library |
582 | opus=0 | 575 | opus=0 |
@@ -602,43 +595,31 @@ AC_CHECK_LIB(ogg, ogg_stream_flush_fill, | |||
602 | ogg=0) | 595 | ogg=0) |
603 | 596 | ||
604 | 597 | ||
605 | PKG_CHECK_MODULES([GLIB], [glib-2.0], | 598 | PKG_CHECK_MODULES([GLIB], |
606 | # check for pbc library | 599 | [glib-2.0], |
607 | pbc=0 | 600 | [# check for pbc library |
608 | AC_CHECK_HEADER([pbc/pbc.h],pbc=1) | 601 | pbc=0 |
609 | AC_CHECK_HEADER([gabe.h],abe=1) | 602 | AC_CHECK_HEADER([pbc/pbc.h],pbc=1) |
610 | AM_CONDITIONAL(HAVE_PBC, [test "x$pbc" = x1]) | 603 | AC_CHECK_HEADER([gabe.h],abe=1) |
611 | AM_CONDITIONAL(HAVE_ABE, [test "x$abe" = x1]) | 604 | AM_CONDITIONAL(HAVE_PBC, [test "x$pbc" = x1]) |
612 | if test "x$pbc" = x1 | 605 | AM_CONDITIONAL(HAVE_ABE, [test "x$abe" = x1]) |
613 | then | 606 | AS_IF([test "x$pbc" = x1], |
614 | AC_DEFINE([HAVE_PBC],[1],[Have pbc library]) | 607 | [AC_DEFINE([HAVE_PBC],[1],[Have pbc library])], |
615 | else | 608 | [AC_DEFINE([HAVE_PBC],[0],[Lacking pbc library])]) |
616 | AC_DEFINE([HAVE_PBC],[0],[Lacking pbc library]) | 609 | AS_IF([test "x$abe" = x1], |
617 | fi | 610 | [AC_DEFINE([HAVE_ABE],[1],[Have ABE library])], |
618 | if test "x$abe" = x1 | 611 | [AC_DEFINE([HAVE_ABE],[0],[Lacking ABE library])])], |
619 | then | 612 | [# glib-2 not found |
620 | AC_DEFINE([HAVE_ABE],[1],[Have ABE library]) | 613 | AM_CONDITIONAL(HAVE_PBC, [false]) |
621 | else | 614 | AM_CONDITIONAL(HAVE_ABE, [false]) |
622 | AC_DEFINE([HAVE_ABE],[0],[Lacking ABE library]) | 615 | AC_DEFINE([HAVE_PBC],[0],[Lacking glib library])]) |
623 | fi | ||
624 | , | ||
625 | # glib-2 not found | ||
626 | AM_CONDITIONAL(HAVE_PBC, [false]) | ||
627 | AM_CONDITIONAL(HAVE_ABE, [false]) | ||
628 | AC_DEFINE([HAVE_PBC],[0],[Lacking glib library]) | ||
629 | ) | ||
630 | 616 | ||
631 | gst=0 | 617 | gst=0 |
632 | PKG_CHECK_MODULES( | 618 | PKG_CHECK_MODULES( |
633 | [GST], | 619 | [GST], |
634 | [glib-2.0 gobject-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-audio-1.0], | 620 | [glib-2.0 gobject-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-audio-1.0], |
635 | [ | 621 | [gst=1], |
636 | gst=1 | 622 | [gst=0]) |
637 | AC_MSG_RESULT(ok) | ||
638 | ], [ | ||
639 | gst=0 | ||
640 | AC_MSG_RESULT(not found) | ||
641 | ]) | ||
642 | 623 | ||
643 | # Pulse Audio | 624 | # Pulse Audio |
644 | if test "x$pulse" != "x1" -o "x$opus" != "x1" -o "x$ogg" != "x1" | 625 | if test "x$pulse" != "x1" -o "x$opus" != "x1" -o "x$ogg" != "x1" |
@@ -1072,8 +1053,8 @@ AS_IF([test "$taler_only" != yes], | |||
1072 | [CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" | 1053 | [CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" |
1073 | AC_CHECK_HEADERS([libpq-fe.h], | 1054 | AC_CHECK_HEADERS([libpq-fe.h], |
1074 | postgres=true) | 1055 | postgres=true) |
1075 | ])], | 1056 | ], |
1076 | [AC_MSG_RESULT([no postgres])]) | 1057 | [AC_MSG_RESULT([no postgres])])]) |
1077 | AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) | 1058 | AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) |
1078 | 1059 | ||
1079 | 1060 | ||