summaryrefslogtreecommitdiff
path: root/sysutils/consolekit/patches/patch-aa
blob: 2e8cbc0433b6692a5df85d55a7f539259df2c1e2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
$NetBSD: patch-aa,v 1.3 2008/12/23 21:46:14 jmcneill Exp $

--- configure.ac.orig	2008-07-30 20:35:53.000000000 -0400
+++ configure.ac	2008-12-23 16:40:06.000000000 -0500
@@ -68,10 +68,21 @@
 PKG_CHECK_MODULES(LIBDBUS,
   dbus-1 >= $DBUS_REQUIRED_VERSION
 )
+PKG_CHECK_MODULES(X11, x11 >= $X11_REQUIRED_VERSION, [HAVE_X11=yes], [HAVE_X11=no])
+if test x$HAVE_X11 = xno; then
+  AC_PATH_XTRA
+  if test "x$no_x" = xyes; then
+    AC_MSG_ERROR(X11 and Xrandr development libraries not found);
+  else
+    XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+    XLIB_CFLAGS=$X_CFLAGS
+  fi
+fi
 PKG_CHECK_MODULES(TOOLS,
-  x11 >= $X11_REQUIRED_VERSION
   glib-2.0 >= $GLIB_REQUIRED_VERSION
 )
+TOOLS_CFLAGS="$TOOLS_CFLAGS $X11_CFLAGS $XLIB_CFLAGS"
+TOOLS_LIBS="$TOOLS_LIBS $X11_LIBS $XLIB_LIBS"
 
 PKG_CHECK_MODULES(HISTORY,
   glib-2.0 >= $GLIB_REQUIRED_VERSION
@@ -190,12 +201,20 @@
         *-*-solaris*)
         CK_BACKEND="solaris"
         ;;
+        *-*-netbsd*)
+        CK_BACKEND="netbsd"
+        ;;
+        *-*-dragonfly*)
+        CK_BACKEND="freebsd"
+        KVM_LIBS="-lkvm"
+        ;;
 esac
 
 AC_SUBST(KVM_LIBS)
 
 AM_CONDITIONAL(CK_COMPILE_LINUX, test x$CK_BACKEND = xlinux, [Compiling for Linux])
 AM_CONDITIONAL(CK_COMPILE_FREEBSD, test x$CK_BACKEND = xfreebsd, [Compiling for FreeBSD])
+AM_CONDITIONAL(CK_COMPILE_NETBSD, test x$CK_BACKEND = xnetbsd, [Compiling for NetBSD])
 AM_CONDITIONAL(CK_COMPILE_SOLARIS, test x$CK_BACKEND = xsolaris, [Compiling for Solaris])
 AC_SUBST(CK_BACKEND)
 
@@ -441,4 +460,4 @@
    echo "         a huge SECURITY HOLE. I repeat: YOU NEED TO EDIT THE FILE"
    echo "         ConsoleKit.conf to match your distro/site to avoid NASTY SECURITY HOLES."
    echo ""
-fi
\ No newline at end of file
+fi