[Mplayerplug-in-cvs] mplayerplug-in ChangeLog,1.410,1.411 configure,1.58,1.59 configure.in,1.58,1.59
Brought to you by:
kdekorte
From: Kevin D. <kde...@us...> - 2006-03-09 15:01:00
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6044 Modified Files: ChangeLog configure configure.in Log Message: Add xulrunner to the list of potential mozilla providers Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/ChangeLog,v retrieving revision 1.410 retrieving revision 1.411 diff -C2 -d -r1.410 -r1.411 *** ChangeLog 8 Mar 2006 02:56:04 -0000 1.410 --- ChangeLog 9 Mar 2006 15:00:55 -0000 1.411 *************** *** 1,3 **** --- 1,4 ---- Development + Add xulrunner to the list of potential mozilla providers Patch to create option enable-pls (enabled by default) by Laurence Dukhovny Only set -rtsp-stream-over-tcp when URL is a rtsp URL Index: configure =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/configure,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** configure 7 Feb 2006 14:13:09 -0000 1.58 --- configure 9 Mar 2006 15:00:55 -0000 1.59 *************** *** 3135,3138 **** --- 3135,3237 ---- fi + if test "$MOZPLUG_CFLAGS" = ""; then + + 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 xulrunner-plugin" >&5 + echo $ECHO_N "checking for xulrunner-plugin... $ECHO_C" >&6 + + if $PKG_CONFIG --exists "xulrunner-plugin" ; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking MOZPLUG_CFLAGS" >&5 + echo $ECHO_N "checking MOZPLUG_CFLAGS... $ECHO_C" >&6 + MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-plugin"` + echo "$as_me:$LINENO: result: $MOZPLUG_CFLAGS" >&5 + echo "${ECHO_T}$MOZPLUG_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking MOZPLUG_LIBS" >&5 + echo $ECHO_N "checking MOZPLUG_LIBS... $ECHO_C" >&6 + MOZPLUG_LIBS=`$PKG_CONFIG --libs "xulrunner-plugin"` + echo "$as_me:$LINENO: result: $MOZPLUG_LIBS" >&5 + echo "${ECHO_T}$MOZPLUG_LIBS" >&6 + else + MOZPLUG_CFLAGS="" + MOZPLUG_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xulrunner-plugin"` + + 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 + MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir xulrunner-plugin`" + else + { echo "$as_me:$LINENO: WARNING: xulrunner-plugin not found" >&5 + echo "$as_me: WARNING: xulrunner-plugin not found" >&2;} + fi + + fi if test "$MOZPLUG_CFLAGS" = ""; then Index: configure.in =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/configure.in,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** configure.in 7 Feb 2006 14:13:10 -0000 1.58 --- configure.in 9 Mar 2006 15:00:55 -0000 1.59 *************** *** 52,55 **** --- 52,58 ---- PKG_CHECK_MODULES(MOZPLUG,[seamonkey-plugin],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir seamonkey-plugin`"],[AC_MSG_WARN([seamonkey-plugin not found])]) fi + if test "$MOZPLUG_CFLAGS" = ""; then + PKG_CHECK_MODULES(MOZPLUG,[xulrunner-plugin],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir xulrunner-plugin`"],[AC_MSG_WARN([xulrunner-plugin not found])]) + fi if test "$MOZPLUG_CFLAGS" = ""; then |