[Mplayerplug-in-cvs] mplayerplug-in configure, 1.81, 1.82 configure.in, 1.80, 1.81
Brought to you by:
kdekorte
From: Kevin D. <kde...@us...> - 2007-12-05 16:57:31
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8673 Modified Files: configure configure.in Log Message: xulrunner fix Index: configure =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/configure,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** configure 3 Dec 2007 17:34:03 -0000 1.81 --- configure 5 Dec 2007 16:57:24 -0000 1.82 *************** *** 3643,3650 **** 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; } --- 3643,3650 ---- 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 xulrunner-xpcom" >&5 ! echo $ECHO_N "checking for xulrunner-plugin xulrunner-xpcom... $ECHO_C" >&6; } ! if $PKG_CONFIG --exists "xulrunner-plugin xulrunner-xpcom" ; then { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } *************** *** 3653,3657 **** { 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; } --- 3653,3657 ---- { echo "$as_me:$LINENO: checking MOZPLUG_CFLAGS" >&5 echo $ECHO_N "checking MOZPLUG_CFLAGS... $ECHO_C" >&6; } ! MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-plugin xulrunner-xpcom"` { echo "$as_me:$LINENO: result: $MOZPLUG_CFLAGS" >&5 echo "${ECHO_T}$MOZPLUG_CFLAGS" >&6; } *************** *** 3659,3663 **** { 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; } --- 3659,3663 ---- { echo "$as_me:$LINENO: checking MOZPLUG_LIBS" >&5 echo $ECHO_N "checking MOZPLUG_LIBS... $ECHO_C" >&6; } ! MOZPLUG_LIBS=`$PKG_CONFIG --libs "xulrunner-plugin xulrunner-xpcom"` { echo "$as_me:$LINENO: result: $MOZPLUG_LIBS" >&5 echo "${ECHO_T}$MOZPLUG_LIBS" >&6; } *************** *** 3667,3671 **** ## 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 --- 3667,3671 ---- ## 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 xulrunner-xpcom"` fi Index: configure.in =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/configure.in,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** configure.in 3 Dec 2007 17:34:04 -0000 1.80 --- configure.in 5 Dec 2007 16:57:24 -0000 1.81 *************** *** 70,74 **** 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`" MOZILLA_HOME=`$PKG_CONFIG --variable=libdir xulrunner-plugin` ],[AC_MSG_WARN([xulrunner-plugin not found])]) --- 70,74 ---- fi if test "$MOZPLUG_CFLAGS" = ""; then ! PKG_CHECK_MODULES(MOZPLUG,[xulrunner-plugin xulrunner-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir xulrunner-plugin`" MOZILLA_HOME=`$PKG_CONFIG --variable=libdir xulrunner-plugin` ],[AC_MSG_WARN([xulrunner-plugin not found])]) |