Advertisement
Guest User

configure.patch

a guest
Mar 9th, 2022
83
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 0.97 KB | None | 0 0
  1. --- src/zbar-0.23.1/configure.ac.old    2022-03-09 14:05:44.019581995 +0100
  2. +++ src/zbar-0.23.1/configure.ac    2022-03-09 14:07:04.366307706 +0100
  3. @@ -656,7 +656,7 @@
  4.                         [with_qt="no"])])])
  5.  
  6.  AS_IF([test "x$with_qt" != "xno"],
  7. -   AS_IF([test "x$with_qt5" != "xno"],
  8. +   [AS_IF([test "x$with_qt5" != "xno"],
  9.      [AC_CHECK_PROGS(MOC, [moc-qt5 moc])
  10.       AC_MSG_NOTICE([using moc from $MOC])
  11.       QT_VERSION=`$PKG_CONFIG Qt5Gui --modversion`
  12. @@ -672,7 +672,7 @@
  13.       QT_VERSION=`$PKG_CONFIG QtGui --modversion`
  14.       AC_MSG_NOTICE([using Qt version $QT_VERSION])
  15.       qt_pkgconfig_file="zbar-qt.pc"
  16. -     ]))
  17. +     ])])
  18.  
  19.  AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
  20.  
  21. @@ -706,7 +706,7 @@
  22.    [],
  23.    [with_java="check"])
  24.  
  25. -JAVAC=${JAVAC/ecj/ecj -1.5}
  26. +JAVAC=$(echo $JAVAC |sed 's/ecj/ecj -1.5/')
  27.  
  28.  # Javah was obsoleted on Java 8 and removed on Java 11. So, we need to
  29.  # look strictly at the $JAVA_HOME in order to avoid mixing different versions
  30.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement