adapted auto-configure script

configure.ac

@@ -531,8 +531,10 @@ if test x$use_pkgconfig = xyes; then
       PKG_CHECK_MODULES([CRYPTO], [libcrypto], [INCLUDES="$INCLUDES $CRYPTO_CFLAGS"; LIBS="$LIBS $CRYPTO_LIBS"], [AC_MSG_ERROR(libcrypto  not found.)])
       BITCOIN_QT_CHECK([PKG_CHECK_MODULES([PROTOBUF], [protobuf], [have_protobuf=yes], [BITCOIN_QT_FAIL(libprotobuf not found)])])
       if test x$use_qr != xno; then
-        dnl libzxing has no module entry, so check without modules 
+        PKG_CHECK_MODULES([ZXING], [libzxing],, [AC_MSG_ERROR(libzxing  not found.)])
         BITCOIN_QT_CHECK([AC_CHECK_LIB([zxing], [main],, [have_zxing=no])])
+        PKG_CHECK_MODULES([QRENCODE], [libqrencode],, [AC_MSG_ERROR(libcrypto  not found.)])
+        BITCOIN_QT_CHECK([AC_CHECK_LIB([qrencode], [main],, [have_qr=no])])
       fi
     ]
   )

src/bitcoin-config.h

@@ -108,6 +108,9 @@
 /* Define to 1 if you have the `protobuf ' library (-lprotobuf ). */
 /* #undef HAVE_LIBPROTOBUF_ */
 
+/* Define to 1 if you have the `qrencode' library (-lqrencode). */
+#define HAVE_LIBQRENCODE 1
+
 /* Define to 1 if you have the `rpcrt4' library (-lrpcrt4). */
 /* #undef HAVE_LIBRPCRT4 */
 
@@ -233,7 +236,7 @@
 #define USE_DBUS 1
 
 /* Define if QR support should be compiled in */
-#define USE_QR 1
+#define USE_QRCODE 1
 
 /* UPnP support not compiled if undefined, otherwise value (0 or 1) determines
    default state */