--- 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 \ @@ -123,7 +123,7 @@ $(CC) -c -o $@ $(CFLAGS) extras/strlcpy.c clean: - $(RM) $(OBJ) $(OBJ_WMP) $(OBJ_QT) $(OBJ_RM) $(OBJ_GMP) $(SHAREDTARGET)*.so $(SHAREDTARGET)*.xpt + $(RM) $(OBJ) $(OBJ_WMP) $(OBJ_QT) $(OBJ_RM) $(OBJ_GMP) $(SHAREDTARGET)*.so $(SHAREDTARGET)*.xpt install.sh install: all ./install.sh $(DESTDIR) --- mplayerplug-in-3.25.orig/config.h.in +++ mplayerplug-in-3.25/config.h.in @@ -3,6 +3,15 @@ /* Define to 1 if you have the header file. */ #undef DPMSExtension +/* Define to 1 if you have GTK1 */ +#undef GTK1_ENABLED + +/* Define to 1 if you have GTK2 */ +#undef GTK24_ENABLED + +/* Define to 1 if you have GTK2 */ +#undef GTK2_ENABLED + /* Define to 1 if you have the `dup2' function. */ #undef HAVE_DUP2 @@ -12,12 +21,18 @@ /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK +/* Define to 1 if you have the header file. */ +#undef HAVE_GETTEXT + /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBINTL_H + /* Define to 1 if your system has a GNU libc compatible `malloc' function, and to 0 otherwise. */ #undef HAVE_MALLOC @@ -151,9 +166,6 @@ /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING -/* Define to 1 if you have the `gettext' function. */ -#undef HAVE_GETTEXT - /* Define to empty if `const' does not conform to ANSI C. */ #undef const @@ -168,12 +180,3 @@ /* Define as `fork' if `vfork' does not work. */ #undef vfork - -/* Define to 1 if you have GTK2 */ -#undef GTK2_ENABLED - -/* Define to 1 if you have GTK2 2.4+ */ -#undef GTK24_ENABLED - -/* Define to 1 if you have GTK1 */ -#undef GTK1_ENABLED --- mplayerplug-in-3.25.orig/configure +++ mplayerplug-in-3.25/configure @@ -312,7 +312,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK SET_MAKE GECKO_SDK_PREFIX GECKO_DEFINES PKG_CONFIG MOZPLUG_CFLAGS MOZPLUG_LIBS GTK_CFLAGS GTK_LIBS GTHREAD_CFLAGS GTHREAD_LIBS CREATE CXXFLAGS64 LDFLAGS64 GTK_DEFINES CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS EGREP LIBOBJS LOCALEDIR SUBDIR INSTALL_SUBDIR XPM_LIBS XEXT_LIBS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK SET_MAKE GECKO_SDK_PREFIX GECKO_DEFINES PKG_CONFIG ac_pt_PKG_CONFIG MOZPLUG_CFLAGS MOZPLUG_LIBS GTK_CFLAGS GTK_LIBS GTHREAD_CFLAGS GTHREAD_LIBS CREATE CXXFLAGS64 LDFLAGS64 GTK_DEFINES CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS EGREP LIBOBJS LOCALEDIR SUBDIR INSTALL_SUBDIR XPM_LIBS XEXT_LIBS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -777,6 +777,34 @@ ac_env_CFLAGS_value=$CFLAGS ac_cv_env_CFLAGS_set=${CFLAGS+set} ac_cv_env_CFLAGS_value=$CFLAGS +ac_env_PKG_CONFIG_set=${PKG_CONFIG+set} +ac_env_PKG_CONFIG_value=$PKG_CONFIG +ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set} +ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG +ac_env_MOZPLUG_CFLAGS_set=${MOZPLUG_CFLAGS+set} +ac_env_MOZPLUG_CFLAGS_value=$MOZPLUG_CFLAGS +ac_cv_env_MOZPLUG_CFLAGS_set=${MOZPLUG_CFLAGS+set} +ac_cv_env_MOZPLUG_CFLAGS_value=$MOZPLUG_CFLAGS +ac_env_MOZPLUG_LIBS_set=${MOZPLUG_LIBS+set} +ac_env_MOZPLUG_LIBS_value=$MOZPLUG_LIBS +ac_cv_env_MOZPLUG_LIBS_set=${MOZPLUG_LIBS+set} +ac_cv_env_MOZPLUG_LIBS_value=$MOZPLUG_LIBS +ac_env_GTK_CFLAGS_set=${GTK_CFLAGS+set} +ac_env_GTK_CFLAGS_value=$GTK_CFLAGS +ac_cv_env_GTK_CFLAGS_set=${GTK_CFLAGS+set} +ac_cv_env_GTK_CFLAGS_value=$GTK_CFLAGS +ac_env_GTK_LIBS_set=${GTK_LIBS+set} +ac_env_GTK_LIBS_value=$GTK_LIBS +ac_cv_env_GTK_LIBS_set=${GTK_LIBS+set} +ac_cv_env_GTK_LIBS_value=$GTK_LIBS +ac_env_GTHREAD_CFLAGS_set=${GTHREAD_CFLAGS+set} +ac_env_GTHREAD_CFLAGS_value=$GTHREAD_CFLAGS +ac_cv_env_GTHREAD_CFLAGS_set=${GTHREAD_CFLAGS+set} +ac_cv_env_GTHREAD_CFLAGS_value=$GTHREAD_CFLAGS +ac_env_GTHREAD_LIBS_set=${GTHREAD_LIBS+set} +ac_env_GTHREAD_LIBS_value=$GTHREAD_LIBS +ac_cv_env_GTHREAD_LIBS_set=${GTHREAD_LIBS+set} +ac_cv_env_GTHREAD_LIBS_value=$GTHREAD_LIBS ac_env_CPP_set=${CPP+set} ac_env_CPP_value=$CPP ac_cv_env_CPP_set=${CPP+set} @@ -883,6 +911,17 @@ headers in a nonstandard directory CC C compiler command CFLAGS C compiler flags + PKG_CONFIG path to pkg-config utility + MOZPLUG_CFLAGS + C compiler flags for MOZPLUG, overriding pkg-config + MOZPLUG_LIBS + linker flags for MOZPLUG, overriding pkg-config + GTK_CFLAGS C compiler flags for GTK, overriding pkg-config + GTK_LIBS linker flags for GTK, overriding pkg-config + GTHREAD_CFLAGS + C compiler flags for GTHREAD, overriding pkg-config + GTHREAD_LIBS + linker flags for GTHREAD, overriding pkg-config CPP C preprocessor Use these variables to override the choices made by `configure' or to help @@ -977,7 +1016,7 @@ else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi @@ -1686,8 +1725,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -1745,8 +1783,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -1817,8 +1854,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -1862,8 +1898,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2263,8 +2298,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2322,8 +2356,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2439,8 +2472,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2494,8 +2526,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2540,8 +2571,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2585,8 +2615,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2804,46 +2833,11 @@ #tell us where gecko-sdk is, try to find if not provided -# Check whether --with-gecko-sdk or --without-gecko-sdk was given. -if test "${with_gecko_sdk+set}" = set; then - withval="$with_gecko_sdk" - GECKO_SDK_PREFIX=$with_gecko_sdk - -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" - -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" - -fi -# Check whether --enable-rpath or --disable-rpath was given. -if test "${enable_rpath+set}" = set; then - enableval="$enable_rpath" - if test "$enableval" = ""; then use_rpath=yes; else use_rpath=$enableval; fi -else - use_rpath=no -fi; - -if test "$use_rpath" = "yes"; then - LDFLAGS="$LDFLAGS -Wl,-R${GECKO_SDK_PREFIX}/bin:${GECKO_SDK_PREFIX}/lib" -fi - - -else - - { echo "$as_me:$LINENO: Determining mozilla/firefox packages to link against" >&5 -echo "$as_me: Determining mozilla/firefox packages to link against" >&6;} - 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 +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}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 @@ -2868,7 +2862,6 @@ done done - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -2882,75 +2875,19 @@ 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 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 - succeeded=yes - - 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 - - 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 - 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 "mozilla-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 mozilla-plugin`" - else - { echo "$as_me:$LINENO: WARNING: mozilla-plugin not found" >&5 -echo "$as_me: WARNING: mozilla-plugin not found" >&2;} - 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. +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # 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 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PKG_CONFIG in + case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2960,295 +2897,385 @@ 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" + ac_cv_path_ac_pt_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 +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 +if test -n "$ac_pt_PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_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 firefox-plugin" >&5 -echo $ECHO_N "checking for firefox-plugin... $ECHO_C" >&6 + PKG_CONFIG=$ac_pt_PKG_CONFIG +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi - if $PKG_CONFIG --exists "firefox-plugin" ; then - echo "$as_me:$LINENO: result: yes" >&5 +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6 + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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 "firefox-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 "firefox-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 "firefox-plugin"` + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + PKG_CONFIG="" + fi - fi +fi +# Check whether --with-gecko-sdk or --without-gecko-sdk was given. +if test "${with_gecko_sdk+set}" = set; then + withval="$with_gecko_sdk" + GECKO_SDK_PREFIX=$with_gecko_sdk +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" + GECKO_DEFINES="-DXPCOM_GLUE -DMOZILLA_STRICT_API" - 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 +else + echo "Using new (v1.7+) gecko-sdk" + MOZPLUG_CFLAGS="-I${GECKO_SDK_PREFIX} -I${GECKO_SDK_PREFIX}/include" + GECKO_DEFINES="-DXPCOM_GLUE -DMOZILLA_STRICT_API" - if test $succeeded = yes; then - MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir firefox-plugin`" - else - { echo "$as_me:$LINENO: WARNING: firefox-plugin not found" >&5 -echo "$as_me: WARNING: firefox-plugin not found" >&2;} - fi +fi +# Check whether --enable-rpath or --disable-rpath was given. +if test "${enable_rpath+set}" = set; then + enableval="$enable_rpath" + if test "$enableval" = ""; then use_rpath=yes; else use_rpath=$enableval; fi +else + use_rpath=no +fi; - fi - if test "$MOZPLUG_CFLAGS" = ""; then +if test "$use_rpath" = "yes"; then + LDFLAGS="$LDFLAGS -Wl,-R${GECKO_SDK_PREFIX}/bin:${GECKO_SDK_PREFIX}/lib" +fi - 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 + { echo "$as_me:$LINENO: Determining mozilla/firefox packages to build against" >&5 +echo "$as_me: Determining mozilla/firefox packages to build against" >&6;} + +pkg_failed=no +echo "$as_me:$LINENO: checking for MOZPLUG" >&5 +echo $ECHO_N "checking for MOZPLUG... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + if test -n "$MOZPLUG_CFLAGS"; then + pkg_cv_MOZPLUG_CFLAGS="$MOZPLUG_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin\"") >&5 + ($PKG_CONFIG --exists --print-errors "mozilla-plugin") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin" 2>/dev/null` else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$MOZPLUG_LIBS"; then + pkg_cv_MOZPLUG_LIBS="$MOZPLUG_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin\"") >&5 + ($PKG_CONFIG --exists --print-errors "mozilla-plugin") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_MOZPLUG_LIBS=`$PKG_CONFIG --libs "mozilla-plugin" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried 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 seamonkey-plugin" >&5 -echo $ECHO_N "checking for seamonkey-plugin... $ECHO_C" >&6 - if $PKG_CONFIG --exists "seamonkey-plugin" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - succeeded=yes +if test $pkg_failed = yes; then - echo "$as_me:$LINENO: checking MOZPLUG_CFLAGS" >&5 -echo $ECHO_N "checking MOZPLUG_CFLAGS... $ECHO_C" >&6 - MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-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 "seamonkey-plugin"` - echo "$as_me:$LINENO: result: $MOZPLUG_LIBS" >&5 -echo "${ECHO_T}$MOZPLUG_LIBS" >&6 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-plugin"` 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 "seamonkey-plugin"` - + MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-plugin"` fi + # Put the nasty error message in config.log where it belongs + echo "$MOZPLUG_PKG_ERRORS" >&5 + { echo "$as_me:$LINENO: WARNING: mozilla-plugin not found" >&5 +echo "$as_me: WARNING: mozilla-plugin not found" >&2;} +elif test $pkg_failed = untried; then + { echo "$as_me:$LINENO: WARNING: mozilla-plugin not found" >&5 +echo "$as_me: WARNING: mozilla-plugin not found" >&2;} +else + MOZPLUG_CFLAGS=$pkg_cv_MOZPLUG_CFLAGS + MOZPLUG_LIBS=$pkg_cv_MOZPLUG_LIBS + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir mozilla-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 seamonkey-plugin`" - else - { echo "$as_me:$LINENO: WARNING: seamonkey-plugin not found" >&5 -echo "$as_me: WARNING: seamonkey-plugin not found" >&2;} - fi - - fi if test "$MOZPLUG_CFLAGS" = ""; then - succeeded=no +pkg_failed=no +echo "$as_me:$LINENO: checking for MOZPLUG" >&5 +echo $ECHO_N "checking for MOZPLUG... $ECHO_C" >&6 - 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 +if test -n "$PKG_CONFIG"; then + if test -n "$MOZPLUG_CFLAGS"; then + pkg_cv_MOZPLUG_CFLAGS="$MOZPLUG_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin\"") >&5 + ($PKG_CONFIG --exists --print-errors "firefox-plugin") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin" 2>/dev/null` 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 + pkg_failed=yes +fi + fi +else + pkg_failed=untried 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 + if test -n "$MOZPLUG_LIBS"; then + pkg_cv_MOZPLUG_LIBS="$MOZPLUG_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin\"") >&5 + ($PKG_CONFIG --exists --print-errors "firefox-plugin") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_MOZPLUG_LIBS=`$PKG_CONFIG --libs "firefox-plugin" 2>/dev/null` else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + pkg_failed=yes +fi + fi +else + pkg_failed=untried 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 +if test $pkg_failed = yes; then - 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 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-plugin"` 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"` - + MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-plugin"` fi + # Put the nasty error message in config.log where it belongs + echo "$MOZPLUG_PKG_ERRORS" >&5 - - - 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 - + { echo "$as_me:$LINENO: WARNING: firefox-plugin not found" >&5 +echo "$as_me: WARNING: firefox-plugin not found" >&2;} +elif test $pkg_failed = untried; then + { echo "$as_me:$LINENO: WARNING: firefox-plugin not found" >&5 +echo "$as_me: WARNING: firefox-plugin not found" >&2;} +else + MOZPLUG_CFLAGS=$pkg_cv_MOZPLUG_CFLAGS + MOZPLUG_LIBS=$pkg_cv_MOZPLUG_LIBS + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir firefox-plugin`" +fi fi - if test "$MOZPLUG_CFLAGS" = ""; then - { { echo "$as_me:$LINENO: error: Unable to find mozilla or firefox development files" >&5 -echo "$as_me: error: Unable to find mozilla or firefox development files" >&2;} - { (exit 1); exit 1; }; } - fi +pkg_failed=no +echo "$as_me:$LINENO: checking for MOZPLUG" >&5 +echo $ECHO_N "checking for MOZPLUG... $ECHO_C" >&6 -fi; - - - - -GTK_DEFINES="-DX_ENABLED" -# Check whether --enable-gtk2 or --disable-gtk2 was given. -if test "${enable_gtk2+set}" = set; then +if test -n "$PKG_CONFIG"; then + if test -n "$MOZPLUG_CFLAGS"; then + pkg_cv_MOZPLUG_CFLAGS="$MOZPLUG_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-plugin\"") >&5 + ($PKG_CONFIG --exists --print-errors "seamonkey-plugin") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-plugin" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$MOZPLUG_LIBS"; then + pkg_cv_MOZPLUG_LIBS="$MOZPLUG_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-plugin\"") >&5 + ($PKG_CONFIG --exists --print-errors "seamonkey-plugin") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_MOZPLUG_LIBS=`$PKG_CONFIG --libs "seamonkey-plugin" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "seamonkey-plugin"` + else + MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "seamonkey-plugin"` + fi + # Put the nasty error message in config.log where it belongs + echo "$MOZPLUG_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: WARNING: seamonkey-plugin not found" >&5 +echo "$as_me: WARNING: seamonkey-plugin not found" >&2;} +elif test $pkg_failed = untried; then + { echo "$as_me:$LINENO: WARNING: seamonkey-plugin not found" >&5 +echo "$as_me: WARNING: seamonkey-plugin not found" >&2;} +else + MOZPLUG_CFLAGS=$pkg_cv_MOZPLUG_CFLAGS + MOZPLUG_LIBS=$pkg_cv_MOZPLUG_LIBS + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir seamonkey-plugin`" +fi + fi + if test "$MOZPLUG_CFLAGS" = ""; then + +pkg_failed=no +echo "$as_me:$LINENO: checking for MOZPLUG" >&5 +echo $ECHO_N "checking for MOZPLUG... $ECHO_C" >&6 + +if test -n "$PKG_CONFIG"; then + if test -n "$MOZPLUG_CFLAGS"; then + pkg_cv_MOZPLUG_CFLAGS="$MOZPLUG_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin\"") >&5 + ($PKG_CONFIG --exists --print-errors "xulrunner-plugin") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-plugin" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$MOZPLUG_LIBS"; then + pkg_cv_MOZPLUG_LIBS="$MOZPLUG_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin\"") >&5 + ($PKG_CONFIG --exists --print-errors "xulrunner-plugin") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_MOZPLUG_LIBS=`$PKG_CONFIG --libs "xulrunner-plugin" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xulrunner-plugin"` + else + MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xulrunner-plugin"` + fi + # Put the nasty error message in config.log where it belongs + echo "$MOZPLUG_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: WARNING: xulrunner-plugin not found" >&5 +echo "$as_me: WARNING: xulrunner-plugin not found" >&2;} +elif test $pkg_failed = untried; then + { echo "$as_me:$LINENO: WARNING: xulrunner-plugin not found" >&5 +echo "$as_me: WARNING: xulrunner-plugin not found" >&2;} +else + MOZPLUG_CFLAGS=$pkg_cv_MOZPLUG_CFLAGS + MOZPLUG_LIBS=$pkg_cv_MOZPLUG_LIBS + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir xulrunner-plugin`" +fi + fi + + if test "$MOZPLUG_CFLAGS" = ""; then + { { echo "$as_me:$LINENO: error: Unable to find mozilla or firefox development files" >&5 +echo "$as_me: error: Unable to find mozilla or firefox development files" >&2;} + { (exit 1); exit 1; }; } + fi + + +fi; + + + +GTK_DEFINES="-DX_ENABLED" +# Check whether --enable-gtk2 or --disable-gtk2 was given. +if test "${enable_gtk2+set}" = set; then enableval="$enable_gtk2" use_gtk2=$enableval else @@ -3280,506 +3307,378 @@ if test $use_gtk2 = yes; then - succeeded=no +pkg_failed=no +echo "$as_me:$LINENO: checking for GTK" >&5 +echo $ECHO_N "checking for GTK... $ECHO_C" >&6 - 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 +if test -n "$PKG_CONFIG"; then + if test -n "$GTK_CFLAGS"; then + pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null` 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 + pkg_failed=yes +fi + fi +else + pkg_failed=untried 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 + if test -n "$GTK_LIBS"; then + pkg_cv_GTK_LIBS="$GTK_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null` else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + pkg_failed=yes +fi + fi +else + pkg_failed=untried 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 gtk+-2.0" >&5 -echo $ECHO_N "checking for gtk+-2.0... $ECHO_C" >&6 - if $PKG_CONFIG --exists "gtk+-2.0" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - succeeded=yes +if test $pkg_failed = yes; then - echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 -echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6 - GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"` - echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 -echo "${ECHO_T}$GTK_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking GTK_LIBS" >&5 -echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6 - GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"` - echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 -echo "${ECHO_T}$GTK_LIBS" >&6 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0"` else - GTK_CFLAGS="" - GTK_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"` - + GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"` fi + # Put the nasty error message in config.log where it belongs + echo "$GTK_PKG_ERRORS" >&5 - - - 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 - GTK_DEFINES="-DGTK_ENABLED" + { echo "$as_me:$LINENO: WARNING: *** Running in X mode - Limited Features ***" >&5 +echo "$as_me: WARNING: *** Running in X mode - Limited Features ***" >&2;} +elif test $pkg_failed = untried; then + { echo "$as_me:$LINENO: WARNING: *** Running in X mode - Limited Features ***" >&5 +echo "$as_me: WARNING: *** Running in X mode - Limited Features ***" >&2;} +else + GTK_CFLAGS=$pkg_cv_GTK_CFLAGS + GTK_LIBS=$pkg_cv_GTK_LIBS + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + GTK_DEFINES="-DGTK_ENABLED" cat >>confdefs.h <<\_ACEOF #define GTK2_ENABLED 1 _ACEOF - else - { echo "$as_me:$LINENO: WARNING: *** Running in X mode - Limited Features ***" >&5 -echo "$as_me: WARNING: *** Running in X mode - Limited Features ***" >&2;} - fi - +fi - succeeded=no +pkg_failed=no +echo "$as_me:$LINENO: checking for GTK" >&5 +echo $ECHO_N "checking for GTK... $ECHO_C" >&6 - 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 +if test -n "$PKG_CONFIG"; then + if test -n "$GTK_CFLAGS"; then + pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.4.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.4.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4.0" 2>/dev/null` 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 + pkg_failed=yes +fi + fi +else + pkg_failed=untried 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 + if test -n "$GTK_LIBS"; then + pkg_cv_GTK_LIBS="$GTK_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.4.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.4.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4.0" 2>/dev/null` else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + pkg_failed=yes +fi + fi +else + pkg_failed=untried 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 gtk+-2.0 >= 2.4.0" >&5 -echo $ECHO_N "checking for gtk+-2.0 >= 2.4.0... $ECHO_C" >&6 - if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4.0" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - succeeded=yes +if test $pkg_failed = yes; then - echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 -echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6 - GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4.0"` - echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 -echo "${ECHO_T}$GTK_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking GTK_LIBS" >&5 -echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6 - GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4.0"` - echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 -echo "${ECHO_T}$GTK_LIBS" >&6 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.4.0"` else - GTK_CFLAGS="" - GTK_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.4.0"` - + GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.4.0"` fi + # Put the nasty error message in config.log where it belongs + echo "$GTK_PKG_ERRORS" >&5 - - - 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 - GTK_DEFINES="-DGTK_ENABLED" + { echo "$as_me:$LINENO: WARNING: *** Running in X mode - Limited Features ***" >&5 +echo "$as_me: WARNING: *** Running in X mode - Limited Features ***" >&2;} +elif test $pkg_failed = untried; then + { echo "$as_me:$LINENO: WARNING: *** Running in X mode - Limited Features ***" >&5 +echo "$as_me: WARNING: *** Running in X mode - Limited Features ***" >&2;} +else + GTK_CFLAGS=$pkg_cv_GTK_CFLAGS + GTK_LIBS=$pkg_cv_GTK_LIBS + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + GTK_DEFINES="-DGTK_ENABLED" cat >>confdefs.h <<\_ACEOF #define GTK24_ENABLED 1 _ACEOF - else - { echo "$as_me:$LINENO: WARNING: *** Running in X mode - Limited Features ***" >&5 -echo "$as_me: WARNING: *** Running in X mode - Limited Features ***" >&2;} - fi - +fi - succeeded=no +pkg_failed=no +echo "$as_me:$LINENO: checking for GTHREAD" >&5 +echo $ECHO_N "checking for GTHREAD... $ECHO_C" >&6 - 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 +if test -n "$PKG_CONFIG"; then + if test -n "$GTHREAD_CFLAGS"; then + pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0" 2>/dev/null` 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 + pkg_failed=yes +fi + fi +else + pkg_failed=untried 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 + if test -n "$GTHREAD_LIBS"; then + pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null` else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + pkg_failed=yes +fi + fi +else + pkg_failed=untried 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 gthread-2.0" >&5 -echo $ECHO_N "checking for gthread-2.0... $ECHO_C" >&6 - if $PKG_CONFIG --exists "gthread-2.0" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - succeeded=yes +if test $pkg_failed = yes; then - echo "$as_me:$LINENO: checking GTHREAD_CFLAGS" >&5 -echo $ECHO_N "checking GTHREAD_CFLAGS... $ECHO_C" >&6 - GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0"` - echo "$as_me:$LINENO: result: $GTHREAD_CFLAGS" >&5 -echo "${ECHO_T}$GTHREAD_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking GTHREAD_LIBS" >&5 -echo $ECHO_N "checking GTHREAD_LIBS... $ECHO_C" >&6 - GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0"` - echo "$as_me:$LINENO: result: $GTHREAD_LIBS" >&5 -echo "${ECHO_T}$GTHREAD_LIBS" >&6 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gthread-2.0"` else - GTHREAD_CFLAGS="" - GTHREAD_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0"` - + GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0"` fi + # Put the nasty error message in config.log where it belongs + echo "$GTHREAD_PKG_ERRORS" >&5 - - - 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 - : - else - { { echo "$as_me:$LINENO: error: Missing gthread package" >&5 + { { echo "$as_me:$LINENO: error: Missing gthread package" >&5 echo "$as_me: error: Missing gthread package" >&2;} { (exit 1); exit 1; }; } - fi - +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: Missing gthread package" >&5 +echo "$as_me: error: Missing gthread package" >&2;} + { (exit 1); exit 1; }; } +else + GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS + GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + : +fi fi if test $use_gtk1 = yes; then - succeeded=no +pkg_failed=no +echo "$as_me:$LINENO: checking for GTK" >&5 +echo $ECHO_N "checking for GTK... $ECHO_C" >&6 - 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 +if test -n "$PKG_CONFIG"; then + if test -n "$GTK_CFLAGS"; then + pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+" 2>/dev/null` 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 + pkg_failed=yes +fi + fi +else + pkg_failed=untried 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 + if test -n "$GTK_LIBS"; then + pkg_cv_GTK_LIBS="$GTK_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+" 2>/dev/null` else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + pkg_failed=yes +fi + fi +else + pkg_failed=untried 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 gtk+" >&5 -echo $ECHO_N "checking for gtk+... $ECHO_C" >&6 - if $PKG_CONFIG --exists "gtk+" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - succeeded=yes +if test $pkg_failed = yes; then - echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 -echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6 - GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+"` - echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 -echo "${ECHO_T}$GTK_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking GTK_LIBS" >&5 -echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6 - GTK_LIBS=`$PKG_CONFIG --libs "gtk+"` - echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 -echo "${ECHO_T}$GTK_LIBS" >&6 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+"` else - GTK_CFLAGS="" - GTK_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+"` - + GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+"` fi + # Put the nasty error message in config.log where it belongs + echo "$GTK_PKG_ERRORS" >&5 - - - 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 - GTK_DEFINES="-DGTK_ENABLED" + { echo "$as_me:$LINENO: WARNING: gtk+ development packages are not found" >&5 +echo "$as_me: WARNING: gtk+ development packages are not found" >&2;} +elif test $pkg_failed = untried; then + { echo "$as_me:$LINENO: WARNING: gtk+ development packages are not found" >&5 +echo "$as_me: WARNING: gtk+ development packages are not found" >&2;} +else + GTK_CFLAGS=$pkg_cv_GTK_CFLAGS + GTK_LIBS=$pkg_cv_GTK_LIBS + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + GTK_DEFINES="-DGTK_ENABLED" cat >>confdefs.h <<\_ACEOF #define GTK1_ENABLED 1 _ACEOF - else - { echo "$as_me:$LINENO: WARNING: gtk+ development packages are not found" >&5 -echo "$as_me: WARNING: gtk+ development packages are not found" >&2;} - fi - +fi - succeeded=no +pkg_failed=no +echo "$as_me:$LINENO: checking for GTHREAD" >&5 +echo $ECHO_N "checking for GTHREAD... $ECHO_C" >&6 - 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 +if test -n "$PKG_CONFIG"; then + if test -n "$GTHREAD_CFLAGS"; then + pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread\"") >&5 + ($PKG_CONFIG --exists --print-errors "gthread") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread" 2>/dev/null` 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 + pkg_failed=yes +fi + fi +else + pkg_failed=untried 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 + if test -n "$GTHREAD_LIBS"; then + pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread\"") >&5 + ($PKG_CONFIG --exists --print-errors "gthread") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread" 2>/dev/null` else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + pkg_failed=yes +fi + fi +else + pkg_failed=untried 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 gthread" >&5 -echo $ECHO_N "checking for gthread... $ECHO_C" >&6 - if $PKG_CONFIG --exists "gthread" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - succeeded=yes +if test $pkg_failed = yes; then - echo "$as_me:$LINENO: checking GTHREAD_CFLAGS" >&5 -echo $ECHO_N "checking GTHREAD_CFLAGS... $ECHO_C" >&6 - GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread"` - echo "$as_me:$LINENO: result: $GTHREAD_CFLAGS" >&5 -echo "${ECHO_T}$GTHREAD_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking GTHREAD_LIBS" >&5 -echo $ECHO_N "checking GTHREAD_LIBS... $ECHO_C" >&6 - GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread"` - echo "$as_me:$LINENO: result: $GTHREAD_LIBS" >&5 -echo "${ECHO_T}$GTHREAD_LIBS" >&6 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gthread"` else - GTHREAD_CFLAGS="" - GTHREAD_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread"` - + GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread"` fi + # Put the nasty error message in config.log where it belongs + echo "$GTHREAD_PKG_ERRORS" >&5 - - - 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 - : - else - { { echo "$as_me:$LINENO: error: Missing gthread package" >&5 + { { echo "$as_me:$LINENO: error: Missing gthread package" >&5 echo "$as_me: error: Missing gthread package" >&2;} { (exit 1); exit 1; }; } - fi - +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: Missing gthread package" >&5 +echo "$as_me: error: Missing gthread package" >&2;} + { (exit 1); exit 1; }; } +else + GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS + GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + : +fi fi # Check whether --enable-x86_64 or --disable-x86_64 was given. @@ -4088,6 +3987,247 @@ echo "$as_me:$LINENO: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 +ac_path_x_has_been_run=yes + +# Check whether --with-x or --without-x was given. +if test "${with_x+set}" = set; then + withval="$with_x" + +fi; +# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +if test "x$with_x" = xno; then + # The user explicitly disabled X. + have_x=disabled +else + if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then + # Both variables are already set. + have_x=yes + else + if test "${ac_cv_have_x+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # One or both of the vars are not set, and there is no cached value. +ac_x_includes=no ac_x_libraries=no +rm -fr conftest.dir +if mkdir conftest.dir; then + cd conftest.dir + # Make sure to not put "make" in the Imakefile rules, since we grep it out. + cat >Imakefile <<'_ACEOF' +acfindx: + @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' +_ACEOF + if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. + eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` + # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. + for ac_extension in a so sl; do + if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && + test -f $ac_im_libdir/libX11.$ac_extension; then + ac_im_usrlibdir=$ac_im_libdir; break + fi + done + # Screen out bogus values from the imake configuration. They are + # bogus both because they are the default anyway, and because + # using them would break gcc on systems where it needs fixed includes. + case $ac_im_incroot in + /usr/include) ;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac + case $ac_im_usrlibdir in + /usr/lib | /lib) ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + esac + fi + cd .. + rm -fr conftest.dir +fi + +# Standard set of common directories for X headers. +# Check X11 before X11Rn because it is often a symlink to the current release. +ac_x_header_dirs=' +/usr/X11/include +/usr/X11R6/include +/usr/X11R5/include +/usr/X11R4/include + +/usr/include/X11 +/usr/include/X11R6 +/usr/include/X11R5 +/usr/include/X11R4 + +/usr/local/X11/include +/usr/local/X11R6/include +/usr/local/X11R5/include +/usr/local/X11R4/include + +/usr/local/include/X11 +/usr/local/include/X11R6 +/usr/local/include/X11R5 +/usr/local/include/X11R4 + +/usr/X386/include +/usr/x386/include +/usr/XFree86/include/X11 + +/usr/include +/usr/local/include +/usr/unsupported/include +/usr/athena/include +/usr/local/x11r5/include +/usr/lpp/Xamples/include + +/usr/openwin/include +/usr/openwin/share/include' + +if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for a specified header file. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # We can compile using X headers with no special include directory. +ac_x_includes= +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + for ac_dir in $ac_x_header_dirs; do + if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +done +fi +rm -f conftest.err conftest.$ac_ext +fi # $ac_x_includes = no + +if test "$ac_x_libraries" = no; then + # Check for the libraries. + # See if we find them without any special options. + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS + LIBS="-lX11 $LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +XrmInitialize () + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + LIBS=$ac_save_LIBS +# We can link X programs with no special library path. +ac_x_libraries= +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +LIBS=$ac_save_LIBS +for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +do + # Don't even attempt the hair of trying to link an X program! + for ac_extension in a so sl; do + if test -r $ac_dir/libX11.$ac_extension; then + ac_x_libraries=$ac_dir + break 2 + fi + done +done +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi # $ac_x_libraries = no + +if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then + # Didn't find X anywhere. Cache the known absence of X. + ac_cv_have_x="have_x=no" +else + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes \ + ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" +fi +fi + + fi + eval "$ac_cv_have_x" +fi # $with_x != no + +if test "$have_x" != yes; then + echo "$as_me:$LINENO: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6 + no_x=yes +else + # If each of the values was on the command line, it overrides each guess. + test "x$x_includes" = xNONE && x_includes=$ac_x_includes + test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries + # Update the cache value to reflect the command line values. + ac_cv_have_x="have_x=yes \ + ac_x_includes=$x_includes ac_x_libraries=$x_libraries" + # It might be that x_includes is empty (headers are found in the + # standard search path. Then output the corresponding message + ac_out_x_includes=$x_includes + test "x$x_includes" = x && ac_out_x_includes="in standard search path" + echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 +fi + + +if test "x$ac_path_x_has_been_run" != xyes; then + echo "$as_me:$LINENO: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6 + +ac_path_x_has_been_run=yes # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -4180,7 +4320,7 @@ /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. + # Guess where to find include files, by looking for a specified header file. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4229,7 +4369,7 @@ # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" + LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4254,8 +4394,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4279,7 +4418,7 @@ do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r $ac_dir/libXt.$ac_extension; then + if test -r $ac_dir/libX11.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi @@ -4315,10 +4454,15 @@ # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + # It might be that x_includes is empty (headers are found in the + # standard search path. Then output the corresponding message + ac_out_x_includes=$x_includes + test "x$x_includes" = x && ac_out_x_includes="in standard search path" + echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 fi +fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. @@ -4366,8 +4510,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4418,8 +4561,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4495,8 +4637,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4551,8 +4692,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4620,8 +4760,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4729,8 +4868,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4794,8 +4932,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4863,8 +5000,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4968,8 +5104,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5033,8 +5168,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5131,8 +5265,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5196,8 +5329,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5294,8 +5426,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5359,8 +5490,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5439,8 +5569,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5523,8 +5652,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5694,8 +5822,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5769,8 +5896,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5962,8 +6088,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6027,8 +6152,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6091,8 +6215,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6157,8 +6280,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6227,8 +6349,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6459,8 +6580,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6645,8 +6765,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6688,18 +6807,24 @@ ac_cv_func_fork_works=cross else cat >conftest.$ac_ext <<_ACEOF -/* By Ruediger Kuhlmann. */ - #include - #if HAVE_UNISTD_H - # include - #endif - /* Some systems only have a dummy stub for fork() */ - int main () - { - if (fork() < 0) - exit (1); - exit (0); - } +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ + + /* By Ruediger Kuhlmann. */ + if (fork() < 0) + exit (1); + exit (0); + + ; + return 0; +} _ACEOF rm -f conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6990,8 +7115,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7093,8 +7217,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7178,8 +7301,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7333,8 +7455,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7483,8 +7604,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7660,8 +7780,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7716,8 +7835,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7796,8 +7914,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7867,8 +7984,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7927,8 +8043,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8082,8 +8197,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8140,8 +8254,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8809,6 +8922,7 @@ s,@GECKO_SDK_PREFIX@,$GECKO_SDK_PREFIX,;t t s,@GECKO_DEFINES@,$GECKO_DEFINES,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t +s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t s,@MOZPLUG_CFLAGS@,$MOZPLUG_CFLAGS,;t t s,@MOZPLUG_LIBS@,$MOZPLUG_LIBS,;t t s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t @@ -8998,11 +9112,6 @@ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -9041,6 +9150,12 @@ fi;; esac done` || { (exit 1); exit 1; } + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub --- 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, --- mplayerplug-in-3.25.orig/debian/changelog +++ mplayerplug-in-3.25/debian/changelog @@ -0,0 +1,302 @@ +mplayerplug-in (3.25-7ubuntu1) edgy; urgency=low + + * Resynchronise with Debian (Closes Ubuntu: #33722, #43382, #44639, + #48424). + + -- Daniel T Chen Tue, 27 Jun 2006 04:52:18 -0400 + +mplayerplug-in (3.25-7) unstable; urgency=low + + * This is part 7834783 in the neverending series of trying to get + the dependencies as thin as possible without breaking things. + Build against mozilla-dev, not libxul-dev, since apparently + the newer headers make mplayerplug-in not work with Mozilla. + Hopefully this should make it work on all Gecko-based browsers + without changing install-time dependencies. + (Closes: #368783) + + -- Ari Pollak Tue, 30 May 2006 19:29:57 -0400 + +mplayerplug-in (3.25-6) unstable; urgency=low + + * Add | mplayer-powerpc | mplayer-g4 to Depends (Closes: #365508) + + -- Ari Pollak Tue, 25 Apr 2006 18:01:44 -0400 + +mplayerplug-in (3.25-5) unstable; urgency=low + + * Build against xulrunner headers, but don't link with xulrunner libraries, + and remove dependency on mozilla-browser | firefox + + -- Ari Pollak Tue, 25 Apr 2006 17:37:57 -0400 + +mplayerplug-in (3.25-4) unstable; urgency=low + + * Add /usr/lib/firefox to the rpath as well (Closes: #362520) + + -- Ari Pollak Sun, 16 Apr 2006 00:57:46 -0400 + +mplayerplug-in (3.25-3) unstable; urgency=low + + * Link the plugin with an rpath of /usr/lib/mozilla so that + it doesn't try to use xulrunner's libraries. (Closes: #354837, #362432 + + -- Ari Pollak Thu, 13 Apr 2006 13:38:52 -0400 + +mplayerplug-in (3.25-2) unstable; urgency=low + + * Fix a typo in the Depends, mplayer-nogui wasn't being accepted. + + -- Ari Pollak Thu, 13 Apr 2006 09:28:04 -0400 + +mplayerplug-in (3.25-1) unstable; urgency=low + + * New upstream release + * Re-add dependency on mozilla-browser (Closes: #354131) + * Change mplayer-* dependencies to mplayer | mplayer-nogui + + -- Ari Pollak Wed, 12 Apr 2006 15:55:26 -0400 + +mplayerplug-in (3.21-3) unstable; urgency=low + + * Apply patch from upstream author to fix playing with newer mplayer + CVS versions (Closes: #359914) + + -- Ari Pollak Thu, 30 Mar 2006 11:54:13 -0500 + +mplayerplug-in (3.21-2) unstable; urgency=low + + * Add konqueror, galeon, and epiphany-browser as possible depends + (Closes: 354131) + + -- Ari Pollak Wed, 1 Mar 2006 15:18:30 -0500 + +mplayerplug-in (3.21-1) unstable; urgency=low + + * New upstream release + + -- Ari Pollak Sun, 12 Feb 2006 18:24:00 -0500 + +mplayerplug-in (3.20-1) unstable; urgency=low + + * New upstream release + + -- Ari Pollak Fri, 3 Feb 2006 13:15:52 -0500 + +mplayerplug-in (3.17-1ubuntu1) dapper; urgency=low + + * Resynchronise with Debian (partial fix for #2697): + - debian/control: Build against firefox-dev; adjust Depends. + + -- Daniel T Chen Sun, 1 Jan 2006 00:32:37 -0800 + +mplayerplug-in (3.17-1) unstable; urgency=low + + * New upstream release + * Add watch file again, thanks James Vega for the hint (Closes: #341333) + + -- Ari Pollak Wed, 7 Dec 2005 21:21:08 -0500 + +mplayerplug-in (3.16-3) unstable; urgency=low + + * Add symlinks to /usr/lib/firefox/plugins since we now support + the new firefox package. (Closes: #342315) + + -- Ari Pollak Sun, 4 Dec 2005 22:35:55 -0500 + +mplayerplug-in (3.16-2) unstable; urgency=low + + * Add |ed dependency on firefox (Closes: #341994) + * Remove backup ~ files from /etc in package (Closes: #341359) + + -- Ari Pollak Sun, 4 Dec 2005 20:05:49 -0500 + +mplayerplug-in (3.16-1) unstable; urgency=low + + * New upstream release + - Should include Martin Samuelsson's fixes for Real streams + (Closes: #340507) + * Remove debian/watch file, uscan can't handle SourceForge links + + -- Ari Pollak Mon, 28 Nov 2005 16:20:17 -0500 + +mplayerplug-in (3.15-1) unstable; urgency=low + + * Rene no longer has time to maintain this package, so I'm adopting it. + Thanks for his work in maintaining previous versions. + * New upstream release (Closes: #332574) + - This should fix an annoying problem where navigating away from a page + with an embedded movie handled by mplayerplug-in would freeze + Mozilla/Firefox. + - This should fix the major crashing problem when moving away from + a page with an embedded movie (Closes: #326507, #256643) + * Added debian/watch file + + -- Ari Pollak Tue, 8 Nov 2005 10:09:25 -0500 + +mplayerplug-in (3.05-1ubuntu1) breezy; urgency=low + + * Sync with debian + * Build against gtk2 + * Adjusted Build-Depends / Depends for firefox + + -- Sebastian Dröge Fri, 16 Sep 2005 14:46:55 +0200 + +mplayerplug-in (3.05-1) unstable; urgency=low + + * New upstream release (closes: #321527) + - fixes ways how config files are read (closes: #321256) + + -- Rene Engelhard Sat, 6 Aug 2005 15:10:28 +0200 + +mplayerplug-in (3.01-1) unstable; urgency=low + + * New upstream release + - builds with g++-4.0 (closes: #297249) + * build with gtk2 UI (closes: #280060) + * fix de.po encoding (closes: #313968), thanks Jens Seidel + * description update + + -- Rene Engelhard Wed, 27 Jul 2005 21:09:15 +0200 + +mplayerplug-in (2.85-1) unstable; urgency=low + + * New upstream release + * Depend on the various mplayer flavours >= 1.0-pre5 + * fix LOCALEDIR + + -- Rene Engelhard Wed, 22 Jun 2005 20:12:51 +0200 + +mplayerplug-in (2.80-2) unstable; urgency=low + + * rebuilt without experimentals libgcc1, upload new source because of katie + bug... + + -- Rene Engelhard Sun, 1 May 2005 00:44:55 +0200 + +mplayerplug-in (2.80-1) unstable; urgency=low + + * New upstream release + + -- Rene Engelhard Thu, 10 Mar 2005 01:49:35 +0100 + +mplayerplug-in (2.75-1) unstable; urgency=low + + * New upstream release (closes: #287390) + * allow mplayer-amd64 (closes: #278185) + + -- Rene Engelhard Wed, 29 Dec 2004 18:27:49 +0100 + +mplayerplug-in (2.70-1) unstable; urgency=low + + * New upstream release + + -- Rene Engelhard Wed, 6 Oct 2004 22:29:48 +0200 + +mplayerplug-in (2.66-2) unstable; urgency=low + + * add -I/usr/include/mozilla to Makefile.in to fix build with newer + mozillas until mozillas pkg-config info file is fixed + + -- Rene Engelhard Sun, 18 Jul 2004 22:26:29 +0200 + +mplayerplug-in (2.66-1) unstable; urgency=low + + * New upstream release + * remove references to mozilla-snapshot and mozilla-firebird from + debian/control + + -- Rene Engelhard Sun, 20 Jun 2004 16:01:34 +0200 + +mplayerplug-in (2.65-1) unstable; urgency=low + + * New upstream release + - closes: #247094: mozilla-mplayer: Video stream unvisible due to big + blank rectangle display downloading + * install symlink for mozilla-firefox (closes: #251437) + + -- Rene Engelhard Fri, 18 Jun 2004 23:05:19 +0200 + +mplayerplug-in (2.60-1) unstable; urgency=low + + * New upstream release + + -- Rene Engelhard Thu, 22 Apr 2004 04:52:17 +0200 + +mplayerplug-in (2.50-1) unstable; urgency=low + + * New upstream release + * install mplayerplug-in.types + + -- Rene Engelhard Fri, 26 Mar 2004 17:10:36 +0100 + +mplayerplug-in (2.45-5) unstable; urgency=low + + * The "how the fuck did it build in this chroot?" release. + * we need pkg-config in Build-Depends: for the mozilla-stuff... + + -- Rene Engelhard Fri, 26 Mar 2004 04:35:59 +0100 + +mplayerplug-in (2.45-4) unstable; urgency=low + + * some programs wanting to use this plugin are not gtk(2), so + just use --enable-x; remove pkg-config and gtk builddeps; + will _probably_ create -x and -gtk2 packages or somesuch... + * Depends: [...] | mplayer-586 (>= 0.92) | [...] (closes: #239496) + * move config file to right location (closes: #238545) + + -- Rene Engelhard Fri, 26 Mar 2004 02:32:04 +0100 + +mplayerplug-in (2.45-3) unstable; urgency=low + + * Depends: [...] | mplayer-nogui (>= 0.92) (closes: #237259) + + -- Rene Engelhard Wed, 10 Mar 2004 19:54:45 +0100 + +mplayerplug-in (2.45-2) unstable; urgency=low + + * add pkg-config and libgtk2.0-dev to Build-Depends: + + -- Rene Engelhard Mon, 8 Mar 2004 22:10:08 +0100 + +mplayerplug-in (2.45-1) unstable; urgency=low + + * New upstream release + * Depend on (>= 0.92) of the mplayer-* packages + * fix clean + + -- Rene Engelhard Thu, 4 Mar 2004 06:50:04 +0100 + +mplayerplug-in (2.11-2) unstable; urgency=low + + * add mplayer-powerpc (>= 0.90) | mplayer-g4 (>= 0.90) + to Depends:, thanks Wolfram Quester (closes: #234945) + + -- Rene Engelhard Thu, 26 Feb 2004 22:01:01 +0100 + +mplayerplug-in (2.11-1) unstable; urgency=low + + * New upstream release (closes: #234083) + * rename binary package to mozilla-mplayer (closes: #234196, #233802) + * add mozilla-dev to Build-Depends:, Depend on mozilla-browser | + mozilla-browser-snapshot | mozilla-firebird | mozilla-firefox + * Replaces:/Conflicts:/Provides: mplayerplug-in + * fix thinko: s/common/custom/ in Depends:, thanks Robin Verduijn + again (closes: #233779) + + -- Rene Engelhard Wed, 25 Feb 2004 00:46:57 +0100 + +mplayerplug-in (1.2-2) unstable; urgency=low + + * Depend on mplayer-{custom,386,686,k6,k7} (>= 0.90) as alternatives + to mplayer (>= 0.90) (closes: #233779), thanks Robin Verduijn and + Roberto Pariset + + -- Rene Engelhard Fri, 20 Feb 2004 12:29:25 +0100 + +mplayerplug-in (1.2-1) unstable; urgency=low + + * Initial Release. + + -- Rene Engelhard Thu, 5 Feb 2004 00:59:26 +0100 + --- mplayerplug-in-3.25.orig/debian/compat +++ mplayerplug-in-3.25/debian/compat @@ -0,0 +1 @@ +4 --- mplayerplug-in-3.25.orig/debian/control +++ mplayerplug-in-3.25/debian/control @@ -0,0 +1,16 @@ +Source: mplayerplug-in +Section: contrib/misc +Priority: optional +Maintainer: Ari Pollak +Build-Depends: debhelper (>= 4.1.0), cdbs, libx11-dev, libxpm-dev, libice-dev, libxt-dev, mozilla-dev, pkg-config, libgtk2.0-dev +Standards-Version: 3.6.1 + +Package: mozilla-mplayer +Architecture: any +Depends: ${shlibs:Depends}, firefox | mozilla-browser | galeon | epiphany-browser | konqueror, ${misc:Depends}, mplayer (>= 1.0-pre5) | mplayer-nogui (>= 1.0-pre5) | mplayer-powerpc (>= 1.0-pre5) | mplayer-g4 (>= 1.0-pre5) +Conflicts: mplayerplug-in +Provides: mplayerplug-in +Replaces: mplayerplug-in +Description: MPlayer-Plugin for Mozilla + mplayerplug-in is a Mozilla browser plugin to allow playing embedded + movies on web pages using mplayer. --- mplayerplug-in-3.25.orig/debian/copyright +++ mplayerplug-in-3.25/debian/copyright @@ -0,0 +1,11 @@ +This package was debianized by Rene Engelhard on +Thu, 5 Feb 2004 00:59:26 +0100. + +It was downloaded from http://mplayerplug-in.sf.net + +Upstream Author: Kevin DeKorte + +Copyright: + +GPL, in Debian systems the full text of the GPL could be found under +/usr/share/common-licenses/GPL --- mplayerplug-in-3.25.orig/debian/docs +++ mplayerplug-in-3.25/debian/docs @@ -0,0 +1,2 @@ +README +TODO --- mplayerplug-in-3.25.orig/debian/mozilla-mplayer.links +++ mplayerplug-in-3.25/debian/mozilla-mplayer.links @@ -0,0 +1,10 @@ +usr/lib/mozilla/plugins/mplayerplug-in.so usr/lib/firefox/plugins/mplayerplug-in.so +usr/lib/mozilla/plugins/mplayerplug-in.xpt usr/lib/firefox/plugins/mplayerplug-in.xpt +usr/lib/mozilla/plugins/mplayerplug-in-wmp.so usr/lib/firefox/plugins/mplayerplug-in-wmp.so +usr/lib/mozilla/plugins/mplayerplug-in-wmp.xpt usr/lib/firefox/plugins/mplayerplug-in-wmp.xpt +usr/lib/mozilla/plugins/mplayerplug-in-qt.so usr/lib/firefox/plugins/mplayerplug-in-qt.so +usr/lib/mozilla/plugins/mplayerplug-in-qt.xpt usr/lib/firefox/plugins/mplayerplug-in-qt.xpt +usr/lib/mozilla/plugins/mplayerplug-in-rm.so usr/lib/firefox/plugins/mplayerplug-in-rm.so +usr/lib/mozilla/plugins/mplayerplug-in-rm.xpt usr/lib/firefox/plugins/mplayerplug-in-rm.xpt +usr/lib/mozilla/plugins/mplayerplug-in-gmp.so usr/lib/firefox/plugins/mplayerplug-in-gmp.so +usr/lib/mozilla/plugins/mplayerplug-in-gmp.xpt usr/lib/firefox/plugins/mplayerplug-in-gmp.xpt --- mplayerplug-in-3.25.orig/debian/rules +++ mplayerplug-in-3.25/debian/rules @@ -0,0 +1,28 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/class/autotools-vars.mk + +export LOCALEDIR=debian/mozilla-mplayer/usr/share/locale + +#DEB_CONFIGURE_EXTRA_FLAGS := --with-gecko-sdk=/usr + +DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/mozilla-mplayer LOCALEDIR=/usr/share/locale &&\ + mkdir -p debian/mozilla-mplayer/etc && \ + install -m644 mplayerplug-in.conf debian/mozilla-mplayer/etc/mplayerplug-in.conf && \ + install -m644 mplayerplug-in.types debian/mozilla-mplayer/etc/mplayerplug-in.types + +binary-post-install/mozilla-mplayer:: + rm -f debian/mozilla-mplayer/etc/*~ + chmod ugo-x debian/mozilla-mplayer/usr/lib/mozilla/plugins/*.xpt + if [ ! -s debian/mozilla-mplayer/usr/share/doc/mozilla-mplayer/TODO ]; \ + then \ + rm debian/mozilla-mplayer/usr/share/doc/mozilla-mplayer/TODO; \ + fi + +clean:: + rm -f *.o *.so po/*.mo + rm -f config.log config.status config.h Makefile + rm -f mplayerplug-in*.xpt --- mplayerplug-in-3.25.orig/debian/watch +++ mplayerplug-in-3.25/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://sf.net/mplayerplug-in/mplayerplug-in-(\d+\.\d+)\.tar\.gz --- mplayerplug-in-3.25.orig/install.sh +++ mplayerplug-in-3.25/install.sh @@ -2,7 +2,7 @@ SHAREDTARGET=mplayerplug-in INSTALL='/usr/bin/install -c' -prefix=/usr +prefix=/usr/local exec_prefix=${prefix} sysconfdir=${prefix}/etc libdir=${exec_prefix}/lib --- mplayerplug-in-3.25.orig/po/Makefile.in +++ mplayerplug-in-3.25/po/Makefile.in @@ -29,7 +29,7 @@ done clean: - rm -f core core.* *.old.po *.mo *.pot sjiscorr + rm -f core core.* *.old.po *.mo *.pot sjiscorr Makefile distclean: clean