Thread: [Mplayerplug-in-cvs] mplayerplug-in ChangeLog, 1.445, 1.446 configure, 1.63, 1.64 configure.in, 1.6
Brought to you by:
kdekorte
From: Kevin D. <kde...@us...> - 2006-06-14 16:56:10
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12061 Modified Files: ChangeLog configure configure.in Log Message: Fixed problem with GTK < 2.4 detection Fixed missing include strings.h Remove glib/gprintf.h include as it causes problems and is not needed Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/ChangeLog,v retrieving revision 1.445 retrieving revision 1.446 diff -C2 -d -r1.445 -r1.446 *** ChangeLog 13 Jun 2006 13:14:13 -0000 1.445 --- ChangeLog 14 Jun 2006 16:56:05 -0000 1.446 *************** *** 1,3 **** --- 1,6 ---- Development + Fixed problem with GTK < 2.4 detection + Fixed missing include strings.h + Remove glib/gprintf.h include as it causes problems and is not needed Fixed problem with Save As not becoming sensitive Added some additional checks to shift back into blocking mode. Index: configure =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/configure,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** configure 14 May 2006 18:52:39 -0000 1.63 --- configure 14 Jun 2006 16:56:06 -0000 1.64 *************** *** 313,317 **** #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK SET_MAKE GECKO_SDK_PREFIX GECKO_DEFINES PKG_CONFIG ac_pt_PKG_CONFIG MOZPLUG_CFLAGS MOZPLUG_LIBS GTK_CFLAGS GTK_LIBS GTHREAD_CFLAGS GTHREAD_LIBS CREATE CXXFLAGS64 LDFLAGS64 GTK_DEFINES CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS EGREP LIBOBJS LOCALEDIR SUBDIR INSTALL_SUBDIR XPM_LIBS XEXT_LIBS LTLIBOBJS' ac_subst_files='' --- 313,317 ---- #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK SET_MAKE GECKO_SDK_PREFIX GECKO_DEFINES PKG_CONFIG ac_pt_PKG_CONFIG MOZPLUG_CFLAGS MOZPLUG_LIBS GTK_CFLAGS GTK_LIBS GTK24_CFLAGS GTK24_LIBS GTHREAD_CFLAGS GTHREAD_LIBS CREATE CXXFLAGS64 LDFLAGS64 GTK_DEFINES CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS EGREP LIBOBJS LOCALEDIR SUBDIR INSTALL_SUBDIR XPM_LIBS XEXT_LIBS LTLIBOBJS' ac_subst_files='' *************** *** 798,801 **** --- 798,809 ---- ac_cv_env_GTK_LIBS_set=${GTK_LIBS+set} ac_cv_env_GTK_LIBS_value=$GTK_LIBS + ac_env_GTK24_CFLAGS_set=${GTK24_CFLAGS+set} + ac_env_GTK24_CFLAGS_value=$GTK24_CFLAGS + ac_cv_env_GTK24_CFLAGS_set=${GTK24_CFLAGS+set} + ac_cv_env_GTK24_CFLAGS_value=$GTK24_CFLAGS + ac_env_GTK24_LIBS_set=${GTK24_LIBS+set} + ac_env_GTK24_LIBS_value=$GTK24_LIBS + ac_cv_env_GTK24_LIBS_set=${GTK24_LIBS+set} + ac_cv_env_GTK24_LIBS_value=$GTK24_LIBS ac_env_GTHREAD_CFLAGS_set=${GTHREAD_CFLAGS+set} ac_env_GTHREAD_CFLAGS_value=$GTHREAD_CFLAGS *************** *** 920,923 **** --- 928,934 ---- GTK_CFLAGS C compiler flags for GTK, overriding pkg-config GTK_LIBS linker flags for GTK, overriding pkg-config + GTK24_CFLAGS + C compiler flags for GTK24, overriding pkg-config + GTK24_LIBS linker flags for GTK24, overriding pkg-config GTHREAD_CFLAGS C compiler flags for GTHREAD, overriding pkg-config *************** *** 3395,3404 **** pkg_failed=no ! echo "$as_me:$LINENO: checking for GTK" >&5 ! echo $ECHO_N "checking for GTK... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then ! if test -n "$GTK_CFLAGS"; then ! pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" else if test -n "$PKG_CONFIG" && \ --- 3406,3415 ---- pkg_failed=no ! echo "$as_me:$LINENO: checking for GTK24" >&5 ! echo $ECHO_N "checking for GTK24... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then ! if test -n "$GTK24_CFLAGS"; then ! pkg_cv_GTK24_CFLAGS="$GTK24_CFLAGS" else if test -n "$PKG_CONFIG" && \ *************** *** 3408,3412 **** echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4.0" 2>/dev/null` else pkg_failed=yes --- 3419,3423 ---- echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_GTK24_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4.0" 2>/dev/null` else pkg_failed=yes *************** *** 3417,3422 **** fi if test -n "$PKG_CONFIG"; then ! if test -n "$GTK_LIBS"; then ! pkg_cv_GTK_LIBS="$GTK_LIBS" else if test -n "$PKG_CONFIG" && \ --- 3428,3433 ---- fi if test -n "$PKG_CONFIG"; then ! if test -n "$GTK24_LIBS"; then ! pkg_cv_GTK24_LIBS="$GTK24_LIBS" else if test -n "$PKG_CONFIG" && \ *************** *** 3426,3430 **** echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4.0" 2>/dev/null` else pkg_failed=yes --- 3437,3441 ---- echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then ! pkg_cv_GTK24_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4.0" 2>/dev/null` else pkg_failed=yes *************** *** 3445,3463 **** fi if test $_pkg_short_errors_supported = yes; then ! GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.4.0"` else ! GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.4.0"` fi # Put the nasty error message in config.log where it belongs ! echo "$GTK_PKG_ERRORS" >&5 ! { echo "$as_me:$LINENO: WARNING: *** Running in X mode - Limited Features ***" >&5 ! echo "$as_me: WARNING: *** Running in X mode - Limited Features ***" >&2;} elif test $pkg_failed = untried; then ! { echo "$as_me:$LINENO: WARNING: *** Running in X mode - Limited Features ***" >&5 ! echo "$as_me: WARNING: *** Running in X mode - Limited Features ***" >&2;} else ! GTK_CFLAGS=$pkg_cv_GTK_CFLAGS ! GTK_LIBS=$pkg_cv_GTK_LIBS echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 --- 3456,3474 ---- fi if test $_pkg_short_errors_supported = yes; then ! GTK24_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.4.0"` else ! GTK24_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.4.0"` fi # Put the nasty error message in config.log where it belongs ! echo "$GTK24_PKG_ERRORS" >&5 ! { echo "$as_me:$LINENO: WARNING: Some GUI Features are disabled" >&5 ! echo "$as_me: WARNING: Some GUI Features are disabled" >&2;} elif test $pkg_failed = untried; then ! { echo "$as_me:$LINENO: WARNING: Some GUI Features are disabled" >&5 ! echo "$as_me: WARNING: Some GUI Features are disabled" >&2;} else ! GTK24_CFLAGS=$pkg_cv_GTK24_CFLAGS ! GTK24_LIBS=$pkg_cv_GTK24_LIBS echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 *************** *** 4150,4154 **** # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS ! LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ --- 4161,4165 ---- # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS ! LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ *************** *** 5396,5399 **** --- 5407,5413 ---- CFLAGS="$CFLAGS $X_CFLAGS" LIBS="$X_LIBS $LIBS -lX11 $X_EXTRA_LIBS" + GTK_CFLAGS="$GTK_CFLAGS $GTK24_CFLAGS" + GTK_LIBS="$GTK_LIBS $GTK24_LIBS" + GTK_DEFINES="$GTK_DEFINES $GTK24_DEFINES" echo "$as_me:$LINENO: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 *************** *** 8888,8891 **** --- 8902,8907 ---- s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t s,@GTK_LIBS@,$GTK_LIBS,;t t + s,@GTK24_CFLAGS@,$GTK24_CFLAGS,;t t + s,@GTK24_LIBS@,$GTK24_LIBS,;t t s,@GTHREAD_CFLAGS@,$GTHREAD_CFLAGS,;t t s,@GTHREAD_LIBS@,$GTHREAD_LIBS,;t t Index: configure.in =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/configure.in,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** configure.in 14 May 2006 18:52:39 -0000 1.63 --- configure.in 14 Jun 2006 16:56:06 -0000 1.64 *************** *** 84,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 --- 84,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(GTK24,[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([Some GUI Features are disabled])]) PKG_CHECK_MODULES(GTHREAD,[gthread-2.0],,[AC_MSG_ERROR([Missing gthread package])]) fi *************** *** 149,152 **** --- 149,155 ---- CFLAGS="$CFLAGS $X_CFLAGS" LIBS="$X_LIBS $LIBS -lX11 $X_EXTRA_LIBS" + GTK_CFLAGS="$GTK_CFLAGS $GTK24_CFLAGS" + GTK_LIBS="$GTK_LIBS $GTK24_LIBS" + GTK_DEFINES="$GTK_DEFINES $GTK24_DEFINES" AC_HEADER_STDC AC_CHECK_HEADERS([stddef.h stdlib.h unistd.h X11/Xlib.h X11/Intrinsic.h X11/StringDefs.h sys/stat.h fcntl.h]) |