my newer better autoconf functions. woowoo

This commit is contained in:
Dana Jansens 2003-01-11 04:10:35 +00:00
parent 54e4a15d51
commit 02601c2856
3 changed files with 127 additions and 8 deletions

View file

@ -61,5 +61,3 @@ AC_DEFUN([OB_COMPILER_FLAGS],
AC_MSG_RESULT([$FLAGS]) AC_MSG_RESULT([$FLAGS])
CXXFLAGS="$CXXFLAGS $FLAGS" CXXFLAGS="$CXXFLAGS $FLAGS"
]) ])

View file

@ -10,7 +10,7 @@ AC_DEFUN([PYTHON_DEVEL],
python_prefix=${PYTHON%/bin*} python_prefix=${PYTHON%/bin*}
# Check for Python include path # Check for Python include path
AC_MSG_CHECKING([for Python include path]) AC_MSG_CHECKING([for python include path])
for i in "$python_prefix/include/python$PYTHON_VERSION/" \ for i in "$python_prefix/include/python$PYTHON_VERSION/" \
"$python_prefix/include/python/" "$python_prefix/" "$python_prefix/include/python/" "$python_prefix/"
do do
@ -26,12 +26,12 @@ AC_DEFUN([PYTHON_DEVEL],
then then
AC_MSG_RESULT([$python_path]) AC_MSG_RESULT([$python_path])
else else
AC_MSG_ERROR([cannot find Python include path]) AC_MSG_ERROR([cannot find python include path])
fi fi
AC_SUBST([PYTHON_CFLAGS], [-I$python_path]) AC_SUBST([PYTHON_CFLAGS], [-I$python_path])
# Check for a Python library # Check for a Python library
AC_MSG_CHECKING([for Python library]) AC_MSG_CHECKING([for python library])
PYLIB="" PYLIB=""
for i in "$python_prefix/lib" \ for i in "$python_prefix/lib" \
"$python_prefix/lib/python$PYTHON_VERSION/config" \ "$python_prefix/lib/python$PYTHON_VERSION/config" \
@ -61,7 +61,7 @@ AC_DEFUN([PYTHON_DEVEL],
then then
AC_MSG_RESULT([$PYLIB]) AC_MSG_RESULT([$PYLIB])
else else
AC_MSG_ERROR([cannot find Python library]) AC_MSG_ERROR([cannot find python library])
fi fi
AC_SUBST([PYTHON_LIBS]) AC_SUBST([PYTHON_LIBS])
]) ])

123
m4/x11.m4
View file

@ -45,11 +45,12 @@ AC_DEFUN([XFT_DEVEL],
AC_REQUIRE([X11_DEVEL]) AC_REQUIRE([X11_DEVEL])
if test "$1"; then if test "$1"; then
XFT_MIN=$1 XFT_MIN="$1"
XFT_MIN_MAJOR=${XFT_MIN%.*.*} XFT_MIN_MAJOR=${XFT_MIN%.*.*}
XFT_MIN_MINOR=${XFT_MIN%.*} XFT_MIN_MINOR=${XFT_MIN%.*}
XFT_MIN_MINOR=${XFT_MIN_MINOR#*.} XFT_MIN_MINOR=${XFT_MIN_MINOR#*.}
XFT_MIN_REVISION=${XFT_MIN#*.*.} XFT_MIN_REVISION=${XFT_MIN#*.*.}
XFT_MIN="$XFT_MIN_MAJOR.$XFT_MIN_MINOR.$XFT_MIN_REVISION"
else else
XFT_MIN="" XFT_MIN=""
fi fi
@ -166,3 +167,123 @@ AC_DEFUN([XFT_DEVEL],
AC_SUBST([XFT_CFLAGS]) AC_SUBST([XFT_CFLAGS])
AC_SUBST([XFT_LIBS]) AC_SUBST([XFT_LIBS])
]) ])
# X11_EXT_XKB()
#
# Check for the presence of the "Xkb" X Window System extension.
# Defines "XKB" and sets the $(XKB) variable to "yes" if the extension is
# present.
AC_DEFUN([X11_EXT_XKB],
[
AC_REQUIRE([X11_DEVEL])
AC_CHECK_LIB([X11], [XkbBell],
AC_MSG_CHECKING([for X11/XKBlib.h])
AC_TRY_LINK(
[
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/XKBlib.h>
],
[
Display *d;
Window w;
XkbBell(d, w, 0, 0);
],
[
AC_MSG_RESULT([yes])
XKB="yes"
AC_DEFINE([XKB], [1], [Found the XKB extension])
],
[
AC_MSG_RESULT([no])
XKB="no"
])
)
AC_MSG_CHECKING([for the Xkb extension])
if test "$XKB" = "yes"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
])
# X11_EXT_SHAPE()
#
# Check for the presence of the "Shape" X Window System extension.
# Defines "SHAPE", sets the $(SHAPE) variable to "yes", and sets the $(LIBS)
# appropriately if the extension is present.
AC_DEFUN([X11_EXT_SHAPE],
[
AC_REQUIRE([X11_DEVEL])
AC_CHECK_LIB([Xext], [XShapeCombineShape],
AC_MSG_CHECKING([for X11/extensions/shape.h])
AC_TRY_LINK(
[
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/extensions/shape.h>
],
[
long foo = ShapeSet;
],
[
AC_MSG_RESULT([yes])
SHAPE="yes"
AC_DEFINE([SHAPE], [1], [Found the XShape extension])
LIBS="$LIBS -lXext"
],
[
AC_MSG_RESULT([no])
SHAPE="no"
])
)
AC_MSG_CHECKING([for the Shape extension])
if test "$SHAPE" = "yes"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
])
# X11_EXT_XINERAMA()
#
# Check for the presence of the "Xinerama" X Window System extension.
# Defines "XINERAMA", sets the $(XINERAMA) variable to "yes", and sets the
# $(LIBS) appropriately if the extension is present.
AC_DEFUN([X11_EXT_XINERAMA],
[
AC_REQUIRE([X11_DEVEL])
AC_CHECK_LIB([Xinerama], [XineramaQueryExtension],
[
AC_MSG_CHECKING([for X11/extensions/Xinerama.h])
AC_TRY_LINK(
[
#include <X11/Xlib.h>
#include <X11/extensions/Xinerama.h>
],
[
XineramaScreenInfo foo;
],
[
AC_MSG_RESULT([yes])
XINERAMA="yes"
AC_DEFINE([XINERAMA], [1], [Enable support of the Xinerama extension])
LIBS="$LIBS -lXinerama"
],
[
AC_MSG_RESULT([no])
XINERAMA="no"
])
])
AC_MSG_CHECKING([for the Xinerama extension])
if test "$XINERAMA" = "yes"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
])