aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-11-21 19:23:11 +0000
committerng0 <ng0@n0.is>2019-11-21 19:23:11 +0000
commit029a42364a00e5d840600df015ea03ad51cf94bc (patch)
tree8522c04a5a7b661053a6ea8573da844bbf3e778b
parentb8055ec4495c0d9f0a44e6b77871a922c4661b4a (diff)
downloadgnunet-029a42364a00e5d840600df015ea03ad51cf94bc.tar.gz
gnunet-029a42364a00e5d840600df015ea03ad51cf94bc.zip
revert changes for gnunet-qr, see note in configure.ac
-rw-r--r--configure.ac159
-rw-r--r--src/util/Makefile.am3
2 files changed, 4 insertions, 158 deletions
diff --git a/configure.ac b/configure.ac
index bfc95cdce..673ea3b13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -665,8 +665,9 @@ AS_IF([test "$bluetooth" = 1],
665 [AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library])]) 665 [AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library])])
666 666
667# check for zbar library 667# check for zbar library
668# TODO: Add checks for: -lSM, -lICE, -lX11, -lXv and -ljpeg 668# NOTE: Do not add checks for: -lSM, -lICE, -lX11, -lXv and -ljpeg
669# TODO: if zbar exists. 669# NOTE: they must be provided by the build environment, not the
670# NOTE: build-system of gnunet, as they are 2nd or 3rd level dependencies.
670zbar=0 671zbar=0
671AC_MSG_CHECKING(for libzbar) 672AC_MSG_CHECKING(for libzbar)
672AC_ARG_WITH(zbar, 673AC_ARG_WITH(zbar,
@@ -691,132 +692,6 @@ AS_IF([test "x$zbar" = x1],
691 [AC_DEFINE([HAVE_ZBAR],[1],[Have zbar library])], 692 [AC_DEFINE([HAVE_ZBAR],[1],[Have zbar library])],
692 [AC_DEFINE([HAVE_ZBAR],[0],[Lacking zbar library])]) 693 [AC_DEFINE([HAVE_ZBAR],[0],[Lacking zbar library])])
693 694
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.
696jpeg=0
697AC_MSG_CHECKING(for jpeg)
698AC_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,,)])
715AM_CONDITIONAL(HAVE_JPEG, [test "$jpeg" = 1])
716AS_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
721sm=0
722AC_MSG_CHECKING(for SM)
723AC_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,,)])
740AM_CONDITIONAL(HAVE_SM, [test "$sm" = 1])
741AS_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
746ice=0
747AC_MSG_CHECKING(for ICE)
748AC_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,,)])
765AM_CONDITIONAL(HAVE_ICE, [test "$ice" = 1])
766AS_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
771x11=0
772AC_MSG_CHECKING(for X11)
773AC_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,,)])
790AM_CONDITIONAL(HAVE_X11, [test "$x11" = 1])
791AS_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
796xv=0
797AC_MSG_CHECKING(for Xv)
798AC_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,,)])
815AM_CONDITIONAL(HAVE_XV, [test "$xv" = 1])
816AS_IF([test "x$xv" = x1],
817 [AC_DEFINE([HAVE_XV],[1],[Have Xv library])],
818 [AC_DEFINE([HAVE_XV],[0],[Lacking Xv library])])
819
820# check for jansson library 695# check for jansson library
821jansson=0 696jansson=0
822AC_MSG_CHECKING(for libjansson) 697AC_MSG_CHECKING(for libjansson)
@@ -2107,31 +1982,6 @@ AS_IF([test "x$MANDOC_BINARY" = "false"],
2107 [AC_MSG_NOTICE([WARNING: optional mandoc binary not found]) 1982 [AC_MSG_NOTICE([WARNING: optional mandoc binary not found])
2108 mandoc_msg="no"], 1983 mandoc_msg="no"],
2109 [mandoc_msg="yes"]) 1984 [mandoc_msg="yes"])
2110# -- jpeg
2111AS_IF([test "x$jpeg" != "x1"],
2112 [jpeg_msg="no"],
2113 [jpeg_msg="yes"
2114 zbar_msg="$zbar_msg jpeg"])
2115# -- X11
2116AS_IF([test "x$x11" != "x1"],
2117 [X11_msg="no"],
2118 [X11_msg="yes"
2119 zbar_msg="$zbar_msg X11"])
2120# -- SM
2121AS_IF([test "x$sm" != "x1"],
2122 [sm_msg="no"],
2123 [sm_msg="yes"
2124 zbar_msg="$zbar_msg sm"])
2125# -- ICE
2126AS_IF([test "x$ice" != "x1"],
2127 [ICE_msg="no"],
2128 [ICE_msg="yes"
2129 zbar_msg="$zbar_msg ICE"])
2130# -- XV
2131AS_IF([test "x$xv" != "x1"],
2132 [XV_msg="no"],
2133 [XV_msg="yes"
2134 zbar_msg="$zbar_msg XV"])
2135# -- texinfo 1985# -- texinfo
2136AS_IF([test "x$makeinfo" != "x1"], 1986AS_IF([test "x$makeinfo" != "x1"],
2137 [texinfo_msg="no"], 1987 [texinfo_msg="no"],
@@ -2231,8 +2081,6 @@ AS_IF([test "$postgres" = true],
2231# ---- 2. sort the lines, 2081# ---- 2. sort the lines,
2232# ---- 3. replace the newlines with spaces. 2082# ---- 3. replace the newlines with spaces.
2233features_msg=`echo $features_msg | tr ' ' '\012' | sort | tr '\012' ' '` 2083features_msg=`echo $features_msg | tr ' ' '\012' | sort | tr '\012' ' '`
2234zbar_msg=`echo $zbar_msg | tr ' ' '\012' | sort | tr '\012' ' '`
2235AC_SUBST(zbar_msg)
2236AC_SUBST(features_msg) 2084AC_SUBST(features_msg)
2237 2085
2238 2086
@@ -2268,7 +2116,6 @@ ifconfig: ${ifconfig_msg}
2268upnpc: ${upnpc_msg} 2116upnpc: ${upnpc_msg}
2269gnutls: ${gnutls_msg} 2117gnutls: ${gnutls_msg}
2270libzbar: ${libzbar_msg} 2118libzbar: ${libzbar_msg}
2271libzbar dependencies found: ${zbar_msg}
2272java: ${java_msg} 2119java: ${java_msg}
2273libmicrohttpd: ${libmicrohttpd_msg} 2120libmicrohttpd: ${libmicrohttpd_msg}
2274libidn: ${libidn1_msg}${libidn2_msg} 2121libidn: ${libidn1_msg}${libidn2_msg}
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index aab67c95a..b89250711 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -249,8 +249,7 @@ gnunet_qr_SOURCES = \
249gnunet_qr_LDADD = \ 249gnunet_qr_LDADD = \
250 libgnunetutil.la \ 250 libgnunetutil.la \
251 $(GN_LIBINTL) 251 $(GN_LIBINTL)
252gnunet_qr_LDFLAGS= -lzbar -ljpeg 252gnunet_qr_LDFLAGS= -lzbar
253# -lICE -lSM -lX11 -lXv
254 253
255plugin_LTLIBRARIES = \ 254plugin_LTLIBRARIES = \
256 libgnunet_plugin_test.la 255 libgnunet_plugin_test.la