diff options
author | ng0 <ng0@n0.is> | 2019-11-21 16:21:35 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-11-21 16:21:35 +0000 |
commit | 0eb4f2a45baaa8372d23989ae12a6bbb11e9da4f (patch) | |
tree | 19e2b5bdc04170764b99730bb09c078b6b75401c /configure.ac | |
parent | 1713968e45e227b2c874824c9c9ad4e15abdc00d (diff) | |
download | gnunet-0eb4f2a45baaa8372d23989ae12a6bbb11e9da4f.tar.gz gnunet-0eb4f2a45baaa8372d23989ae12a6bbb11e9da4f.zip |
add initial logic to detect zbar dependencies
no idea if it's really required, but at the very least
we need to be able to point to the X11 root.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 154 |
1 files changed, 154 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index c5c6586e5..929b7187c 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -691,6 +691,132 @@ AS_IF([test "x$zbar" = x1], | |||
691 | [AC_DEFINE([HAVE_ZBAR],[1],[Have zbar library])], | 691 | [AC_DEFINE([HAVE_ZBAR],[1],[Have zbar library])], |
692 | [AC_DEFINE([HAVE_ZBAR],[0],[Lacking zbar library])]) | 692 | [AC_DEFINE([HAVE_ZBAR],[0],[Lacking zbar library])]) |
693 | 693 | ||
694 | # libjpeg - pulled in by zbar which is required by gnunet-qr. | ||
695 | # At least IJG's jpeg works. If you need more, extend this. | ||
696 | jpeg=0 | ||
697 | AC_MSG_CHECKING(for jpeg) | ||
698 | AC_ARG_WITH(zbar, | ||
699 | [ --with-jpeg=PREFIX (base of jpeg installation)], | ||
700 | [AC_MSG_RESULT([$with_jpeg]) | ||
701 | AS_CASE([$with_jpeg], | ||
702 | [no],[], | ||
703 | [yes],[CHECK_LIBHEADER(JPEG, jpeg, jpeg_std_error, jpeglib.h,jpeg=1,,)], | ||
704 | [ | ||
705 | LDFLAGS="-L$with_jpeg/lib $LDFLAGS" | ||
706 | CPPFLAGS="-I$with_jpeg/include $CPPFLAGS" | ||
707 | AC_CHECK_HEADERS(jpeglib.h, | ||
708 | AC_CHECK_LIB([jpeg], [jpeg_std_error], | ||
709 | EXT_LIB_PATH="-L$with_jpeg/lib $EXT_LIB_PATH" | ||
710 | jpeg=1)) | ||
711 | ]) | ||
712 | ], | ||
713 | [AC_MSG_RESULT([--with-jpeg not specified]) | ||
714 | CHECK_LIBHEADER(JPEG, jpeg, jpeg_std_error, jpeglib.h,jpeg=1,,)]) | ||
715 | AM_CONDITIONAL(HAVE_JPEG, [test "$jpeg" = 1]) | ||
716 | AS_IF([test "x$jpeg" = x1], | ||
717 | [AC_DEFINE([HAVE_JPEG],[1],[Have jpeg library])], | ||
718 | [AC_DEFINE([HAVE_JPEG],[0],[Lacking jpeg library])]) | ||
719 | |||
720 | # libSM | ||
721 | sm=0 | ||
722 | AC_MSG_CHECKING(for SM) | ||
723 | AC_ARG_WITH(sm, | ||
724 | [ --with-sm=PREFIX (base of SM installation)], | ||
725 | [AC_MSG_RESULT([$with_sm]) | ||
726 | AS_CASE([$with_sm], | ||
727 | [no],[], | ||
728 | [yes],[CHECK_LIBHEADER(SM, sm, SM_Error, X11/SM/SM.h,sm=1,,)], | ||
729 | [ | ||
730 | LDFLAGS="-L$with_sm/lib $LDFLAGS" | ||
731 | CPPFLAGS="-I$with_sm/include $CPPFLAGS" | ||
732 | AC_CHECK_HEADERS(X11/SM/SM.h, | ||
733 | AC_CHECK_LIB([SM], [SM_Error], | ||
734 | EXT_LIB_PATH="-L$with_sm/lib $EXT_LIB_PATH" | ||
735 | sm=1)) | ||
736 | ]) | ||
737 | ], | ||
738 | [AC_MSG_RESULT([--with-sm not specified]) | ||
739 | CHECK_LIBHEADER(SM, sm, SM_Error, X11/SM/SM.h,sm=1,,)]) | ||
740 | AM_CONDITIONAL(HAVE_SM, [test "$sm" = 1]) | ||
741 | AS_IF([test "x$sm" = x1], | ||
742 | [AC_DEFINE([HAVE_SM],[1],[Have sm library])], | ||
743 | [AC_DEFINE([HAVE_SM],[0],[Lacking sm library])]) | ||
744 | |||
745 | # libICE | ||
746 | ice=0 | ||
747 | AC_MSG_CHECKING(for ICE) | ||
748 | AC_ARG_WITH(ice, | ||
749 | [ --with-ice=PREFIX (base of ICE installation)], | ||
750 | [AC_MSG_RESULT([$with_ice]) | ||
751 | AS_CASE([$with_ice], | ||
752 | [no],[], | ||
753 | [yes],[CHECK_LIBHEADER(ICE, ice, ICE_Error, X11/ICE/ICE.h,ice=1,,)], | ||
754 | [ | ||
755 | LDFLAGS="-L$with_ice/lib $LDFLAGS" | ||
756 | CPPFLAGS="-I$with_ice/include $CPPFLAGS" | ||
757 | AC_CHECK_HEADERS(X11/ICE/ICE.h, | ||
758 | AC_CHECK_LIB([ICE], [ICE_Error], | ||
759 | EXT_LIB_PATH="-L$with_ice/lib $EXT_LIB_PATH" | ||
760 | ice=1)) | ||
761 | ]) | ||
762 | ], | ||
763 | [AC_MSG_RESULT([--with-ice not specified]) | ||
764 | CHECK_LIBHEADER(ICE, ice, ICE_Error, X11/ICE/ICE.h,ice=1,,)]) | ||
765 | AM_CONDITIONAL(HAVE_ICE, [test "$ice" = 1]) | ||
766 | AS_IF([test "x$ice" = x1], | ||
767 | [AC_DEFINE([HAVE_ICE],[1],[Have ICE library])], | ||
768 | [AC_DEFINE([HAVE_ICE],[0],[Lacking ICE library])]) | ||
769 | |||
770 | # libX11 | ||
771 | x11=0 | ||
772 | AC_MSG_CHECKING(for X11) | ||
773 | AC_ARG_WITH(x11, | ||
774 | [ --with-x11=PREFIX (base of X11 installation)], | ||
775 | [AC_MSG_RESULT([$with_x11]) | ||
776 | AS_CASE([$with_x11], | ||
777 | [no],[], | ||
778 | [yes],[CHECK_LIBHEADER(X11, x11, X_PROTOCOL, X11/X.h,x11=1,,)], | ||
779 | [ | ||
780 | LDFLAGS="-L$with_x11/lib $LDFLAGS" | ||
781 | CPPFLAGS="-I$with_x11/include $CPPFLAGS" | ||
782 | AC_CHECK_HEADERS(X11/X.h, | ||
783 | AC_CHECK_LIB([X11], [X_PROTOCOL], | ||
784 | EXT_LIB_PATH="-L$with_x11/lib $EXT_LIB_PATH" | ||
785 | x11=1)) | ||
786 | ]) | ||
787 | ], | ||
788 | [AC_MSG_RESULT([--with-x11 not specified]) | ||
789 | CHECK_LIBHEADER(X11, x11, X_PROTOCOL, X11/X.h,x11=1,,)]) | ||
790 | AM_CONDITIONAL(HAVE_X11, [test "$x11" = 1]) | ||
791 | AS_IF([test "x$x11" = x1], | ||
792 | [AC_DEFINE([HAVE_X11],[1],[Have x11 library])], | ||
793 | [AC_DEFINE([HAVE_X11],[0],[Lacking x11 library])]) | ||
794 | |||
795 | # libXv | ||
796 | xv=0 | ||
797 | AC_MSG_CHECKING(for Xv) | ||
798 | AC_ARG_WITH(xv, | ||
799 | [ --with-xv=PREFIX (base of Xv installation)], | ||
800 | [AC_MSG_RESULT([$with_xv]) | ||
801 | AS_CASE([$with_xv], | ||
802 | [no],[], | ||
803 | [yes],[CHECK_LIBHEADER(XV, xv, XvName, X11/extensions/Xv.h,xv=1,,)], | ||
804 | [ | ||
805 | LDFLAGS="-L$with_xv/lib $LDFLAGS" | ||
806 | CPPFLAGS="-I$with_xv/include $CPPFLAGS" | ||
807 | AC_CHECK_HEADERS(X11/extensions/Xv.h, | ||
808 | AC_CHECK_LIB([Xv], [XvName], | ||
809 | EXT_LIB_PATH="-L$with_xv/lib $EXT_LIB_PATH" | ||
810 | xv=1)) | ||
811 | ]) | ||
812 | ], | ||
813 | [AC_MSG_RESULT([--with-xv not specified]) | ||
814 | CHECK_LIBHEADER(XV, xv, XvName, X11/extensions/Xv.h,xv=1,,)]) | ||
815 | AM_CONDITIONAL(HAVE_XV, [test "$xv" = 1]) | ||
816 | AS_IF([test "x$xv" = x1], | ||
817 | [AC_DEFINE([HAVE_XV],[1],[Have Xv library])], | ||
818 | [AC_DEFINE([HAVE_XV],[0],[Lacking Xv library])]) | ||
819 | |||
694 | # check for jansson library | 820 | # check for jansson library |
695 | jansson=0 | 821 | jansson=0 |
696 | AC_MSG_CHECKING(for libjansson) | 822 | AC_MSG_CHECKING(for libjansson) |
@@ -1981,6 +2107,31 @@ AS_IF([test "x$MANDOC_BINARY" = "false"], | |||
1981 | [AC_MSG_NOTICE([WARNING: optional mandoc binary not found]) | 2107 | [AC_MSG_NOTICE([WARNING: optional mandoc binary not found]) |
1982 | mandoc_msg="no"], | 2108 | mandoc_msg="no"], |
1983 | [mandoc_msg="yes"]) | 2109 | [mandoc_msg="yes"]) |
2110 | # -- jpeg | ||
2111 | AS_IF([test "x$jpeg" != "x1"], | ||
2112 | [jpeg_msg="no"], | ||
2113 | [jpeg_msg="yes" | ||
2114 | zbar_msg="$zbar_msg jpeg"]) | ||
2115 | # -- X11 | ||
2116 | AS_IF([test "x$x11" != "x1"], | ||
2117 | [X11_msg="no"], | ||
2118 | [X11_msg="yes" | ||
2119 | zbar_msg="$zbar_msg X11"]) | ||
2120 | # -- SM | ||
2121 | AS_IF([test "x$sm" != "x1"], | ||
2122 | [sm_msg="no"], | ||
2123 | [sm_msg="yes" | ||
2124 | zbar_msg="$zbar_msg sm"]) | ||
2125 | # -- ICE | ||
2126 | AS_IF([test "x$ice" != "x1"], | ||
2127 | [ICE_msg="no"], | ||
2128 | [ICE_msg="yes" | ||
2129 | zbar_msg="$zbar_msg ICE"]) | ||
2130 | # -- XV | ||
2131 | AS_IF([test "x$xv" != "x1"], | ||
2132 | [XV_msg="no"], | ||
2133 | [XV_msg="yes" | ||
2134 | zbar_msg="$zbar_msg XV"]) | ||
1984 | # -- texinfo | 2135 | # -- texinfo |
1985 | AS_IF([test "x$makeinfo" != "x1"], | 2136 | AS_IF([test "x$makeinfo" != "x1"], |
1986 | [texinfo_msg="no"], | 2137 | [texinfo_msg="no"], |
@@ -2080,6 +2231,8 @@ AS_IF([test "$postgres" = true], | |||
2080 | # ---- 2. sort the lines, | 2231 | # ---- 2. sort the lines, |
2081 | # ---- 3. replace the newlines with spaces. | 2232 | # ---- 3. replace the newlines with spaces. |
2082 | features_msg=`echo $features_msg | tr ' ' '\012' | sort | tr '\012' ' '` | 2233 | features_msg=`echo $features_msg | tr ' ' '\012' | sort | tr '\012' ' '` |
2234 | zbar_msg=`echo $zbar_msg | tr ' ' '\012' | sort | tr '\012' ' '` | ||
2235 | AC_SUBST(zbar_msg) | ||
2083 | AC_SUBST(features_msg) | 2236 | AC_SUBST(features_msg) |
2084 | 2237 | ||
2085 | 2238 | ||
@@ -2115,6 +2268,7 @@ ifconfig: ${ifconfig_msg} | |||
2115 | upnpc: ${upnpc_msg} | 2268 | upnpc: ${upnpc_msg} |
2116 | gnutls: ${gnutls_msg} | 2269 | gnutls: ${gnutls_msg} |
2117 | libzbar: ${libzbar_msg} | 2270 | libzbar: ${libzbar_msg} |
2271 | libzbar dependencies found: ${zbar_msg} | ||
2118 | java: ${java_msg} | 2272 | java: ${java_msg} |
2119 | libmicrohttpd: ${libmicrohttpd_msg} | 2273 | libmicrohttpd: ${libmicrohttpd_msg} |
2120 | libidn: ${libidn1_msg}${libidn2_msg} | 2274 | libidn: ${libidn1_msg}${libidn2_msg} |