--- mplayerplug-in-3.25.orig/Makefile.in +++ mplayerplug-in-3.25/Makefile.in @@ -13,7 +13,7 @@ CC= @CC@ CXX= @CXX@ CFLAGS= -Wall @CFLAGS@ @CPPFLAGS@ @CXXFLAGS@ @CXXFLAGS64@ -DXP_UNIX -DMOZ_X11 @MOZPLUG_CFLAGS@ -Iinclude -fPIC @GECKO_DEFINES@ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ @GTK_DEFINES@ -LDFLAGS= @LDFLAGS@ @LDFLAGS64@ @LIBS@ @X_PRE_LIBS@ @XEXT_LIBS@ @XPM_LIBS@ @MOZPLUG_LIBS@ @GTK_LIBS@ @GTHREAD_LIBS@ +LDFLAGS= @LDFLAGS@ @LDFLAGS64@ @LIBS@ @X_PRE_LIBS@ @XEXT_LIBS@ @XPM_LIBS@ @GTK_LIBS@ @GTHREAD_LIBS@ LIBOBJS= @LIBOBJS@ OBJ= plugin.o nsScriptablePeer.o npp_gate.o np_entry.o npn_gate.o \ plugin-support.o plugin-setup.o plugin-list.o plugin-ui.o \ --- mplayerplug-in-3.25.orig/configure.in +++ mplayerplug-in-3.25/configure.in @@ -23,13 +23,11 @@ AC_SUBST(GECKO_SDK_PREFIX) if test -d ${GECKO_SDK_PREFIX}/xpcom/include; then MOZPLUG_CFLAGS="-I${GECKO_SDK_PREFIX} -I${GECKO_SDK_PREFIX}/xpcom/include -I${GECKO_SDK_PREFIX}/nspr/include -I${GECKO_SDK_PREFIX}/string/include -I${GECKO_SDK_PREFIX}/plugin/include -I${GECKO_SDK_PREFIX}/java/include -DGECKOSDK_ENABLED" - MOZPLUG_LIBS="-L ${GECKO_SDK_PREFIX}/xpcom/bin -lxpcomglue -L ${GECKO_SDK_PREFIX}/nspr/bin -lnspr4 -L ${GECKO_SDK_PREFIX}/nspr/bin -lplds4" GECKO_DEFINES="-DXPCOM_GLUE -DMOZILLA_STRICT_API" AC_SUBST(GECKO_DEFINES) else echo "Using new (v1.7+) gecko-sdk" MOZPLUG_CFLAGS="-I${GECKO_SDK_PREFIX} -I${GECKO_SDK_PREFIX}/include" - MOZPLUG_LIBS="-L ${GECKO_SDK_PREFIX}/lib -lxpcomglue -L ${GECKO_SDK_PREFIX}/bin -lnspr4 -lplds4" GECKO_DEFINES="-DXPCOM_GLUE -DMOZILLA_STRICT_API" AC_SUBST(GECKO_DEFINES) fi @@ -42,7 +40,7 @@ fi ],[ - AC_MSG_NOTICE([Determining mozilla/firefox packages to link against]) + AC_MSG_NOTICE([Determining mozilla/firefox packages to build 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 @@ -62,7 +60,6 @@ ) AC_SUBST(MOZPLUG_CFLAGS) -AC_SUBST(MOZPLUG_LIBS) GTK_DEFINES="-DX_ENABLED" AC_ARG_ENABLE(gtk2,