X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=m4%2Fx11.m4;h=bff7e63177260fd27b28fdb5625282702d13641c;hb=cc4e44e8376f5b76cb23f8cd642f32e0e41b9150;hp=2eae1db5f719dda94b7799a7bfeaa94ab22e3803;hpb=f5202acb60c56c35e21a4d5cce8687a46df4da92;p=chaz%2Fopenbox diff --git a/m4/x11.m4 b/m4/x11.m4 index 2eae1db5..bff7e631 100644 --- a/m4/x11.m4 +++ b/m4/x11.m4 @@ -29,155 +29,6 @@ AC_DEFUN([X11_DEVEL], CPPFLAGS=$OLDCPPFLAGS ]) - -AC_DEFUN([XFT_ERROR], -[ - if test "$XFT_MIN"; then - AC_MSG_ERROR([$PACKAGE requires the Xft font library >= $XFT_MIN. - See http://www.fontconfig.org/ -]) - else - AC_MSG_ERROR([$PACKAGE requires the Xft font library. - See http://www.fontconfig.org/ -]) - fi -]) - -# XFT_DEVEL([required-version]) -# -# Check for the XFT development package. -# You can use the optional argument to check for a library of at least the -# given version. -# It provides the $(PYTHON_CFLAGS) $(PYTHON_LIBS) output variables. -AC_DEFUN([XFT_DEVEL], -[ - AC_REQUIRE([X11_DEVEL]) - - if test "$1"; then - XFT_MIN="$1" - XFT_MIN_MAJOR=${XFT_MIN%.*.*} - XFT_MIN_MINOR=${XFT_MIN%.*} - XFT_MIN_MINOR=${XFT_MIN_MINOR#*.} - XFT_MIN_REVISION=${XFT_MIN#*.*.} - XFT_MIN="$XFT_MIN_MAJOR.$XFT_MIN_MINOR.$XFT_MIN_REVISION" - else - XFT_MIN="" - fi - - if test -z "$XFT_MIN"; then - AC_MSG_CHECKING([for Xft]) - if ! pkg-config xft; then - AC_MSG_RESULT([no]) - XFT_ERROR - fi - else - AC_MSG_CHECKING([for Xft version >= $XFT_MIN]) - if ! pkg-config --atleast-version $XFT_MIN xft; then - AC_MSG_RESULT([no]) - XFT_ERROR - fi - fi - AC_MSG_RESULT([yes]) - - - # Store these - OLDLIBS=$LIBS - OLDCPPFLAGS=$CPPFLAGS - - XFT_CFLAGS="`pkg-config --cflags xft`" - XFT_LIBS="`pkg-config --libs xft`" - - # Set these for checking with the tests below. They'll be restored after - LIBS="$LIBS $XFT_LIBS" - CPPFLAGS="$XFT_CFLAGS $CPPFLAGS" - - AC_CHECK_LIB([Xft], [XftGetVersion], # this was not defined in < 2.0 - if test "$XFT_MIN"; then - AC_MSG_CHECKING([for X11/Xft/Xft.h for Xft >= $XFT_MIN]) - AC_TRY_COMPILE( - [ - #include - #include - ], - [ - #if !defined(XFT_MAJOR) - # error Xft.h is too old - #endif - #if XFT_MAJOR < $XFT_MIN_MAJOR - # error Xft.h is too old - #endif - #if XFT_MAJOR == $XFT_MIN_MAJOR - # if XFT_MINOR < $XFT_MIN_MINOR - # error Xft.h is too old - # endif - #endif - #if XFT_MAJOR == $XFT_MIN_MAJOR - # if XFT_MAJOR == $XFT_MIN_MINOR - # if XFT_REVISION < $XFT_MIN_REVISION - # error Xft.h is too old - # endif - # endif - #endif - - int i = XFT_MAJOR; - XftFont foo; - ], - [ - AC_MSG_RESULT([yes]) - ], - [ - AC_MSG_RESULT([no]) - XFT_ERROR - ]) - else - AC_MSG_CHECKING([for X11/Xft/Xft.h]) - AC_TRY_COMPILE( - [ - #include - #include - ], - [ - int i = XFT_MAJOR; /* make sure were using Xft 2, not 1 */ - XftFont foo; - ], - [ - AC_MSG_RESULT([yes]) - ], - [ - AC_MSG_RESULT([no]) - XFT_ERROR - ]) - fi - - AC_MSG_CHECKING([if we can compile with Xft]) - AC_TRY_LINK( - [ - #include - #include - ], - [ - int i = XFT_MAJOR; - XftFont foo - ], - [ - AC_MSG_RESULT([yes]) - ], - [ - AC_MSG_RESULT([no]) - AC_MSG_ERROR([Unable to compile with the Xft font library. -]) - ]) - ) - - # Restore the old values. Use XFT_CFLAGS and XFT_LIBS in the Makefiles - LIBS=$OLDLIBS - CPPFLAGS=$OLDCPPFLAGS - - AC_SUBST([XFT_CFLAGS]) - AC_SUBST([XFT_LIBS]) -]) - - # X11_EXT_XKB() # # Check for the presence of the "Xkb" X Window System extension. @@ -397,6 +248,113 @@ AC_DEFUN([X11_EXT_XINERAMA], fi ]) +# X11_EXT_SYNC() +# +# Check for the presence of the "Sync" X Window System extension. +# Defines "SYNC", sets the $(SYNC) variable to "yes", and sets the $(LIBS) +# appropriately if the extension is present. +AC_DEFUN([X11_EXT_SYNC], +[ + AC_REQUIRE([X11_DEVEL]) + + # Store these + OLDLIBS=$LIBS + OLDCPPFLAGS=$CPPFLAGS + + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + LIBS="$LIBS $X_LIBS" + + AC_CHECK_LIB([Xext], [XSyncInitialize], + AC_MSG_CHECKING([for X11/extensions/sync.h]) + AC_TRY_LINK( + [ + #include + #include + #include + ], + [ + XSyncValueType foo; + ], + [ + AC_MSG_RESULT([yes]) + SYNC="yes" + AC_DEFINE([SYNC], [1], [Found the XSync extension]) + + XSYNC_CFLAGS="" + XSYNC_LIBS="-lXext" + AC_SUBST(XSYNC_CFLAGS) + AC_SUBST(XSYNC_LIBS) + ], + [ + AC_MSG_RESULT([no]) + SYNC="no" + ]) + ) + + LIBS=$OLDLIBS + CPPFLAGS=$OLDCPPFLAGS + + AC_MSG_CHECKING([for the Sync extension]) + if test "$SYNC" = "yes"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi +]) + +# X11_EXT_AUTH() +# +# Check for the presence of the "Xau" X Window System extension. +# Defines "AUTH, sets the $(AUTH) variable to "yes", and sets the $(LIBS) +# appropriately if the extension is present. +AC_DEFUN([X11_EXT_AUTH], +[ + AC_REQUIRE([X11_DEVEL]) + + # Store these + OLDLIBS=$LIBS + OLDCPPFLAGS=$CPPFLAGS + + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + LIBS="$LIBS $X_LIBS" + + AC_CHECK_LIB([Xau], [XauReadAuth], + AC_MSG_CHECKING([for X11/Xauth.h]) + AC_TRY_LINK( + [ + #include + #include + #include + ], + [ + ], + [ + AC_MSG_RESULT([yes]) + AUTH="yes" + AC_DEFINE([AUTH], [1], [Found the Xauth extension]) + + XAUTH_CFLAGS="" + XAUTH_LIBS="-lXau" + AC_SUBST(XAUTH_CFLAGS) + AC_SUBST(XAUTH_LIBS) + ], + [ + AC_MSG_RESULT([no]) + AUTH="no" + ]) + ) + + LIBS=$OLDLIBS + CPPFLAGS=$OLDCPPFLAGS + + AC_MSG_CHECKING([for the Xauth extension]) + if test "$AUTH" = "yes"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi +]) + # X11_SM() # # Check for the presence of SMlib for session management.