Target test before gtk/glade/gtkglext check no longer required as availability of pkg-config macros is now properly done.

This commit is contained in:
evilynux 2007-07-06 06:19:29 +00:00
parent dee854b989
commit eb23b54316
1 changed files with 41 additions and 45 deletions

View File

@ -49,11 +49,9 @@ dnl - Check for the OpenGL includes
AC_CHECK_HEADERS([GL/gl.h])
AC_CHECK_HEADERS([GL/glu.h])
case $target in
*linux* | *bsd* | *darwin*)
dnl - Check for GTK and/or libglade
AC_CHECK_TOOL(HAVE_PKG, pkg-config)
AC_PROVIDE_IFELSE([PKG_PROG_PKG_CONFIG], [
dnl - Check for GTK and/or libglade
AC_CHECK_TOOL(HAVE_PKG, pkg-config)
AC_PROVIDE_IFELSE([PKG_PROG_PKG_CONFIG], [
if test ! "x$HAVE_PKG" = "x" ; then
PKG_CHECK_MODULES(GTK,
"gtk+-2.0",
@ -90,16 +88,14 @@ case $target in
AC_DEFINE_UNQUOTED(GLADEUI_UNINSTALLED_DIR,"`pwd`/src/gtk-glade/glade/",[path to glade ui dir])
AC_SUBST(GLADEUI_UNINSTALLED_DIR)
fi
],[
],[
echo "WARNING: pkg-config is not available therefore gtk and gtk-glade UIs are not available either."
])
])
dnl - If the gtkGLext package is available define the corresponding C macro
if test "x$HAVE_GTKGLEXT" = "xyes"; then
dnl - If the gtkGLext package is available define the corresponding C macro
if test "x$HAVE_GTKGLEXT" = "xyes"; then
AC_DEFINE([GTKGLEXT_AVAILABLE], [1])
fi
;;
esac
fi
dnl - Determine which UI's to build
if test "x$HAVE_SDL" = "xyes"; then