head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.52
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.50
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.48
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.46
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.44
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.42
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.40
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.38
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.36
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.34
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.32
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.30
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.28
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.26
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.24
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.22
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.20
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.18
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.16
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.14
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.12
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.10
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.8
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.6
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.4
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.3.0.2
	pkgsrc-2004Q1-base:1.3
	pkgsrc-2003Q4:1.2.0.2
	pkgsrc-2003Q4-base:1.2;
locks; strict;
comment	@# @;


1.3
date	2004.01.26.13.06.14;	author jmmv;	state dead;
branches;
next	1.2;

1.2
date	2003.10.05.09.27.13;	author mycroft;	state Exp;
branches;
next	1.1;

1.1
date	2003.10.02.14.20.35;	author mycroft;	state Exp;
branches;
next	;


desc
@@


1.3
log
@xine-lib and xine-ui moved to the multimedia category.
@
text
@$NetBSD: disabled-patch-aa,v 1.2 2003/10/05 09:27:13 mycroft Exp $

--- configure.ac.orig	2003-08-02 11:45:26.000000000 +0000
+++ configure.ac	2003-10-05 09:10:13.000000000 +0000
@@@@ -301,6 +301,9 @@@@
 AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
 AC_SUBST(NET_LIBS)
 
+WINE_LIBS=""
+AC_CHECK_LIB(i386, i386_set_ldt, WINE_LIBS="-li386 $WINE_LIBS",)
+AC_SUBST(WINE_LIBS)
 
 dnl ---------------------------------------------
 dnl zlib
@@@@ -330,7 +333,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"
@@@@ -348,7 +351,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)
@@@@ -456,8 +459,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])
 AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes")
@@@@ -761,9 +763,10 @@@@
 dnl ---------------------------------------------
 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
 AC_SUBST(GNOME_VFS_CFLAGS)
 AC_SUBST(GNOME_VFS_LIBS)
 if test x"$no_gnome_vfs" != "xyes"; then
@


1.2
log
@Be more selective about linking things with -lXinerama -- only the DXR3 module
actually uses it.
@
text
@d1 1
a1 1
$NetBSD: disabled-patch-aa,v 1.1 2003/10/02 14:20:35 mycroft Exp $
@


1.1
log
@Link libwine with -li386 so that it gets i386_set_ldt() defined.

XXX I updated configure.ac, but I can't actually patch that without running
into severe automake lossage, so that patch is not named patch-?? right now.
@
text
@d1 1
a1 1
$NetBSD$
d4 1
a4 1
+++ configure.ac	2003-10-02 13:03:11.000000000 +0000
d33 11
a43 1
@@@@ -761,9 +764,10 @@@@
@