ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
desmume/configure.ac
View File

@ -49,57 +49,53 @@ dnl - Check for the OpenGL includes
AC_CHECK_HEADERS([GL/gl.h]) AC_CHECK_HEADERS([GL/gl.h])
AC_CHECK_HEADERS([GL/glu.h]) AC_CHECK_HEADERS([GL/glu.h])
case $target in dnl - Check for GTK and/or libglade
*linux* | *bsd* | *darwin*) AC_CHECK_TOOL(HAVE_PKG, pkg-config)
dnl - Check for GTK and/or libglade AC_PROVIDE_IFELSE([PKG_PROG_PKG_CONFIG], [
AC_CHECK_TOOL(HAVE_PKG, pkg-config) if test ! "x$HAVE_PKG" = "x" ; then
AC_PROVIDE_IFELSE([PKG_PROG_PKG_CONFIG], [ PKG_CHECK_MODULES(GTK,
if test ! "x$HAVE_PKG" = "x" ; then "gtk+-2.0",
PKG_CHECK_MODULES(GTK, HAVE_GTK=yes,
"gtk+-2.0", HAVE_GTK=no)
HAVE_GTK=yes, AC_SUBST(GTK_CFLAGS)
HAVE_GTK=no) AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
PKG_CHECK_MODULES(GTKGLEXT, PKG_CHECK_MODULES(GTKGLEXT,
"gtkglext-1.0", "gtkglext-1.0",
HAVE_GTKGLEXT=yes, HAVE_GTKGLEXT=yes,
HAVE_GTKGLEXT=no) HAVE_GTKGLEXT=no)
AC_SUBST(GTKGLEXT_CFLAGS) AC_SUBST(GTKGLEXT_CFLAGS)
AC_SUBST(GTKGLEXT_LIBS) AC_SUBST(GTKGLEXT_LIBS)
PKG_CHECK_MODULES(GTHREAD, PKG_CHECK_MODULES(GTHREAD,
"gthread-2.0", "gthread-2.0",
HAVE_GTHREAD=yes, HAVE_GTHREAD=yes,
HAVE_GTHREAD=no) HAVE_GTHREAD=no)
AC_SUBST(GTHREAD_CFLAGS) AC_SUBST(GTHREAD_CFLAGS)
AC_SUBST(GTHREAD_LIBS) AC_SUBST(GTHREAD_LIBS)
AC_CHECK_LIB(gdkglext-x11-1.0, gdk_gl_init) AC_CHECK_LIB(gdkglext-x11-1.0, gdk_gl_init)
PKG_CHECK_MODULES(LIBGLADE, PKG_CHECK_MODULES(LIBGLADE,
"libglade-2.0", "libglade-2.0",
HAVE_LIBGLADE=yes, HAVE_LIBGLADE=yes,
HAVE_LIBGLADE=no) HAVE_LIBGLADE=no)
AC_SUBST(LIBGLADE_CFLAGS) AC_SUBST(LIBGLADE_CFLAGS)
AC_SUBST(LIBGLADE_LIBS) AC_SUBST(LIBGLADE_LIBS)
dnl uninstalled glade ui dir
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 dnl uninstalled glade ui dir
if test "x$HAVE_GTKGLEXT" = "xyes"; then AC_DEFINE_UNQUOTED(GLADEUI_UNINSTALLED_DIR,"`pwd`/src/gtk-glade/glade/",[path to glade ui dir])
AC_DEFINE([GTKGLEXT_AVAILABLE], [1]) AC_SUBST(GLADEUI_UNINSTALLED_DIR)
fi fi
;; ],[
esac 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
AC_DEFINE([GTKGLEXT_AVAILABLE], [1])
fi
dnl - Determine which UI's to build dnl - Determine which UI's to build
if test "x$HAVE_SDL" = "xyes"; then if test "x$HAVE_SDL" = "xyes"; then