Use AST_EXT_TOOL_CHECK() for the GTK check again. I changed this to an inline
implementation to fix a small bug, but after a discussion with rizzo, I went to change it back. Also, it turns out that the implementation of the macro already supported what was needed to fix the problem. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@97767 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
russell
parent
a8236f3bdb
commit
1d0d1a7f8f
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.ac Revision: 97643 .
|
||||
# From configure.ac Revision: 97745 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for asterisk 1.4.
|
||||
#
|
||||
|
|
@ -970,7 +970,7 @@ EDITLINE_LIB
|
|||
PBX_H323
|
||||
PBX_IXJUSER
|
||||
CONFIG_SDL
|
||||
GTKCONFIG
|
||||
CONFIG_GTK
|
||||
PKGCONFIG
|
||||
CURL_CONFIG
|
||||
LTLIBOBJS'
|
||||
|
|
@ -47595,16 +47595,19 @@ fi
|
|||
|
||||
|
||||
PBX_GTK=0
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
|
||||
if test "x${PBX_GTK}" != "x1" -a "${USE_GTK}" != "no"; then
|
||||
PBX_GTK=0
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}gtk-config", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}gtk-config; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_prog_GTKCONFIG+set}" = set; then
|
||||
if test "${ac_cv_prog_CONFIG_GTK+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$GTKCONFIG"; then
|
||||
ac_cv_prog_GTKCONFIG="$GTKCONFIG" # Let the user override the test.
|
||||
if test -n "$CONFIG_GTK"; then
|
||||
ac_cv_prog_CONFIG_GTK="$CONFIG_GTK" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
|
|
@ -47613,7 +47616,7 @@ do
|
|||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_GTKCONFIG="${ac_tool_prefix}gtk-config"
|
||||
ac_cv_prog_CONFIG_GTK="${ac_tool_prefix}gtk-config"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
|
|
@ -47623,10 +47626,10 @@ IFS=$as_save_IFS
|
|||
|
||||
fi
|
||||
fi
|
||||
GTKCONFIG=$ac_cv_prog_GTKCONFIG
|
||||
if test -n "$GTKCONFIG"; then
|
||||
{ echo "$as_me:$LINENO: result: $GTKCONFIG" >&5
|
||||
echo "${ECHO_T}$GTKCONFIG" >&6; }
|
||||
CONFIG_GTK=$ac_cv_prog_CONFIG_GTK
|
||||
if test -n "$CONFIG_GTK"; then
|
||||
{ echo "$as_me:$LINENO: result: $CONFIG_GTK" >&5
|
||||
echo "${ECHO_T}$CONFIG_GTK" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
|
|
@ -47634,17 +47637,17 @@ fi
|
|||
|
||||
|
||||
fi
|
||||
if test -z "$ac_cv_prog_GTKCONFIG"; then
|
||||
ac_ct_GTKCONFIG=$GTKCONFIG
|
||||
if test -z "$ac_cv_prog_CONFIG_GTK"; then
|
||||
ac_ct_CONFIG_GTK=$CONFIG_GTK
|
||||
# Extract the first word of "gtk-config", so it can be a program name with args.
|
||||
set dummy gtk-config; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_prog_ac_ct_GTKCONFIG+set}" = set; then
|
||||
if test "${ac_cv_prog_ac_ct_CONFIG_GTK+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$ac_ct_GTKCONFIG"; then
|
||||
ac_cv_prog_ac_ct_GTKCONFIG="$ac_ct_GTKCONFIG" # Let the user override the test.
|
||||
if test -n "$ac_ct_CONFIG_GTK"; then
|
||||
ac_cv_prog_ac_ct_CONFIG_GTK="$ac_ct_CONFIG_GTK" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
|
|
@ -47653,7 +47656,7 @@ do
|
|||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_ac_ct_GTKCONFIG="gtk-config"
|
||||
ac_cv_prog_ac_ct_CONFIG_GTK="gtk-config"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
|
|
@ -47663,17 +47666,17 @@ IFS=$as_save_IFS
|
|||
|
||||
fi
|
||||
fi
|
||||
ac_ct_GTKCONFIG=$ac_cv_prog_ac_ct_GTKCONFIG
|
||||
if test -n "$ac_ct_GTKCONFIG"; then
|
||||
{ echo "$as_me:$LINENO: result: $ac_ct_GTKCONFIG" >&5
|
||||
echo "${ECHO_T}$ac_ct_GTKCONFIG" >&6; }
|
||||
ac_ct_CONFIG_GTK=$ac_cv_prog_ac_ct_CONFIG_GTK
|
||||
if test -n "$ac_ct_CONFIG_GTK"; then
|
||||
{ echo "$as_me:$LINENO: result: $ac_ct_CONFIG_GTK" >&5
|
||||
echo "${ECHO_T}$ac_ct_CONFIG_GTK" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
if test "x$ac_ct_GTKCONFIG" = x; then
|
||||
GTKCONFIG="No"
|
||||
if test "x$ac_ct_CONFIG_GTK" = x; then
|
||||
CONFIG_GTK="No"
|
||||
else
|
||||
case $cross_compiling:$ac_tool_warned in
|
||||
yes:)
|
||||
|
|
@ -47685,24 +47688,25 @@ whose name does not start with the host triplet. If you think this
|
|||
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
||||
ac_tool_warned=yes ;;
|
||||
esac
|
||||
GTKCONFIG=$ac_ct_GTKCONFIG
|
||||
CONFIG_GTK=$ac_ct_CONFIG_GTK
|
||||
fi
|
||||
else
|
||||
GTKCONFIG="$ac_cv_prog_GTKCONFIG"
|
||||
CONFIG_GTK="$ac_cv_prog_CONFIG_GTK"
|
||||
fi
|
||||
|
||||
if test ! "x${GTKCONFIG}" = xNo; then
|
||||
GTK_INCLUDE=$(${GTKCONFIG} --cflags gthread)
|
||||
GTK_LIB=$(${GTKCONFIG} --libs gthread)
|
||||
PBX_GTK=1
|
||||
if test ! "x${CONFIG_GTK}" = xNo; then
|
||||
if test x"--cflags gthread" = x ; then A=--cflags ; else A="--cflags gthread" ; fi
|
||||
GTK_INCLUDE=$(${CONFIG_GTK} $A)
|
||||
if test x"--libs gthread" = x ; then A=--libs ; else A="--libs gthread" ; fi
|
||||
GTK_LIB=$(${CONFIG_GTK} $A)
|
||||
PBX_GTK=1
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_GTK 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
PBX_GTK2=0
|
||||
|
|
@ -49113,7 +49117,7 @@ EDITLINE_LIB!$EDITLINE_LIB$ac_delim
|
|||
PBX_H323!$PBX_H323$ac_delim
|
||||
PBX_IXJUSER!$PBX_IXJUSER$ac_delim
|
||||
CONFIG_SDL!$CONFIG_SDL$ac_delim
|
||||
GTKCONFIG!$GTKCONFIG$ac_delim
|
||||
CONFIG_GTK!$CONFIG_GTK$ac_delim
|
||||
PKGCONFIG!$PKGCONFIG$ac_delim
|
||||
CURL_CONFIG!$CURL_CONFIG$ac_delim
|
||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
|
|
|
|||
11
configure.ac
11
configure.ac
|
|
@ -1161,16 +1161,7 @@ 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])
|
||||
|
||||
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)
|
||||
AST_EXT_TOOL_CHECK([GTK], [gtk], [--cflags gthread], [--libs gthread])
|
||||
|
||||
PBX_GTK2=0
|
||||
AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
|
||||
|
|
|
|||
Reference in New Issue