re-add check for gtk1, which is used for pbx_gtkconsole
authorRussell Bryant <russell@russellbryant.com>
Wed, 9 Jan 2008 22:51:15 +0000 (22:51 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 9 Jan 2008 22:51:15 +0000 (22:51 +0000)
(related to issue #11706)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@97643 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configure.ac

index a060636..286f19d 100644 (file)
@@ -1225,8 +1225,17 @@ AC_CHECK_HEADER([linux/videodev.h],
 AST_EXT_LIB_CHECK([X11], [X11], [XOpenDisplay], [X11/Xlib.h],,, [standard_path])
 AST_EXT_LIB_CHECK([X11], [X11], [XOpenDisplay], [X11/Xlib.h],, [-I/usr/X11R6/include], [X11R6])
 
 AST_EXT_LIB_CHECK([X11], [X11], [XOpenDisplay], [X11/Xlib.h],,, [standard_path])
 AST_EXT_LIB_CHECK([X11], [X11], [XOpenDisplay], [X11/Xlib.h],, [-I/usr/X11R6/include], [X11R6])
 
-# we don't use gtk right now...
-AST_EXT_TOOL_CHECK([GTK], [gtk])
+PBX_GTK=0
+AC_CHECK_TOOL(GTKCONFIG, gtk-config, No)
+if test ! "x${GTKCONFIG}" = xNo; then
+   GTK_INCLUDE=$(${GTKCONFIG} --cflags gthread)
+   GTK_LIB=$(${GTKCONFIG} --libs gthread)
+   PBX_GTK=1
+   AC_DEFINE([HAVE_GTK], 1, [Define if your system has the GTK libraries.])
+fi
+AC_SUBST(PBX_GTK)
+AC_SUBST(GTK_INCLUDE)
+AC_SUBST(GTK_LIB)
 
 PBX_GTK2=0
 AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
 
 PBX_GTK2=0
 AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)