← Back to branch summary

~ricotz/plank/wayland

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Rico Tzschichholz
  • Date: 2016-02-15 20:11:24 UTC
  • Revision ID: ricotz@ubuntu.com-20160215201124-j166ucft9q4dk7pw
build: Drop support for gee-1.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
124
124
                 gdk-x11-3.0 >= $GTK_MIN_VERSION \
125
125
                 gdk-pixbuf-2.0 >= $GDK_PIXBUF_MIN_VERSION \
126
126
                 cairo >= $CAIRO_MIN_VERSION \
 
127
                 gee-0.8 \
127
128
                 libbamf3 >= $BAMF_MIN_VERSION \
128
129
                 libwnck-3.0 \
129
130
                 x11"
135
136
                      --pkg gdk-x11-3.0 \
136
137
                      --pkg gdk-pixbuf-2.0 \
137
138
                      --pkg cairo \
 
139
                      --pkg gee-0.8 \
138
140
                      --pkg libbamf3 \
139
141
                      --pkg libwnck-3.0 \
140
142
                      --pkg posix \
211
213
fi
212
214
AM_CONDITIONAL([HAVE_BAMF_0_4], [test "x$enable_bamf_0_4" = "xyes"])
213
215
 
214
 
# Check for gee-0.8 and prefer to use it, no automatic fallback to gee-1.0 (0.6)
215
 
AC_ARG_ENABLE([gee-0.8],
216
 
              AS_HELP_STRING([--enable-gee-0.8],
217
 
                             [Enable use of gee-0.8 instead of gee-1.0]),
218
 
              [enable_gee_0_8=$enableval],
219
 
              [enable_gee_0_8=yes])
220
 
if test "x$enable_gee_0_8" = "xyes" ; then
221
 
    GEE_DEPEND=gee-0.8
222
 
    PLANK_CORE_PKGS="$PLANK_CORE_PKGS gee-0.8"
223
 
    PLANK_CORE_VALA_PKGS="$PLANK_CORE_VALA_PKGS --pkg gee-0.8"
224
 
    VALAFLAGS="$VALAFLAGS --define HAVE_GEE_0_8"
225
 
else
226
 
    GEE_DEPEND=gee-1.0
227
 
    PLANK_CORE_PKGS="$PLANK_CORE_PKGS gee-1.0"
228
 
    PLANK_CORE_VALA_PKGS="$PLANK_CORE_VALA_PKGS --pkg gee-1.0"
229
 
fi
230
 
AM_CONDITIONAL([HAVE_GEE_0_8], [test "x$enable_gee_0_8" = "xyes"])
231
 
AC_SUBST(GEE_DEPEND)
232
 
 
233
216
# Support barrier-supported unhiding using Xinput 2.3
234
217
XFIXES_MIN_VERSION=5.0
235
218
XINPUT_MIN_VERSION=1.6.99.1
397
380
data/icons/Makefile
398
381
data/themes/Makefile
399
382
lib/Makefile
400
 
lib/plank.deps
401
383
lib/plank.pc
402
384
lib/Version.vala
403
385
src/Makefile
423
405
    Vala Flags..................:  ${VALAFLAGS}
424
406
    C Compiler Flags............:  ${CFLAGS}
425
407
 
426
 
    Use gee-0.8.................:  ${enable_gee_0_8}
427
408
    Dbusmenu support............:  ${enable_dbusmenu}
428
409
    HiDPI support...............:  ${enable_hidpi}
429
410
    XInput Barriers support.....:  ${enable_barriers}