1 --- configure.ac 2019-10-15 20:54:32.684816920 +0000
2 +++ configure.ac.fixed 2019-10-17 01:57:03.380513944 +0000
3 @@ -5928,7 +5928,7 @@
4
5 if test "$_os" != "WINNT"; then
6
7 -if test "$_os" == "iOS"; then
8 +if test "$_os" = "iOS"; then
9 AC_MSG_CHECKING([iOS setting sizes long, short, int, long long, double, voidp])
10 ac_cv_sizeof_long=8
11 ac_cv_sizeof_short=2
12 @@ -10759,7 +10759,7 @@
13 # Pdfium?
14 AC_MSG_CHECKING([whether to build PDFium])
15 ENABLE_PDFIUM=
16 -if test \( -z "$enable_pdfium" -a "$ENABLE_PDFIMPORT" == "TRUE" \) -o "$enable_pdfium" = yes; then
17 +if test \( -z "$enable_pdfium" -a "$ENABLE_PDFIMPORT" = "TRUE" \) -o "$enable_pdfium" = yes; then
18 AC_MSG_RESULT([yes])
19 ENABLE_PDFIUM=TRUE
20 AC_DEFINE(HAVE_FEATURE_PDFIUM)
21 @@ -10774,7 +10774,7 @@
22 dnl ===================================================================
23 ENABLE_POPPLER=
24 AC_MSG_CHECKING([whether to build Poppler])
25 -if test \( -z "$enable_poppler" -a "$ENABLE_PDFIMPORT" == "TRUE" \) -o "$enable_poppler" = yes; then
26 +if test \( -z "$enable_poppler" -a "$ENABLE_PDFIMPORT" = "TRUE" \) -o "$enable_poppler" = yes; then
27 AC_MSG_RESULT([yes])
28 ENABLE_POPPLER=TRUE
29 AC_DEFINE(HAVE_FEATURE_POPPLER)
30 @@ -10783,15 +10783,15 @@
31 fi
32 AC_SUBST(ENABLE_POPPLER)
33
34 -if test "$ENABLE_PDFIMPORT" == "TRUE" -a "$ENABLE_POPPLER" != "TRUE" -a "$ENABLE_PDFIUM" != "TRUE"; then
35 +if test "$ENABLE_PDFIMPORT" = "TRUE" -a "$ENABLE_POPPLER" != "TRUE" -a "$ENABLE_PDFIUM" != "TRUE"; then
36 AC_MSG_ERROR([Cannot import PDF without either Pdfium or Poppler; please enable either of them.])
37 fi
38
39 -if test "$ENABLE_PDFIMPORT" != "TRUE" -a \( "$ENABLE_POPPLER" == "TRUE" -o "$ENABLE_PDFIUM" == "TRUE" \); then
40 +if test "$ENABLE_PDFIMPORT" != "TRUE" -a \( "$ENABLE_POPPLER" = "TRUE" -o "$ENABLE_PDFIUM" = "TRUE" \); then
41 AC_MSG_ERROR([Cannot enable Pdfium or Poppler when PDF importing is disabled; please enable PDF import first.])
42 fi
43
44 -if test "$ENABLE_PDFIMPORT" == "TRUE" -a "$ENABLE_POPPLER" == "TRUE"; then
45 +if test "$ENABLE_PDFIMPORT" = "TRUE" -a "$ENABLE_POPPLER" = "TRUE"; then
46 dnl ===================================================================
47 dnl Check for system poppler
48 dnl ===================================================================
49 @@ -11238,7 +11238,7 @@
50 qt5_test_library="libQt5Widgets.so"
51
52 dnl Check for qmake5
53 - AC_PATH_PROGS( QMAKE5, [qmake-qt5 qmake], no, [$QT5DIR/bin:$PATH] )
54 + AC_PATH_PROGS( QMAKE5, [qmake-qt5 qmake], no, [$QT5DIR/bin:$PATH])
55 if test "$QMAKE5" = "no"; then
56 AC_MSG_ERROR([Qmake not found. Please specify the root of your Qt5 installation by exporting QT5DIR before running "configure".])
57 else
58 @@ -11298,7 +11298,7 @@
59
60 dnl Check for Meta Object Compiler
61
62 - AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [`dirname $qt5_libdir`/bin:$QT5DIR/bin:$PATH] )
63 + AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [`dirname $qt5_libdir`/bin:$QT5DIR/bin:$PATH])
64 if test "$MOC5" = "no"; then
65 AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify
66 the root of your Qt installation by exporting QT5DIR before running "configure".])
|
