Commit c07f9c04 authored by Matthias Clasen's avatar Matthias Clasen

Some configure.ac cleanups

Change from --with-xinput to --enable-xinput, and consistently
use AC_HELP_STRING. Also document the packagekit options in the
docs.
parent d72d19d2
......@@ -236,21 +236,24 @@ AC_ARG_ENABLE(debug,
AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
[turn on debugging @<:@default=debug_default@:>@]),,
enable_debug=debug_default)
AC_ARG_ENABLE(rebuilds,
[AC_HELP_STRING([--disable-rebuilds],
[disable all source autogeneration rules])],,
[enable_rebuilds=yes])
AC_ARG_ENABLE(xkb,
[AC_HELP_STRING([--enable-xkb],
[support XKB [default=maybe]])],,
[support XKB extension [default=maybe]])],,
[enable_xkb="maybe"])
AC_ARG_ENABLE(xinerama,
[AC_HELP_STRING([--enable-xinerama],
[support xinerama extension if available [default=yes]])],,
[support Xinerama extension if available [default=yes]])],,
[enable_xinerama="yes"])
AC_ARG_ENABLE(rebuilds,
[AC_HELP_STRING([--disable-rebuilds],
[disable all source autogeneration rules])],,
[enable_rebuilds=yes])
AC_ARG_WITH(xinput,
[AC_HELP_STRING([--with-xinput=@<:@no/yes@:>@], [support XInput])])
AC_ARG_ENABLE(xinput,
[AC_HELP_STRING([--enable-xinput],
[support XInput extension if available [default=yes]])],,
[enable_xinput="yes"])
if test "$platform_win32" = yes; then
gdktarget=win32
......@@ -258,8 +261,10 @@ else
gdktarget=x11
fi
AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz]] select non-default GDK target],
gdktarget=$with_gdktarget)
AC_ARG_WITH(gdktarget,
AC_HELP_STRING([--with-gdktarget=@<:@x11/win32/quartz@:>@],
[select non-default GDK target]),
gdktarget=$with_gdktarget)
AC_SUBST(gdktarget)
case $gdktarget in
......@@ -726,8 +731,8 @@ dnl AC_HELP_STRING cause problems.
dnl AC_HELP_STRING([--with-included-immodules=MODULE1 MODULE2 ...],
dnl [build the specified input method modules into gtk])
AC_ARG_WITH(included_immodules,
[ --with-included-immodules=MODULE1,MODULE2,...
build the specified input methods into gtk])
AC_HELP_STRING([--with-included-immodules=MODULE1,MODULE2,...],
[build the specified input methods into gtk]))
if $dynworks; then
:
......@@ -1017,7 +1022,7 @@ if test "x$gdktarget" = "xx11"; then
fi
# set up things for XInput
if test "x$with_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then
if test "x$enable_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then
have_xinput=yes
AC_DEFINE(XINPUT_XFREE, 1,
......@@ -1272,7 +1277,7 @@ LIBS="$old_LIBS"
################################################################
AC_ARG_ENABLE(cups,
[AC_HELP_STRING([--disable-cups]
[AC_HELP_STRING([--disable-cups],
[disable cups print backend])],,
[enable_cups=auto])
......@@ -1332,7 +1337,7 @@ fi
#
AC_ARG_ENABLE(papi,
[AC_HELP_STRING([--disable-papi]
[AC_HELP_STRING([--disable-papi],
[disable papi print backend])],,
[enable_papi=auto])
......@@ -1367,7 +1372,7 @@ if test "$os_win32" != "yes"; then
*** postscript backend enabled.]))
AC_CHECK_HEADER(cairo-svg.h,,AC_MSG_ERROR([
*** Can't find cairo-svg.h. You must build Cairo with the
*** Cannot find cairo-svg.h. You must build Cairo with the
*** svg backend enabled.]))
fi
......@@ -1418,15 +1423,15 @@ GOBJECT_INTROSPECTION_CHECK([0.9.3])
#################################################
AC_ARG_ENABLE(packagekit,
AC_HELP_STRING([--disable-packagekit],
[build packagekit open with module]))
AC_HELP_STRING([--disable-packagekit],
[build packagekit open-with module]))
ENABLE_PACKAGEKIT=
if test "os_win32" != "yes"; then
if test "x$enable_packagekit" != "xno"; then
ENABLE_PACKAGEKIT=1
AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable packagekit])
fi
if test "x$enable_packagekit" != "xno"; then
ENABLE_PACKAGEKIT=1
AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable packagekit])
fi
fi
AC_SUBST(ENABLE_PACKAGEKIT)
......
......@@ -327,7 +327,7 @@ How to compile GTK+ itself
<arg>--with-included-immodules=MODULE1,MODULE2,...</arg>
</group>
<group>
<arg>--enable-debug=[no|minimum|yes]</arg>
<arg>--enable-debug=[no/minimum/yes]</arg>
</group>
<group>
<arg>--disable-Bsymbolic</arg>
......@@ -354,13 +354,18 @@ How to compile GTK+ itself
<arg>--enable-papi</arg>
</group>
<group>
<arg>--with-xinput=[no|yes]</arg>
<arg>--enable-xinput</arg>
<arg>--disable-xinput</arg>
</group>
<group>
<arg>--with-gdktarget=[x11|win32|quartz]</arg>
<arg>--enable-packagekit</arg>
<arg>--disable-packagekit</arg>
</group>
<group>
<arg>--disable-introspection</arg>
<arg>--with-gdktarget=[x11/win32/quartz]</arg>
</group>
<group>
<arg>--enable-introspection=[no/auto/yes]</arg>
</group>
</cmdsynopsis>
</para>
......@@ -513,7 +518,8 @@ How to compile GTK+ itself
</formalpara>
<formalpara>
<title><systemitem>--with-xinput</systemitem></title>
<title><systemitem>--disable-xinput</systemitem> and
<systemitem>--enable-xinput</systemitem></title>
<para>
Controls whether GTK+ is built with support for the XInput
or XInput2 extension. These extensions provide an extended
......@@ -525,6 +531,19 @@ How to compile GTK+ itself
information.
</para>
</formalpara>
<formalpara>
<title><systemitem>--disable-packagekit</systemitem> and
<systemitem>--enable-packagekit</systemitem></title>
<para>
By default the <command>configure</command> script will try
to build the PackageKit support for the open-with dialog if
the PackageKit libraries are found.
These options can be used to explicitly control whether
PackageKit support should be built.
</para>
</formalpara>
<formalpara>
<title><systemitem>--with-gdktarget</systemitem></title>
......@@ -536,10 +555,11 @@ How to compile GTK+ itself
</para>
</formalpara>
<formalpara>
<title><systemitem>--disable-introspection</systemitem></title>
<title><systemitem>--enable-introspection</systemitem></title>
<para>
Build without introspection support.
Build with or without introspection support.
The default is 'auto'.
</para>
</formalpara>
</refsect1>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment