add --disable options for x extensions
so we can test compiling without them present
This commit is contained in:
Dana Jansens
parent
118a4fe76b
commit
2f38d883ea
2 changed files with 222 additions and 183 deletions
14
configure.ac
14
configure.ac
|
|
@ -87,11 +87,9 @@ AC_PROG_INSTALL
|
|||
AM_GNU_GETTEXT_VERSION(0.15)
|
||||
AM_GNU_GETTEXT([external])
|
||||
|
||||
AC_CHECK_HEADERS(ctype.h fcntl.h grp.h locale.h pwd.h signal.h string.h)
|
||||
AC_CHECK_HEADERS(stdio.h stdlib.h unistd.h sys/stat.h sys/select.h)
|
||||
AC_CHECK_HEADERS(sys/socket.h sys/time.h sys/wait.h)
|
||||
# AC_HEADER_TIME
|
||||
# AC_TYPE_SIGNAL
|
||||
AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h grp.h locale.h pwd.h)
|
||||
AC_CHECK_HEADERS(signal.h string.h stdio.h stdlib.h unistd.h sys/stat.h)
|
||||
AC_CHECK_HEADERS(sys/select.h sys/socket.h sys/time.h sys/types.h sys/wait.h)
|
||||
|
||||
AC_PATH_PROG([SED], [sed], [no])
|
||||
if test "$SED" = "no"; then
|
||||
|
|
@ -118,7 +116,7 @@ AC_SUBST(XML_LIBS)
|
|||
AC_ARG_ENABLE(startup-notification,
|
||||
AC_HELP_STRING(
|
||||
[--disable-startup-notification],
|
||||
[disable the startup notification library. [[default=enabled]]]
|
||||
[disable the startup notification library. [default=enabled]]
|
||||
),
|
||||
[enable_sn=$enableval],
|
||||
[enable_sn=yes]
|
||||
|
|
@ -143,7 +141,7 @@ fi
|
|||
AC_ARG_ENABLE(xcursor,
|
||||
AC_HELP_STRING(
|
||||
[--disable-xcursor],
|
||||
[disable use of the X Cursor library. [[default=enabled]]]
|
||||
[disable use of the X Cursor library. [default=enabled]]
|
||||
),
|
||||
[enable_xcursor=$enableval],
|
||||
[enable_xcursor=yes]
|
||||
|
|
@ -168,7 +166,7 @@ fi
|
|||
AC_ARG_ENABLE(imlib2,
|
||||
AC_HELP_STRING(
|
||||
[--disable-imlib2],
|
||||
[disable use of Imlib2 image library for loading icons. [[default=enabled]]]
|
||||
[disable use of Imlib2 image library for loading icons. [default=enabled]]
|
||||
),
|
||||
[enable_imlib2=$enableeval],
|
||||
[enable_imlib2=yes]
|
||||
|
|
|
|||
45
m4/x11.m4
45
m4/x11.m4
|
|
@ -38,6 +38,13 @@ AC_DEFUN([X11_EXT_XKB],
|
|||
[
|
||||
AC_REQUIRE([X11_DEVEL])
|
||||
|
||||
AC_ARG_ENABLE([xkb],
|
||||
AC_HELP_STRING(
|
||||
[--disable-xkb],
|
||||
[build without support for xkb extension [default=enabled]]),
|
||||
[USE=$enableval], [USE="yes"])
|
||||
|
||||
if test "$USE" = "yes"; then
|
||||
# Store these
|
||||
OLDLIBS=$LIBS
|
||||
OLDCPPFLAGS=$CPPFLAGS
|
||||
|
|
@ -76,6 +83,7 @@ AC_DEFUN([X11_EXT_XKB],
|
|||
|
||||
LIBS=$OLDLIBS
|
||||
CPPFLAGS=$OLDCPPFLAGS
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([for the Xkb extension])
|
||||
if test "$XKB" = "yes"; then
|
||||
|
|
@ -94,6 +102,13 @@ AC_DEFUN([X11_EXT_XRANDR],
|
|||
[
|
||||
AC_REQUIRE([X11_DEVEL])
|
||||
|
||||
AC_ARG_ENABLE([xrandr],
|
||||
AC_HELP_STRING(
|
||||
[--disable-xrandr],
|
||||
[build without support for xrandr extension [default=enabled]]),
|
||||
[USE=$enableval], [USE="yes"])
|
||||
|
||||
if test "$USE" = "yes"; then
|
||||
# Store these
|
||||
OLDLIBS=$LIBS
|
||||
OLDCPPFLAGS=$CPPFLAGS
|
||||
|
|
@ -133,6 +148,7 @@ AC_DEFUN([X11_EXT_XRANDR],
|
|||
|
||||
LIBS=$OLDLIBS
|
||||
CPPFLAGS=$OLDCPPFLAGS
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([for the XRandR extension])
|
||||
if test "$XRANDR" = "yes"; then
|
||||
|
|
@ -151,6 +167,13 @@ AC_DEFUN([X11_EXT_SHAPE],
|
|||
[
|
||||
AC_REQUIRE([X11_DEVEL])
|
||||
|
||||
AC_ARG_ENABLE([xshape],
|
||||
AC_HELP_STRING(
|
||||
[--disable-xshape],
|
||||
[build without support for xshape extension [default=enabled]]),
|
||||
[USE=$enableval], [USE="yes"])
|
||||
|
||||
if test "$USE" = "yes"; then
|
||||
# Store these
|
||||
OLDLIBS=$LIBS
|
||||
OLDCPPFLAGS=$CPPFLAGS
|
||||
|
|
@ -187,6 +210,7 @@ AC_DEFUN([X11_EXT_SHAPE],
|
|||
|
||||
LIBS=$OLDLIBS
|
||||
CPPFLAGS=$OLDCPPFLAGS
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([for the Shape extension])
|
||||
if test "$SHAPE" = "yes"; then
|
||||
|
|
@ -206,6 +230,13 @@ AC_DEFUN([X11_EXT_XINERAMA],
|
|||
[
|
||||
AC_REQUIRE([X11_DEVEL])
|
||||
|
||||
AC_ARG_ENABLE([xinerama],
|
||||
AC_HELP_STRING(
|
||||
[--disable-xinerama],
|
||||
[build without support for xinerama [default=enabled]]),
|
||||
[USE=$enableval], [USE="yes"])
|
||||
|
||||
if test "$USE" = "yes"; then
|
||||
# Store these
|
||||
OLDLIBS=$LIBS
|
||||
OLDCPPFLAGS=$CPPFLAGS
|
||||
|
|
@ -239,6 +270,7 @@ AC_DEFUN([X11_EXT_XINERAMA],
|
|||
|
||||
LIBS=$OLDLIBS
|
||||
CPPFLAGS=$OLDCPPFLAGS
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([for the Xinerama extension])
|
||||
if test "$XINERAMA" = "yes"; then
|
||||
|
|
@ -257,6 +289,13 @@ AC_DEFUN([X11_EXT_SYNC],
|
|||
[
|
||||
AC_REQUIRE([X11_DEVEL])
|
||||
|
||||
AC_ARG_ENABLE([xsync],
|
||||
AC_HELP_STRING(
|
||||
[--disable-xsync],
|
||||
[build without support for xsync extension [default=enabled]]),
|
||||
[USE=$enableval], [USE="yes"])
|
||||
|
||||
if test "$USE" = "yes"; then
|
||||
# Store these
|
||||
OLDLIBS=$LIBS
|
||||
OLDCPPFLAGS=$CPPFLAGS
|
||||
|
|
@ -293,6 +332,7 @@ AC_DEFUN([X11_EXT_SYNC],
|
|||
|
||||
LIBS=$OLDLIBS
|
||||
CPPFLAGS=$OLDCPPFLAGS
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([for the Sync extension])
|
||||
if test "$SYNC" = "yes"; then
|
||||
|
|
@ -365,7 +405,8 @@ AC_DEFUN([X11_SM],
|
|||
|
||||
AC_ARG_ENABLE([session-management],
|
||||
AC_HELP_STRING(
|
||||
[--disable-session-management], [build without support for session managers [[default=enabled]]]),
|
||||
[--disable-session-management],
|
||||
[build without support for session managers [default=enabled]]),
|
||||
[SM=$enableval], [SM="yes"])
|
||||
|
||||
if test "$SM" = "yes"; then
|
||||
|
|
@ -388,10 +429,10 @@ AC_DEFUN([X11_SM],
|
|||
SM="yes"
|
||||
])
|
||||
])
|
||||
fi
|
||||
|
||||
LIBS=$OLDLIBS
|
||||
CPPFLAGS=$OLDCPPFLAGS
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([for session management support])
|
||||
if test "$SM" = "yes"; then
|
||||
|
|
|
|||
Loading…
Reference in a new issue