[Mplayerplug-in-cvs] mplayerplug-in configure,1.46,1.47 configure.in,1.46,1.47
Brought to you by:
kdekorte
From: Kevin D. <kde...@us...> - 2005-08-24 13:31:15
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32309 Modified Files: configure configure.in Log Message: Index: configure =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/configure,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** configure 24 Aug 2005 13:15:31 -0000 1.46 --- configure 24 Aug 2005 13:31:01 -0000 1.47 *************** *** 2880,2887 **** PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ! echo "$as_me:$LINENO: checking for firefox-plugin" >&5 ! echo $ECHO_N "checking for firefox-plugin... $ECHO_C" >&6 ! if $PKG_CONFIG --exists "firefox-plugin" ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 --- 2880,2887 ---- PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ! echo "$as_me:$LINENO: checking for mozilla-plugin" >&5 ! echo $ECHO_N "checking for mozilla-plugin... $ECHO_C" >&6 ! if $PKG_CONFIG --exists "mozilla-plugin" ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 *************** *** 2890,2894 **** echo "$as_me:$LINENO: checking MOZPLUG_CFLAGS" >&5 echo $ECHO_N "checking MOZPLUG_CFLAGS... $ECHO_C" >&6 ! MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin"` echo "$as_me:$LINENO: result: $MOZPLUG_CFLAGS" >&5 echo "${ECHO_T}$MOZPLUG_CFLAGS" >&6 --- 2890,2894 ---- echo "$as_me:$LINENO: checking MOZPLUG_CFLAGS" >&5 echo $ECHO_N "checking MOZPLUG_CFLAGS... $ECHO_C" >&6 ! MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin"` echo "$as_me:$LINENO: result: $MOZPLUG_CFLAGS" >&5 echo "${ECHO_T}$MOZPLUG_CFLAGS" >&6 *************** *** 2896,2900 **** echo "$as_me:$LINENO: checking MOZPLUG_LIBS" >&5 echo $ECHO_N "checking MOZPLUG_LIBS... $ECHO_C" >&6 ! MOZPLUG_LIBS=`$PKG_CONFIG --libs "firefox-plugin"` echo "$as_me:$LINENO: result: $MOZPLUG_LIBS" >&5 echo "${ECHO_T}$MOZPLUG_LIBS" >&6 --- 2896,2900 ---- echo "$as_me:$LINENO: checking MOZPLUG_LIBS" >&5 echo $ECHO_N "checking MOZPLUG_LIBS... $ECHO_C" >&6 ! MOZPLUG_LIBS=`$PKG_CONFIG --libs "mozilla-plugin"` echo "$as_me:$LINENO: result: $MOZPLUG_LIBS" >&5 echo "${ECHO_T}$MOZPLUG_LIBS" >&6 *************** *** 2904,2908 **** ## 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 "firefox-plugin"` fi --- 2904,2908 ---- ## 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 "mozilla-plugin"` fi *************** *** 2917,2924 **** if test $succeeded = yes; then ! MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir firfox-plugin`" else ! { echo "$as_me:$LINENO: WARNING: firefox-plugin not found" >&5 ! echo "$as_me: WARNING: firefox-plugin not found" >&2;} fi --- 2917,2924 ---- if test $succeeded = yes; then ! MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir mozilla-plugin`" else ! { echo "$as_me:$LINENO: WARNING: mozilla-plugin not found" >&5 ! echo "$as_me: WARNING: mozilla-plugin not found" >&2;} fi *************** *** 2979,2986 **** PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ! echo "$as_me:$LINENO: checking for mozilla-plugin" >&5 ! echo $ECHO_N "checking for mozilla-plugin... $ECHO_C" >&6 ! if $PKG_CONFIG --exists "mozilla-plugin" ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 --- 2979,2986 ---- PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ! echo "$as_me:$LINENO: checking for firefox-plugin" >&5 ! echo $ECHO_N "checking for firefox-plugin... $ECHO_C" >&6 ! if $PKG_CONFIG --exists "firefox-plugin" ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 *************** *** 2989,2993 **** echo "$as_me:$LINENO: checking MOZPLUG_CFLAGS" >&5 echo $ECHO_N "checking MOZPLUG_CFLAGS... $ECHO_C" >&6 ! MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin"` echo "$as_me:$LINENO: result: $MOZPLUG_CFLAGS" >&5 echo "${ECHO_T}$MOZPLUG_CFLAGS" >&6 --- 2989,2993 ---- echo "$as_me:$LINENO: checking MOZPLUG_CFLAGS" >&5 echo $ECHO_N "checking MOZPLUG_CFLAGS... $ECHO_C" >&6 ! MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin"` echo "$as_me:$LINENO: result: $MOZPLUG_CFLAGS" >&5 echo "${ECHO_T}$MOZPLUG_CFLAGS" >&6 *************** *** 2995,2999 **** echo "$as_me:$LINENO: checking MOZPLUG_LIBS" >&5 echo $ECHO_N "checking MOZPLUG_LIBS... $ECHO_C" >&6 ! MOZPLUG_LIBS=`$PKG_CONFIG --libs "mozilla-plugin"` echo "$as_me:$LINENO: result: $MOZPLUG_LIBS" >&5 echo "${ECHO_T}$MOZPLUG_LIBS" >&6 --- 2995,2999 ---- echo "$as_me:$LINENO: checking MOZPLUG_LIBS" >&5 echo $ECHO_N "checking MOZPLUG_LIBS... $ECHO_C" >&6 ! MOZPLUG_LIBS=`$PKG_CONFIG --libs "firefox-plugin"` echo "$as_me:$LINENO: result: $MOZPLUG_LIBS" >&5 echo "${ECHO_T}$MOZPLUG_LIBS" >&6 *************** *** 3003,3007 **** ## 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 "mozilla-plugin"` fi --- 3003,3007 ---- ## 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 "firefox-plugin"` fi *************** *** 3016,3023 **** if test $succeeded = yes; then ! MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir mozilla-plugin`" else ! { echo "$as_me:$LINENO: WARNING: mozilla-plugin not found" >&5 ! echo "$as_me: WARNING: mozilla-plugin not found" >&2;} fi --- 3016,3023 ---- if test $succeeded = yes; then ! MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir firfox-plugin`" else ! { echo "$as_me:$LINENO: WARNING: firefox-plugin not found" >&5 ! echo "$as_me: WARNING: firefox-plugin not found" >&2;} fi Index: configure.in =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/configure.in,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** configure.in 24 Aug 2005 13:15:31 -0000 1.46 --- configure.in 24 Aug 2005 13:31:01 -0000 1.47 *************** *** 36,43 **** ],[ AC_MSG_NOTICE([Determining mozilla/firefox packages to link against]) ! PKG_CHECK_MODULES(MOZPLUG,[firefox-plugin],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir firfox-plugin`"],[AC_MSG_WARN([firefox-plugin not found])]) if test "$MOZPLUG_CFLAGS" = ""; then ! PKG_CHECK_MODULES(MOZPLUG,[mozilla-plugin],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir mozilla-plugin`"],[AC_MSG_WARN([mozilla-plugin not found])]) fi if test "$MOZPLUG_CFLAGS" = ""; then --- 36,43 ---- ],[ AC_MSG_NOTICE([Determining mozilla/firefox packages to link against]) ! PKG_CHECK_MODULES(MOZPLUG,[mozilla-plugin],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir mozilla-plugin`"],[AC_MSG_WARN([mozilla-plugin not found])]) if test "$MOZPLUG_CFLAGS" = ""; then ! PKG_CHECK_MODULES(MOZPLUG,[firefox-plugin],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir firfox-plugin`"],[AC_MSG_WARN([firefox-plugin not found])]) fi if test "$MOZPLUG_CFLAGS" = ""; then |