diff options
Diffstat (limited to 'multimedia/xine-lib/patches/patch-ag')
| -rw-r--r-- | multimedia/xine-lib/patches/patch-ag | 193 |
1 files changed, 52 insertions, 141 deletions
diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag index aa144571835..54bdf8d1d0a 100644 --- a/multimedia/xine-lib/patches/patch-ag +++ b/multimedia/xine-lib/patches/patch-ag @@ -1,145 +1,56 @@ -$NetBSD: patch-ag,v 1.2 2004/03/11 17:26:02 jmmv Exp $ +$NetBSD: patch-ag,v 1.3 2004/03/28 20:14:22 mycroft Exp $ ---- configure.orig 2003-12-28 16:25:26.000000000 +0100 -+++ configure -@@ -463,7 +463,7 @@ ac_includes_default="\ - # include <unistd.h> - #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 XINE_MAJOR XINE_MINOR XINE_SUB XINE_IFACE_AGE XINE_BIN_AGE LT_CURRENT LT_REVISION LT_AGE TAR_NAME SPEC_VERSION LIBNAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP LN_S CCAS CCASFLAGS CCASCOMPILE ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS STATIC ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX INCLUDED_INTL_TRUE INCLUDED_INTL_FALSE DEBUG_CFLAGS ASFLAGS THREAD_LIBS THREAD_CFLAGS DYNAMIC_LD_LIBS LIBMPEG2_CFLAGS LIBFFMPEG_CFLAGS HAVE_MLIB_TRUE HAVE_MLIB_FALSE MLIB_LIBS MLIB_CFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAVE_X11_TRUE HAVE_X11_FALSE NET_LIBS HAVE_ZLIB_TRUE HAVE_ZLIB_FALSE ZLIB_LIBS OPENGL_LIBS GLUT_LIBS GLU_LIBS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE HAVE_V4L_TRUE HAVE_V4L_FALSE GICONV_BSD_LIBS HAVE_GICONV_TRUE HAVE_GICONV_FALSE PPC_ARCH_TRUE PPC_ARCH_FALSE HAVE_XV_TRUE HAVE_XV_FALSE HAVE_XV_STATIC_TRUE HAVE_XV_STATIC_FALSE XV_LIB EXTRA_X_LIBS EXTRA_X_CFLAGS HAVE_XVMC_TRUE HAVE_XVMC_FALSE HAVE_XVMC_STATIC_TRUE HAVE_XVMC_STATIC_FALSE XVMC_LIB HAVE_XINERAMA_TRUE HAVE_XINERAMA_FALSE AALIB_CONFIG AAINFO AALIB_CFLAGS AALIB_LIBS HAVE_AA_TRUE HAVE_AA_FALSE HAVE_SUNFB_TRUE HAVE_SUNFB_FALSE HAVE_FB_TRUE HAVE_FB_FALSE PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS HAVE_DIRECTFB_TRUE HAVE_DIRECTFB_FALSE SDL_CONFIG SDL_CFLAGS SDL_LIBS HAVE_SDL_TRUE HAVE_SDL_FALSE LIBSTK_CFLAGS LIBSTK_LIBS HAVE_STK_TRUE HAVE_STK_FALSE LIBFAME_CONFIG LIBFAME_CFLAGS LIBFAME_LIBS HAVE_DXR3_TRUE HAVE_DXR3_FALSE HAVE_LIBFAME_TRUE HAVE_LIBFAME_FALSE HAVE_LIBRTE_TRUE HAVE_LIBRTE_FALSE HAVE_ENCODER_TRUE HAVE_ENCODER_FALSE LINUX_INCLUDE HAVE_VIDIX_TRUE HAVE_VIDIX_FALSE HAVE_LINUX_TRUE HAVE_LINUX_FALSE BUILD_DHA_KMOD_TRUE BUILD_DHA_KMOD_FALSE MKNOD DEPMOD VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS OGG_CFLAGS OGG_LIBS HAVE_VORBIS_TRUE HAVE_VORBIS_FALSE THEORA_CFLAGS THEORA_LIBS THEORAFILE_LIBS THEORAENC_LIBS HAVE_THEORA_TRUE HAVE_THEORA_FALSE SPEEX_CFLAGS SPEEX_LIBS HAVE_SPEEX_TRUE HAVE_SPEEX_FALSE LIBFLAC_CFLAGS LIBFLAC_LIBS HAVE_FLAC_TRUE HAVE_FLAC_FALSE HAVE_LIBMNG_TRUE HAVE_LIBMNG_FALSE MNG_LIBS LIBPNG_CONFIG HAVE_LIBPNG_TRUE HAVE_LIBPNG_FALSE PNG_CFLAGS PNG_LIBS FREETYPE_CONFIG HAVE_FT2_TRUE HAVE_FT2_FALSE FT2_CFLAGS FT2_LIBS HAVE_OSS_TRUE HAVE_OSS_FALSE ALSA_CFLAGS ALSA_STATIC_LIB ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE HAVE_ALSA09_TRUE HAVE_ALSA09_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS HAVE_ESD_TRUE HAVE_ESD_FALSE ARTS_CONFIG ARTS_CFLAGS ARTS_LIBS HAVE_ARTS_TRUE HAVE_ARTS_FALSE GNOME_VFS_CFLAGS GNOME_VFS_LIBS HAVE_GNOME_VFS_TRUE HAVE_GNOME_VFS_FALSE HAVE_SUNAUDIO_TRUE HAVE_SUNAUDIO_FALSE IRIXAL_CFLAGS IRIXAL_STATIC_LIB IRIXAL_LIBS HAVE_IRIXAL_TRUE HAVE_IRIXAL_FALSE KSTAT_LIBS HAVE_CDROM_IOCTLS_TRUE HAVE_CDROM_IOCTLS_FALSE DVDNAV_CONFIG DVDNAV_CFLAGS DVDNAV_LIBS HAVE_DVDNAV_TRUE HAVE_DVDNAV_FALSE LINUX_CDROM_TIMEOUT HAVE_BSDI_CDROM HAVE_DARWIN_CDROM HAVE_FREEBSD_CDROM HAVE_LINUX_CDROM HAVE_SOLARIS_CDROM HAVE_WIN32_CDROM LIBVCD_SYSDEP LIBCDIO_CFLAGS LIBCDIO_LIBS LIBISO9660_LIBS LIBVCD_CFLAGS LIBVCD_LIBS LIBVCDINFO_LIBS HAVE_VCDNAV_TRUE HAVE_VCDNAV_FALSE ENABLE_VCD_TRUE ENABLE_VCD_FALSE BUILD_ASF_TRUE BUILD_ASF_FALSE BUILD_FAAD_TRUE BUILD_FAAD_FALSE XINE_PLUGIN_MIN_SYMS W32_NO_OPTIMIZE PASS1_CFLAGS PASS2_CFLAGS HAVE_W32DLL_TRUE HAVE_W32DLL_FALSE W32DLL_DEP HAVE_FFMMX_TRUE HAVE_FFMMX_FALSE HAVE_ARMV4L_TRUE HAVE_ARMV4L_FALSE XINE_PLUGINPATH XINE_FONTPATH XINE_LOCALEPATH XINE_PLUGINDIR XINE_FONTDIR XINE_LOCALEDIR XINE_ACFLAGS XINE_DATADIR XINE_SCRIPTPATH XINE_BUILD_CC XINE_BUILD_OS XINE_BUILD_DATE w32_path INCLUDES ACLOCAL_DIR INSTALL_M4_TRUE INSTALL_M4_FALSE DEPCOMP SGMLTOOLS FIG2DEV LIBOBJS 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 XINE_MAJOR XINE_MINOR XINE_SUB XINE_IFACE_AGE XINE_BIN_AGE LT_CURRENT LT_REVISION LT_AGE TAR_NAME SPEC_VERSION LIBNAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP LN_S CCAS CCASFLAGS CCASCOMPILE ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS STATIC ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX INCLUDED_INTL_TRUE INCLUDED_INTL_FALSE DEBUG_CFLAGS ASFLAGS THREAD_LIBS THREAD_CFLAGS DYNAMIC_LD_LIBS LIBMPEG2_CFLAGS LIBFFMPEG_CFLAGS HAVE_MLIB_TRUE HAVE_MLIB_FALSE MLIB_LIBS MLIB_CFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAVE_X11_TRUE HAVE_X11_FALSE NET_LIBS WINE_LIBS HAVE_ZLIB_TRUE HAVE_ZLIB_FALSE ZLIB_LIBS OPENGL_LIBS GLUT_LIBS GLU_LIBS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE HAVE_V4L_TRUE HAVE_V4L_FALSE GICONV_BSD_LIBS HAVE_GICONV_TRUE HAVE_GICONV_FALSE PPC_ARCH_TRUE PPC_ARCH_FALSE HAVE_XV_TRUE HAVE_XV_FALSE HAVE_XV_STATIC_TRUE HAVE_XV_STATIC_FALSE XV_LIB EXTRA_X_LIBS EXTRA_X_CFLAGS HAVE_XVMC_TRUE HAVE_XVMC_FALSE HAVE_XVMC_STATIC_TRUE HAVE_XVMC_STATIC_FALSE XVMC_LIB HAVE_XINERAMA_TRUE HAVE_XINERAMA_FALSE AALIB_CONFIG AAINFO AALIB_CFLAGS AALIB_LIBS HAVE_AA_TRUE HAVE_AA_FALSE HAVE_SUNFB_TRUE HAVE_SUNFB_FALSE HAVE_FB_TRUE HAVE_FB_FALSE PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS HAVE_DIRECTFB_TRUE HAVE_DIRECTFB_FALSE SDL_CONFIG SDL_CFLAGS SDL_LIBS HAVE_SDL_TRUE HAVE_SDL_FALSE LIBSTK_CFLAGS LIBSTK_LIBS HAVE_STK_TRUE HAVE_STK_FALSE LIBFAME_CONFIG LIBFAME_CFLAGS LIBFAME_LIBS HAVE_DXR3_TRUE HAVE_DXR3_FALSE HAVE_LIBFAME_TRUE HAVE_LIBFAME_FALSE HAVE_LIBRTE_TRUE HAVE_LIBRTE_FALSE HAVE_ENCODER_TRUE HAVE_ENCODER_FALSE LINUX_INCLUDE HAVE_VIDIX_TRUE HAVE_VIDIX_FALSE HAVE_LINUX_TRUE HAVE_LINUX_FALSE BUILD_DHA_KMOD_TRUE BUILD_DHA_KMOD_FALSE MKNOD DEPMOD VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS OGG_CFLAGS OGG_LIBS HAVE_VORBIS_TRUE HAVE_VORBIS_FALSE THEORA_CFLAGS THEORA_LIBS THEORAFILE_LIBS THEORAENC_LIBS HAVE_THEORA_TRUE HAVE_THEORA_FALSE SPEEX_CFLAGS SPEEX_LIBS HAVE_SPEEX_TRUE HAVE_SPEEX_FALSE LIBFLAC_CFLAGS LIBFLAC_LIBS HAVE_FLAC_TRUE HAVE_FLAC_FALSE HAVE_LIBMNG_TRUE HAVE_LIBMNG_FALSE MNG_LIBS LIBPNG_CONFIG HAVE_LIBPNG_TRUE HAVE_LIBPNG_FALSE PNG_CFLAGS PNG_LIBS FREETYPE_CONFIG HAVE_FT2_TRUE HAVE_FT2_FALSE FT2_CFLAGS FT2_LIBS HAVE_OSS_TRUE HAVE_OSS_FALSE ALSA_CFLAGS ALSA_STATIC_LIB ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE HAVE_ALSA09_TRUE HAVE_ALSA09_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS HAVE_ESD_TRUE HAVE_ESD_FALSE ARTS_CONFIG ARTS_CFLAGS ARTS_LIBS HAVE_ARTS_TRUE HAVE_ARTS_FALSE GNOME_VFS_CFLAGS GNOME_VFS_LIBS HAVE_GNOME_VFS_TRUE HAVE_GNOME_VFS_FALSE HAVE_SUNAUDIO_TRUE HAVE_SUNAUDIO_FALSE IRIXAL_CFLAGS IRIXAL_STATIC_LIB IRIXAL_LIBS HAVE_IRIXAL_TRUE HAVE_IRIXAL_FALSE KSTAT_LIBS HAVE_CDROM_IOCTLS_TRUE HAVE_CDROM_IOCTLS_FALSE DVDNAV_CONFIG DVDNAV_CFLAGS DVDNAV_LIBS HAVE_DVDNAV_TRUE HAVE_DVDNAV_FALSE LINUX_CDROM_TIMEOUT HAVE_BSDI_CDROM HAVE_DARWIN_CDROM HAVE_FREEBSD_CDROM HAVE_LINUX_CDROM HAVE_SOLARIS_CDROM HAVE_WIN32_CDROM LIBVCD_SYSDEP LIBCDIO_CFLAGS LIBCDIO_LIBS LIBISO9660_LIBS LIBVCD_CFLAGS LIBVCD_LIBS LIBVCDINFO_LIBS HAVE_VCDNAV_TRUE HAVE_VCDNAV_FALSE ENABLE_VCD_TRUE ENABLE_VCD_FALSE BUILD_ASF_TRUE BUILD_ASF_FALSE BUILD_FAAD_TRUE BUILD_FAAD_FALSE XINE_PLUGIN_MIN_SYMS W32_NO_OPTIMIZE PASS1_CFLAGS PASS2_CFLAGS HAVE_W32DLL_TRUE HAVE_W32DLL_FALSE W32DLL_DEP HAVE_FFMMX_TRUE HAVE_FFMMX_FALSE HAVE_ARMV4L_TRUE HAVE_ARMV4L_FALSE XINE_PLUGINPATH XINE_FONTPATH XINE_LOCALEPATH XINE_PLUGINDIR XINE_FONTDIR XINE_LOCALEDIR XINE_ACFLAGS XINE_DATADIR XINE_SCRIPTPATH XINE_BUILD_CC XINE_BUILD_OS XINE_BUILD_DATE w32_path INCLUDES ACLOCAL_DIR INSTALL_M4_TRUE INSTALL_M4_FALSE DEPCOMP SGMLTOOLS FIG2DEV LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -2980,6 +2980,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ -+ '#include <stdlib.h>' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ -@@ -3844,6 +3845,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ -+ '#include <stdlib.h>' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ -@@ -26427,6 +26429,64 @@ fi - - +--- configure.ac.orig 2004-03-16 21:44:17.000000000 +0000 ++++ configure.ac 2004-03-28 02:13:31.000000000 +0000 +@@ -347,6 +347,9 @@ + AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",) + AC_SUBST(NET_LIBS) +WINE_LIBS="" -+echo "$as_me:$LINENO: checking for i386_set_ldt in -li386" >&5 -+echo $ECHO_N "checking for i386_set_ldt in -li386... $ECHO_C" >&6 -+if test "${ac_cv_lib_i386_i386_set_ldt+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-li386 $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#line $LINENO "configure" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char i386_set_ldt (); -+int -+main () -+{ -+i386_set_ldt (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 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 -+ ac_cv_lib_i386_i386_set_ldt=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_i386_i386_set_ldt=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_i386_i386_set_ldt" >&5 -+echo "${ECHO_T}$ac_cv_lib_i386_i386_set_ldt" >&6 -+if test $ac_cv_lib_i386_i386_set_ldt = yes; then -+ WINE_LIBS="-li386 $WINE_LIBS" -+fi -+ - echo "$as_me:$LINENO: checking for gzsetparams in -lz" >&5 - echo $ECHO_N "checking for gzsetparams in -lz... $ECHO_C" >&6 - if test "${ac_cv_lib_z_gzsetparams+set}" = set; then -@@ -26727,7 +26787,7 @@ if test "${ac_cv_lib_GL_glBegin+set}" = - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lGL $X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS $LIBS" -+LIBS="-lGL $X_LIBS $X_PRE_LIBS -lGL -lm $X_EXTRA_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -26923,7 +26983,7 @@ echo "${ECHO_T}$ac_cv_header_GL_gl_h" >& - fi - if test $ac_cv_header_GL_gl_h = yes; then - ac_have_opengl="yes" -- OPENGL_LIBS="-lGL" -+ OPENGL_LIBS="-lGL -lm" - echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5 - echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6 - if test "${ac_cv_lib_glut_glutInit+set}" = set; then -@@ -27805,7 +27865,6 @@ fi - echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 - echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6 - if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then -- X_LIBS="$X_LIBS -lXinerama" - - cat >>confdefs.h <<\_ACEOF - #define HAVE_XINERAMA 1 -@@ -33140,6 +33199,7 @@ fi - - - -+if false; then - succeeded=no - - if test -z "$PKG_CONFIG"; then -@@ -33234,6 +33294,8 @@ echo "${ECHO_T}$GNOME_VFS_LIBS" >&6 - else - no_gnome_vfs=yes - fi -+fi ++AC_CHECK_LIB(i386, i386_set_ldt, WINE_LIBS="-li386 $WINE_LIBS",) ++AC_SUBST(WINE_LIBS) + + dnl --------------------------------------------- + dnl IPv6 +@@ -385,7 +388,7 @@ + AC_CHECK_LIB(GL, glBegin, + [AC_CHECK_HEADER(GL/gl.h, + [ ac_have_opengl="yes" +- OPENGL_LIBS="-lGL" ++ OPENGL_LIBS="-lGL -lm" + AC_CHECK_LIB(glut, glutInit, dnl check for glut + [ ac_have_glut="yes" + GLUT_LIBS="-lglut" +@@ -403,7 +406,7 @@ + ], + [])], + [], +- [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS]) ++ [$X_LIBS $X_PRE_LIBS -lGL -lm $X_EXTRA_LIBS]) + AC_SUBST(OPENGL_LIBS) + AC_SUBST(GLUT_LIBS) + AC_SUBST(GLU_LIBS) +@@ -580,8 +583,7 @@ + dnl --------------------------------------------- + + AC_CHECK_LIB(Xinerama, XineramaQueryExtension, +- [X_LIBS="$X_LIBS -lXinerama" +- AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) ++ [AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) + ac_have_xinerama="yes"],, + [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS]) + dnl AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes") +@@ -993,9 +995,10 @@ + dnl gnome-vfs support + dnl --------------------------------------------- + +-PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, +- no_gnome_vfs=no, +- no_gnome_vfs=yes) ++dnl PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, ++dnl no_gnome_vfs=no, ++dnl no_gnome_vfs=yes) +no_gnome_vfs=yes - - - -@@ -40710,6 +40772,7 @@ s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t - s,@HAVE_X11_TRUE@,$HAVE_X11_TRUE,;t t - s,@HAVE_X11_FALSE@,$HAVE_X11_FALSE,;t t - s,@NET_LIBS@,$NET_LIBS,;t t -+s,@WINE_LIBS@,$WINE_LIBS,;t t - s,@HAVE_ZLIB_TRUE@,$HAVE_ZLIB_TRUE,;t t - s,@HAVE_ZLIB_FALSE@,$HAVE_ZLIB_FALSE,;t t - s,@ZLIB_LIBS@,$ZLIB_LIBS,;t t + AC_SUBST(GNOME_VFS_CFLAGS) + AC_SUBST(GNOME_VFS_LIBS) + if test x"$no_gnome_vfs" != "xyes"; then |