diff options
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | build_tools/menuselect-deps.in | 1 | ||||
| -rwxr-xr-x | configure | 123 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 3 | ||||
| -rw-r--r-- | makeopts.in | 3 |
6 files changed, 148 insertions, 2 deletions
@@ -667,12 +667,20 @@ uninstall-all: _uninstall menuconfig: menuselect +gmenuconfig: gmenuselect + menuselect: menuselect/menuselect menuselect-tree -@menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!" +gmenuselect: menuselect/gmenuselect menuselect-tree + -@menuselect/gmenuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!" + menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts @CC="$(HOST_CC)" LD="" AR="" RANLIB="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent" +menuselect/gmenuselect: makeopts menuselect/menuselect.c menuselect/menuselect_gtk.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts + @CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" $(MAKE) -C menuselect _gmenuselect CONFIGURE_SILENT="--silent" + menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml @echo "Generating input for menuselect ..." @build_tools/prep_moduledeps > $@ diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index d68166cf0..19b656c7a 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -3,6 +3,7 @@ CURL=@PBX_CURL@ FREETDS=@PBX_FREETDS@ GSM=@PBX_GSM@ GTK=@PBX_GTK@ +GTK2=@PBX_GTK2@ H323=@PBX_H323@ OPENH323=@PBX_OPENH323@ IKSEMEL=@PBX_IKSEMEL@ @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 58320 . +# From configure.ac Revision: 58931 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.60. # @@ -878,6 +878,10 @@ GTKCONFIG PBX_GTK GTK_INCLUDE GTK_LIB +PKGCONFIG +PBX_GTK2 +GTK2_INCLUDE +GTK2_LIB CURL_CONFIG LTLIBOBJS' ac_subst_files='' @@ -33888,6 +33892,117 @@ fi +PBX_GTK2=0 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-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_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$PKGCONFIG"; then + ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PKGCONFIG="${ac_tool_prefix}pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +PKGCONFIG=$ac_cv_prog_PKGCONFIG +if test -n "$PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5 +echo "${ECHO_T}$PKGCONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_PKGCONFIG"; then + ac_ct_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-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_PKGCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_PKGCONFIG"; then + ac_cv_prog_ac_ct_PKGCONFIG="$ac_ct_PKGCONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_PKGCONFIG="pkg-config" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_PKGCONFIG=$ac_cv_prog_ac_ct_PKGCONFIG +if test -n "$ac_ct_PKGCONFIG"; then + { echo "$as_me:$LINENO: result: $ac_ct_PKGCONFIG" >&5 +echo "${ECHO_T}$ac_ct_PKGCONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_PKGCONFIG" = x; then + PKGCONFIG="No" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +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 + PKGCONFIG=$ac_ct_PKGCONFIG + fi +else + PKGCONFIG="$ac_cv_prog_PKGCONFIG" +fi + +if test ! "x${PKGCONFIG}" = xNo; then + GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags) + GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs) + PBX_GTK2=1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GTK2 1 +_ACEOF + +fi + + + + if test "${USE_CURL}" != "no"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}curl-config", so it can be a program name with args. @@ -34971,11 +35086,15 @@ GTKCONFIG!$GTKCONFIG$ac_delim PBX_GTK!$PBX_GTK$ac_delim GTK_INCLUDE!$GTK_INCLUDE$ac_delim GTK_LIB!$GTK_LIB$ac_delim +PKGCONFIG!$PKGCONFIG$ac_delim +PBX_GTK2!$PBX_GTK2$ac_delim +GTK2_INCLUDE!$GTK2_INCLUDE$ac_delim +GTK2_LIB!$GTK2_LIB$ac_delim CURL_CONFIG!$CURL_CONFIG$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 84; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 0a0cb3e34..dd7d8a920 100644 --- a/configure.ac +++ b/configure.ac @@ -1112,6 +1112,18 @@ AC_SUBST(PBX_GTK) AC_SUBST(GTK_INCLUDE) AC_SUBST(GTK_LIB) +PBX_GTK2=0 +AC_CHECK_TOOL(PKGCONFIG, pkg-config, No) +if test ! "x${PKGCONFIG}" = xNo; then + GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags) + GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs) + PBX_GTK2=1 + AC_DEFINE([HAVE_GTK2], 1, [Define if your system has the GTK2 libraries.]) +fi +AC_SUBST(PBX_GTK2) +AC_SUBST(GTK2_INCLUDE) +AC_SUBST(GTK2_LIB) + if test "${USE_CURL}" != "no"; then AC_PATH_TOOL([CURL_CONFIG], [curl-config], No) if test ! x"${CURL_CONFIG}" = xNo; then diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 3610c05c2..e8a92a62b 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -135,6 +135,9 @@ /* Define if your system has the GTK libraries. */ #undef HAVE_GTK +/* Define if your system has the GTK2 libraries. */ +#undef HAVE_GTK2 + /* Define to indicate the ${IKSEMEL_DESCRIP} library */ #undef HAVE_IKSEMEL diff --git a/makeopts.in b/makeopts.in index bda778e63..c5a249e66 100644 --- a/makeopts.in +++ b/makeopts.in @@ -84,6 +84,9 @@ GSM_LIB=@GSM_LIB@ GTK_INCLUDE=@GTK_INCLUDE@ GTK_LIB=@GTK_LIB@ +GTK2_INCLUDE=@GTK2_INCLUDE@ +GTK2_LIB=@GTK2_LIB@ + IKSEMEL_INCLUDE=@IKSEMEL_INCLUDE@ IKSEMEL_LIB=@IKSEMEL_LIB@ |