Attachment #686121 for bug #769716

View | Details | Raw Unified | Return to bug 769716
Collapse All | Expand All




AC_ARG_VAR([GLIB_GENMARSHAL], [full path to glib-genmarshal])
AC_ARG_VAR([GTK_VERSION_MAJOR])

AS_IF([test "x$with_gtk" = "xgtk3" || test "x$with_gtk" = "xauto"],
  [PKG_CHECK_MODULES([GTK3], [gtk+-3.0],
    [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
     GTK_VERSION=`$PKG_CONFIG gtk+-3.0 --modversion`

    ])
  ])

AS_IF([test "x$with_gtk" = "xgtk2" || test "x$with_gtk" = "xauto"],
  [PKG_CHECK_MODULES([GTK2], [gtk+-2.0],
    [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
     GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion`

AC_ARG_VAR([PYGTK_DEFS], [directory where PyGTK definitions may be found (python2 only)])

AS_IF([test -z "$PYTHON"],
      [AS_IF([test "x$with_python" = "xauto"],
             [AC_PATH_PROGS([PYTHON], [python3 python2 python], [:], [$PATH])],
             [AS_IF([test "x$with_python" = "xpython3"],
                    [AC_PATH_PROGS([PYTHON], [python3 python], [:], [$PATH])],
                    [AS_IF([test "x$with_python" = "xpython2"],
                           [AC_PATH_PROGS([PYTHON], [python2 python], [:], [$PATH])],
                           [with_python="no"])
                    ])


dnl GObject Introspection (GIR)

AS_IF([test "x$with_gir" = "xyes" && test "x$with_gtk" != "xno"],
  [m4_ifdef([GOBJECT_INTROSPECTION_CHECK],
    [GOBJECT_INTROSPECTION_CHECK([0.6.7])
     AS_IF([test "x$found_introspection" = "xyes"],

  [],
  [with_java="check"])

JAVAC="$(echo $JAVAC | sed 's/ecj/ecj -1.5/')"

# Javah was obsoleted on Java 8 and removed on Java 11. So, we need to
# look strictly at the $JAVA_HOME in order to avoid mixing different versions


AC_ARG_VAR([JAR], [location of Java archive tool])
AC_PATH_PROGS([JAR], [jar], [:], [$JAVA_PATH])
AS_IF([test "x$JAR" = "x:"], [have_java="no"])

AC_ARG_VAR([JAVA], [location of Java application launcher])
AC_PATH_PROGS([JAVA], [java], [/bin/false], [$JAVA_PATH])

AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)])
AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."])

dnl Search for Java unit test library
AS_IF([test -z "$JUNIT_HOME"],

echo "GObject introspection  --with-gir=$with_gir"
echo "Qt                     --with-qt=$with_qt            Qt${QT_VERSION}"
echo "Java                   --with-java=$with_java"
AS_IF([test "x$win32" = "xno"],
  [echo "Dbus                   --with-dbus=$with_dbus"])
AS_IF([test "x$have_GM" = "xyes"],
  [echo "GraphicsMagick         --with-graphicsmagick=yes"],

  [echo "        => the zbarimg file scanner will *NOT* be built"])
AS_IF([test "x$have_GM" = "xyes"],
  [echo "        => ImageMagick is preferred, as GraphicsMagick doesn't support https"])
AS_IF([test "x$with_gtk" = "xno"],
  [echo "        => GTK support will *NOT* be built"])
AS_IF([test "x$with_pygtk2" != "xyes" && test "xPYTHON_VERSION_MAJOR" = "x2"],
  [echo "        => the Python 2 GTK widget wrapper will *NOT* be built"])
AS_IF([test "x$with_qt" != "xyes"],
  [echo "        => the Qt widget will *NOT* be built"])
AS_IF([test "x$with_qt" = "xyes" && test "x$enable_static_qt" = "xyes" ],
  [echo "        => Building a static Qt library"])
AS_IF([test "x$with_java" != "xyes"],
  [echo "        => the Java interface will *NOT* be built"])

#echo "NPAPI Plugin     --with-npapi=$with_npapi"
#AS_IF([test "x$with_mozilla" != "xyes"],
#  [echo "       => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"])
AS_IF([test "x$enable_pdf417" = "xyes"],
  [echo "        => the pdf417 code support is incomplete!"])
- 

Return to bug 769716

Lines 489-495 AC_ARG_WITH([gtk], Link Here

(-)a/configure.ac (-14 / +13 lines)
489	AC_ARG_VAR([GLIB_GENMARSHAL], [full path to glib-genmarshal])	489	AC_ARG_VAR([GLIB_GENMARSHAL], [full path to glib-genmarshal])
490	AC_ARG_VAR([GTK_VERSION_MAJOR])	490	AC_ARG_VAR([GTK_VERSION_MAJOR])
491		491
492	AS_IF([test "x$with_gtk" == "xgtk3" \|\| test "x$with_gtk" == "xauto"],	492	AS_IF([test "x$with_gtk" = "xgtk3" \|\| test "x$with_gtk" = "xauto"],
493	[PKG_CHECK_MODULES([GTK3], [gtk+-3.0],	493	[PKG_CHECK_MODULES([GTK3], [gtk+-3.0],
494	[GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`	494	[GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
495	GTK_VERSION=`$PKG_CONFIG gtk+-3.0 --modversion`	495	GTK_VERSION=`$PKG_CONFIG gtk+-3.0 --modversion`
Lines 501-507 AS_IF([test "x$with_gtk" == "xgtk3" \|\| test "x$with_gtk" == "xauto"], Link Here
501	])	501	])
502	])	502	])
503		503
504	AS_IF([test "x$with_gtk" == "xgtk2" \|\| test "x$with_gtk" == "xauto"],	504	AS_IF([test "x$with_gtk" = "xgtk2" \|\| test "x$with_gtk" = "xauto"],
505	[PKG_CHECK_MODULES([GTK2], [gtk+-2.0],	505	[PKG_CHECK_MODULES([GTK2], [gtk+-2.0],
506	[GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`	506	[GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
507	GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion`	507	GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion`
Lines 550-560 AC_ARG_VAR([PYGTK_CODEGEN], [full path to pygtk-codegen program (python2 only)]) Link Here
550	AC_ARG_VAR([PYGTK_DEFS], [directory where PyGTK definitions may be found (python2 only)])	550	AC_ARG_VAR([PYGTK_DEFS], [directory where PyGTK definitions may be found (python2 only)])
551		551
552	AS_IF([test -z "$PYTHON"],	552	AS_IF([test -z "$PYTHON"],
553	[AS_IF([test "x$with_python" == "xauto"],	553	[AS_IF([test "x$with_python" = "xauto"],
554	[AC_PATH_PROGS([PYTHON], [python3 python2 python], [:], [$PATH])],	554	[AC_PATH_PROGS([PYTHON], [python3 python2 python], [:], [$PATH])],
555	[AS_IF([test "x$with_python" == "xpython3"],	555	[AS_IF([test "x$with_python" = "xpython3"],
556	[AC_PATH_PROGS([PYTHON], [python3 python], [:], [$PATH])],	556	[AC_PATH_PROGS([PYTHON], [python3 python], [:], [$PATH])],
557	[AS_IF([test "x$with_python" == "xpython2"],	557	[AS_IF([test "x$with_python" = "xpython2"],
558	[AC_PATH_PROGS([PYTHON], [python2 python], [:], [$PATH])],	558	[AC_PATH_PROGS([PYTHON], [python2 python], [:], [$PATH])],
559	[with_python="no"])	559	[with_python="no"])
560	])	560	])
Lines 608-614 AM_CONDITIONAL([HAVE_PYGTK2], [test "x$with_pygtk2" != "xno"]) Link Here
608		608
609	dnl GObject Introspection (GIR)	609	dnl GObject Introspection (GIR)
610		610
611	AS_IF([test "x$with_gir" == "xyes" && test "x$with_gtk" != "xno"],	611	AS_IF([test "x$with_gir" = "xyes" && test "x$with_gtk" != "xno"],
612	[m4_ifdef([GOBJECT_INTROSPECTION_CHECK],	612	[m4_ifdef([GOBJECT_INTROSPECTION_CHECK],
613	[GOBJECT_INTROSPECTION_CHECK([0.6.7])	613	[GOBJECT_INTROSPECTION_CHECK([0.6.7])
614	AS_IF([test "x$found_introspection" = "xyes"],	614	AS_IF([test "x$found_introspection" = "xyes"],
Lines 696-702 AC_ARG_WITH([java], Link Here
696	[],	696	[],
697	[with_java="check"])	697	[with_java="check"])
698		698
699	JAVAC=${JAVAC/ecj/ecj -1.5}	699	JAVAC="$(echo $JAVAC \| sed 's/ecj/ecj -1.5/')"
700		700
701	# Javah was obsoleted on Java 8 and removed on Java 11. So, we need to	701	# Javah was obsoleted on Java 8 and removed on Java 11. So, we need to
702	# look strictly at the $JAVA_HOME in order to avoid mixing different versions	702	# look strictly at the $JAVA_HOME in order to avoid mixing different versions
Lines 707-719 AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"]) Link Here
707		707
708	AC_ARG_VAR([JAR], [location of Java archive tool])	708	AC_ARG_VAR([JAR], [location of Java archive tool])
709	AC_PATH_PROGS([JAR], [jar], [:], [$JAVA_PATH])	709	AC_PATH_PROGS([JAR], [jar], [:], [$JAVA_PATH])
710	AS_IF([test "x$JAR" == "x:"], [have_java="no"])	710	AS_IF([test "x$JAR" = "x:"], [have_java="no"])
711		711
712	AC_ARG_VAR([JAVA], [location of Java application launcher])	712	AC_ARG_VAR([JAVA], [location of Java application launcher])
713	AC_PATH_PROGS([JAVA], [java], [/bin/false], [$JAVA_PATH])	713	AC_PATH_PROGS([JAVA], [java], [/bin/false], [$JAVA_PATH])
714		714
715	AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)])	715	AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)])
716	AS_IF([test "x$CLASSPATH" == "x"], [CLASSPATH="."])	716	AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."])
717		717
718	dnl Search for Java unit test library	718	dnl Search for Java unit test library
719	AS_IF([test -z "$JUNIT_HOME"],	719	AS_IF([test -z "$JUNIT_HOME"],
Lines 850-856 echo "GTK --with-gtk=$with_gtk Gtk${GTK_VERSION}" Link Here
850	echo "GObject introspection --with-gir=$with_gir"	850	echo "GObject introspection --with-gir=$with_gir"
851	echo "Qt --with-qt=$with_qt Qt${QT_VERSION}"	851	echo "Qt --with-qt=$with_qt Qt${QT_VERSION}"
852	echo "Java --with-java=$with_java"	852	echo "Java --with-java=$with_java"
853	AS_IF([test "x$win32" == "xno"],	853	AS_IF([test "x$win32" = "xno"],
854	[echo "Dbus --with-dbus=$with_dbus"])	854	[echo "Dbus --with-dbus=$with_dbus"])
855	AS_IF([test "x$have_GM" = "xyes"],	855	AS_IF([test "x$have_GM" = "xyes"],
856	[echo "GraphicsMagick --with-graphicsmagick=yes"],	856	[echo "GraphicsMagick --with-graphicsmagick=yes"],
Lines 873-885 AS_IF([test "x$have_IM" != "xyes" && test "x$have_GM" != "xyes"], Link Here
873	[echo " => the zbarimg file scanner will NOT be built"])	873	[echo " => the zbarimg file scanner will NOT be built"])
874	AS_IF([test "x$have_GM" = "xyes"],	874	AS_IF([test "x$have_GM" = "xyes"],
875	[echo " => ImageMagick is preferred, as GraphicsMagick doesn't support https"])	875	[echo " => ImageMagick is preferred, as GraphicsMagick doesn't support https"])
876	AS_IF([test "x$with_gtk" == "xno"],	876	AS_IF([test "x$with_gtk" = "xno"],
877	[echo " => GTK support will NOT be built"])	877	[echo " => GTK support will NOT be built"])
878	AS_IF([test "x$with_pygtk2" != "xyes" && test "xPYTHON_VERSION_MAJOR" = "x2"],	878	AS_IF([test "x$with_pygtk2" != "xyes" && test "xPYTHON_VERSION_MAJOR" = "x2"],
879	[echo " => the Python 2 GTK widget wrapper will NOT be built"])	879	[echo " => the Python 2 GTK widget wrapper will NOT be built"])
880	AS_IF([test "x$with_qt" != "xyes"],	880	AS_IF([test "x$with_qt" != "xyes"],
881	[echo " => the Qt widget will NOT be built"])	881	[echo " => the Qt widget will NOT be built"])
882	AS_IF([test "x$with_qt" == "xyes" && test "x$enable_static_qt" == "xyes" ],	882	AS_IF([test "x$with_qt" = "xyes" && test "x$enable_static_qt" = "xyes" ],
883	[echo " => Building a static Qt library"])	883	[echo " => Building a static Qt library"])
884	AS_IF([test "x$with_java" != "xyes"],	884	AS_IF([test "x$with_java" != "xyes"],
885	[echo " => the Java interface will NOT be built"])	885	[echo " => the Java interface will NOT be built"])
Lines 888-892 AS_IF([test "x$with_java_unit" != "xyes"], Link Here
888	#echo "NPAPI Plugin --with-npapi=$with_npapi"	888	#echo "NPAPI Plugin --with-npapi=$with_npapi"
889	#AS_IF([test "x$with_mozilla" != "xyes"],	889	#AS_IF([test "x$with_mozilla" != "xyes"],
890	# [echo " => the Mozilla/Firefox/OpenOffice plugin will NOT be built"])	890	# [echo " => the Mozilla/Firefox/OpenOffice plugin will NOT be built"])
891	AS_IF([test "x$enable_pdf417" == "xyes"],	891	AS_IF([test "x$enable_pdf417" = "xyes"],
892	[echo " => the pdf417 code support is incomplete!"])	892	[echo " => the pdf417 code support is incomplete!"])
893	-