--- gecko-mediaplayer-0.9.3.orig/configure.in 2009-01-02 11:17:36.000000000 -0700 +++ gecko-mediaplayer-0.9.3/configure.in 2009-01-02 15:38:48.000000000 -0700 @@ -30,67 +30,10 @@ AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) -AC_ARG_WITH([xulrunner-sdk], - [AS_HELP_STRING([--with-xulrunner-sdk], - [Use xulrunner SDK for build])], - [ - XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk - GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java" - GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl" - GECKO_HOME="$XULRUNNER_SDK_PREFIX/bin" - GECKO_IDLDIR="$XULRUNNER_SDK_PREFIX/idl" - ], - []) - -if test "$GECKO_CFLAGS" = ""; then -PKG_CHECK_MODULES(GECKO, [mozilla-plugin mozilla-xpcom],[ - GECKO_HOME=`$PKG_CONFIG --variable=libdir mozilla-plugin` - GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir mozilla-xpcom` - ],[AC_MSG_WARN([mozilla-plugin not found, trying another])]) -fi - -if test "$GECKO_CFLAGS" = ""; then -PKG_CHECK_MODULES(GECKO, [firefox-plugin firefox-xpcom],[ - GECKO_HOME=`$PKG_CONFIG --variable=libdir firefox-plugin` - GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir firefox-xpcom` - ],[AC_MSG_WARN([firefox-plugin not found, trying another])]) -fi - -if test "$GECKO_CFLAGS" = ""; then -PKG_CHECK_MODULES(GECKO, [seamonkey-plugin seamonkey-xpcom],[ - GECKO_HOME=`$PKG_CONFIG --variable=libdir seamonkey-plugin` - GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir seamonkey-xpcom` - ],[AC_MSG_WARN([seamokey-plugin not found, trying another])]) -fi - -if test "$GECKO_CFLAGS" = ""; then -PKG_CHECK_MODULES(GECKO, [xulrunner-plugin xulrunner-xpcom],[ - GECKO_HOME=`$PKG_CONFIG --variable=libdir xulrunner-plugin` - GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir xulrunner-xpcom` - ],[AC_MSG_WARN([xulrunner-plugin not found, trying another])]) -fi - -if test "$GECKO_CFLAGS" = ""; then PKG_CHECK_MODULES(GECKO, [libxul],[ - GECKO_HOME=`$PKG_CONFIG --variable=libdir libxul` - GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir libxul` + GECKO_HOME=`$PKG_CONFIG --variable=sdkdir libxul` + GECKO_IDLDIR=$GECKO_HOME/idl ],[AC_MSG_WARN([libxul not found, trying another])]) -fi - -if test "$GECKO_CFLAGS" = ""; then -PKG_CHECK_MODULES(GECKO, [libxul-unstable],[ - GECKO_HOME=`$PKG_CONFIG --variable=libdir libxul-unstable` - GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir libxul-unstable` - ],[AC_MSG_WARN([libxul-unstable not found, trying another])]) -fi - - -if test "$GECKO_CFLAGS" = ""; then -PKG_CHECK_MODULES(GECKO, [iceape-plugin iceape-xpcom],[ - GECKO_HOME=`$PKG_CONFIG --variable=libdir iceape-plugin` - GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir iceape-xpcom` - ],[AC_MSG_WARN([iceape-plugin not found, trying another])]) -fi PKG_CHECK_MODULES(NSPR, [nspr],[ libdir=`$PKG_CONFIG --variable=libdir nspr`