X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=configure.in;h=fa285cf5b684d3686503734cce2af084d01bab98;hb=963473ba556521f918db6d8e312c3fcee09c7c1d;hp=8434256a26f34a621902e3a720ebf6cf65f36783;hpb=de868d58dd738ec06072bfa90b5d598d5001c76d;p=chaz%2Fopenbox diff --git a/configure.in b/configure.in index 8434256a..fa285cf5 100644 --- a/configure.in +++ b/configure.in @@ -82,15 +82,45 @@ if test x$SHAPE = "xyes"; then AC_DEFINE(SHAPE,1,Enable support of the XShape extension) fi +dnl Check for Xinerama extension support and proper library files. +XINERAMA="" +AC_MSG_CHECKING([whether to build support for the Xinerama extension]) +AC_ARG_ENABLE( + xinerama, [ --enable-xinerama enable support of the Xinerama extension [default=no]], + if test x$enableval = "xyes"; then + AC_MSG_RESULT([yes]) + + AC_CHECK_LIB(Xinerama, XineramaQueryExtension, + AC_MSG_CHECKING([for X11/extensions/Xinerama.h]) + AC_TRY_LINK( +#include +#include +, XineramaScreenInfo foo, + AC_MSG_RESULT([yes]) + XINERAMA="yes" + LIBS="$LIBS -lXinerama", + AC_MSG_RESULT([no]) + ) + ) + + else + AC_MSG_RESULT([no]) + fi, + AC_MSG_RESULT([no]) +) +if test x$XINERAMA = "xyes"; then + AC_DEFINE(XINERAMA,1,Enable support of the Xinerama extension) +fi + dnl Check for Xft extension support and proper library files. XFT="" AC_MSG_CHECKING([whether to build support for the Xft extension]) AC_ARG_ENABLE( - xft, [ --enable-xft enable support of the Xft extension [default=yes]]) - + xft, [ --enable-xft enable support of the Xft extension [default=yes]]) : ${enableval="yes"} if test x$enableval = "xyes"; then AC_MSG_RESULT([yes]) + AC_CHECK_LIB(Xft, XftFontOpenXlfd, AC_MSG_CHECKING([for X11/Xft/Xft.h]) AC_TRY_LINK( @@ -98,36 +128,19 @@ if test x$enableval = "xyes"; then #include , XftFont foo, AC_MSG_RESULT([yes]) - XFT="yes", + XFT="yes" + LIBS="$LIBS -lXft", AC_MSG_RESULT([no]) ) ) + else AC_MSG_RESULT([no]) fi if test x$XFT = "xyes"; then - LIBS="$LIBS -lXft" AC_DEFINE(XFT,1,Enable support of the Xft extension) fi -dnl Check for the Slit -SLIT="" -AC_MSG_CHECKING([whether to include the Slit]) -AC_ARG_ENABLE( - slit, [ --enable-slit include code for the Slit [default=yes]], - if test x$enableval = "xyes"; then - AC_MSG_RESULT([yes]) - SLIT="yes" - else - AC_MSG_RESULT([no]) - fi, - AC_MSG_RESULT([yes]) - SLIT="yes" -) -if test x$SLIT = "xyes"; then - AC_DEFINE(SLIT,1,Enable the Slit) -fi - dnl Check for ordered 8bpp dithering ORDEREDPSEUDO="" AC_MSG_CHECKING([whether to include Pseudocolor ordered dithering code]) @@ -146,24 +159,6 @@ if test x$ORDEREDPSEUDO = "xyes"; then AC_DEFINE(ORDEREDPSEUDO,1,Enable pseudocolor ordered dithering) fi -dnl Check for event clobbering -CLOBBER="" -AC_MSG_CHECKING([whether to intercept mouse events to clients]) -AC_ARG_ENABLE(clobber, -[ --enable-clobber intercept mouse events to clients when num lock - or scroll lock are on [default=yes]], - if test x$enableval = "xno"; then - AC_MSG_RESULT([no]) - CLOBBER="no" - else - AC_MSG_RESULT([yes]) - fi, - AC_MSG_RESULT([yes]) -) -if test x$CLOBBER = "xno"; then - AC_DEFINE(NOCLOBBER,1,Disable grabbing of mouse events when num/scoll lock is pressed) -fi - dnl Check whether to include debugging code DEBUG="" AC_MSG_CHECKING([whether to include verbose debugging code]) @@ -171,7 +166,7 @@ AC_ARG_ENABLE(debug, [ --enable-debug include verbose debugging code [default=no]], if test x$enableval = "xyes"; then AC_MSG_RESULT([yes]) - DEBUG="-DDEBUG -Wall -W" + DEBUG="-DDEBUG -Wall -W -fno-inline" else AC_MSG_RESULT([no]) DEBUG="-DNDEBUG" @@ -248,6 +243,7 @@ AM_CONFIG_HEADER(config.h) AC_OUTPUT(Makefile src/Makefile util/Makefile +util/epist/Makefile data/Makefile data/styles/Makefile doc/Makefile @@ -255,14 +251,18 @@ nls/Makefile nls/C/Makefile nls/da_DK/Makefile nls/de_DE/Makefile +nls/es_AR/Makefile nls/es_ES/Makefile nls/et_EE/Makefile nls/fr_FR/Makefile nls/hu_HU/Makefile nls/it_IT/Makefile nls/ja_JP/Makefile +nls/ko_KR/Makefile +nls/no_NO/Makefile nls/nl_NL/Makefile nls/pt_BR/Makefile +nls/ro_RO/Makefile nls/ru_RU/Makefile nls/sl_SI/Makefile nls/sv_SE/Makefile