Thread: [Mplayerplug-in-cvs] mplayerplug-in ChangeLog,1.361,1.362 config.h.in,1.9,1.10 configure,1.54,1.55 c
Brought to you by:
kdekorte
From: Kevin D. <kde...@us...> - 2005-12-06 18:41:48
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6260 Modified Files: ChangeLog config.h.in configure configure.in Log Message: Allow compile with GTK2 2.0 (config dialog is limited) Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/ChangeLog,v retrieving revision 1.361 retrieving revision 1.362 diff -C2 -d -r1.361 -r1.362 *** ChangeLog 6 Dec 2005 16:08:47 -0000 1.361 --- ChangeLog 6 Dec 2005 18:41:38 -0000 1.362 *************** *** 1,3 **** --- 1,4 ---- Development + Allow compile with GTK2 2.0 (config dialog is limited) Compile and mark memmem,strlcat and strlcpy as C functions Enforce that GTK2 >= 2.4.0 Index: config.h.in =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/config.h.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** config.h.in 15 Feb 2005 22:28:35 -0000 1.9 --- config.h.in 6 Dec 2005 18:41:38 -0000 1.10 *************** *** 173,176 **** #undef GTK2_ENABLED ! /* Define to 1 if you have GTK2 */ #undef GTK1_ENABLED --- 173,179 ---- #undef GTK2_ENABLED ! /* Define to 1 if you have GTK2 2.4+ */ ! #undef GTK24_ENABLED ! ! /* Define to 1 if you have GTK1 */ #undef GTK1_ENABLED Index: configure =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/configure,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** configure 6 Dec 2005 15:49:23 -0000 1.54 --- configure 6 Dec 2005 18:41:38 -0000 1.55 *************** *** 3235,3238 **** --- 3235,3339 ---- PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo "$as_me:$LINENO: checking for gtk+-2.0" >&5 + echo $ECHO_N "checking for gtk+-2.0... $ECHO_C" >&6 + + if $PKG_CONFIG --exists "gtk+-2.0" ; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 + echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6 + GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"` + echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 + echo "${ECHO_T}$GTK_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking GTK_LIBS" >&5 + echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6 + GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"` + echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 + echo "${ECHO_T}$GTK_LIBS" >&6 + else + GTK_CFLAGS="" + GTK_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + GTK_DEFINES="-DGTK_ENABLED" + cat >>confdefs.h <<\_ACEOF + #define GTK2_ENABLED 1 + _ACEOF + + else + { echo "$as_me:$LINENO: WARNING: *** Running in X mode - Limited Features ***" >&5 + echo "$as_me: WARNING: *** Running in X mode - Limited Features ***" >&2;} + fi + + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # 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_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; + esac + fi + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + + if test -n "$PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 + echo "${ECHO_T}$PKG_CONFIG" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4.0" >&5 echo $ECHO_N "checking for gtk+-2.0 >= 2.4.0... $ECHO_C" >&6 *************** *** 3274,3278 **** GTK_DEFINES="-DGTK_ENABLED" cat >>confdefs.h <<\_ACEOF ! #define GTK2_ENABLED 1 _ACEOF --- 3375,3379 ---- GTK_DEFINES="-DGTK_ENABLED" cat >>confdefs.h <<\_ACEOF ! #define GTK24_ENABLED 1 _ACEOF Index: configure.in =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/configure.in,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** configure.in 6 Dec 2005 15:49:23 -0000 1.54 --- configure.in 6 Dec 2005 18:41:38 -0000 1.55 *************** *** 83,87 **** if test $use_gtk2 = yes; then ! PKG_CHECK_MODULES(GTK,[gtk+-2.0 >= 2.4.0],[GTK_DEFINES="-DGTK_ENABLED" AC_DEFINE([GTK2_ENABLED],[1],[Define to 1 if you have GTK2])],[AC_MSG_WARN([*** Running in X mode - Limited Features ***])]) PKG_CHECK_MODULES(GTHREAD,[gthread-2.0],,[AC_MSG_ERROR([Missing gthread package])]) fi --- 83,88 ---- if test $use_gtk2 = yes; then ! PKG_CHECK_MODULES(GTK,[gtk+-2.0],[GTK_DEFINES="-DGTK_ENABLED" AC_DEFINE([GTK2_ENABLED],[1],[Define to 1 if you have GTK2])],[AC_MSG_WARN([*** Running in X mode - Limited Features ***])]) ! PKG_CHECK_MODULES(GTK,[gtk+-2.0 >= 2.4.0],[GTK_DEFINES="-DGTK_ENABLED" AC_DEFINE([GTK24_ENABLED],[1],[Define to 1 if you have GTK2])],[AC_MSG_WARN([*** Running in X mode - Limited Features ***])]) PKG_CHECK_MODULES(GTHREAD,[gthread-2.0],,[AC_MSG_ERROR([Missing gthread package])]) fi |