diff options
| author | Eric Anholt <eric@anholt.net> | 2007-10-02 12:14:04 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-10-02 12:14:04 -0700 |
| commit | 439edc768eea17667846ce573c843b8377e0dfb4 (patch) | |
| tree | 43035b9d083124d8945048f0103fbe578b9a01a1 /configure.ac | |
| parent | c8ccf469dcb2d7609b23faa8b4999c436263051e (diff) | |
| parent | 93ae6fe18c417a22f1fccb22add4890a20cae713 (diff) | |
Merge branch 'glyph-pixmaps'
Conflicts:
configure.ac
exa/exa_render.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index a5f18668f..d7c513e18 100644 --- a/configure.ac +++ b/configure.ac @@ -631,7 +631,7 @@ else fi REQUIRED_MODULES="[randrproto >= 1.2] $RENDERPROTO [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] xtrans [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.2] [kbproto >= 1.0.3]" -REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.9.5]" +REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.9.5] openssl" dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config |