← Back to branch summary

~ubuntu-branches/ubuntu/trusty/plymouth/trusty-proposed

« back to all changes in this revision

Viewing changes to .pc/vga16fb-renderer.patch/configure.ac

  • Committer: Dmitrijs Ledkovs
  • Date: 2012-11-22 13:26:28 UTC
  • mfrom: (1016.2.4)
  • Revision ID: dmitrijs.ledkovs@canonical.com-20121122132628-0f8y3xhxb7aey5ns
* New upstream release:
  - drop, applied upstream upstream-add-generic-driver-to-drm-renderer-plugin.patch
  - drop, applied upstream invalid-event-source-workaround.patch
  - drop, raring has recent enough drm update-libdrm-nouveau-library-dependency.patch
  - rebase tty1-after-boot.patch
  - rebase misc-changes.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/vga16fb-renderer.patch/configure.ac
1
 
AC_INIT([plymouth],[0.8.4],[https://bugs.freedesktop.org/enter_bug.cgi?product=plymouth])
 
1
AC_INIT([plymouth],[0.8.8],[https://bugs.freedesktop.org/enter_bug.cgi?product=plymouth])
2
2
AC_CONFIG_SRCDIR(src/main.c)
3
3
AC_CONFIG_HEADER(config.h)
4
4
AC_CONFIG_AUX_DIR(build-tools)
5
5
 
6
6
AC_USE_SYSTEM_EXTENSIONS
 
7
AC_SYS_LARGEFILE
7
8
AC_PROG_AWK
8
9
AC_PROG_CC
9
10
AM_PROG_CC_C_O
18
19
LT_INIT
19
20
 
20
21
## increment if the interface has additions, changes, removals.
21
 
LT_CURRENT=2
 
22
LT_CURRENT=3
22
23
 
23
24
## increment any time the source changes; set to
24
25
##  0 if you increment CURRENT
27
28
## increment if any interfaces have been added; set to 0
28
29
## if any interfaces have been changed or removed. removal has
29
30
## precedence over adding, so set to 0 if both happened.
30
 
LT_AGE=0
 
31
LT_AGE=1
31
32
 
32
33
AC_SUBST(LT_CURRENT)
33
34
AC_SUBST(LT_REVISION)
52
53
  AC_SUBST(PANGO_LIBS)
53
54
fi
54
55
 
55
 
PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.12.0 ])
56
 
AC_SUBST(GTK_CFLAGS)
57
 
AC_SUBST(GTK_LIBS)
58
 
 
59
 
AC_ARG_ENABLE(libdrm_intel, AS_HELP_STRING([--enable-libdrm_intel],[enable building with libdrm_intel support]),enable_libdrm_intel=$enableval,enable_libdrm_intel=yes)
 
56
AC_ARG_ENABLE(gtk, AS_HELP_STRING([--enable-gtk],[enable building with gtk, disabled there is no log viewer or x11 redenderer]),enable_gtk=$enableval,enable_gtk=yes)
 
57
AM_CONDITIONAL(ENABLE_GTK,  [test "$enable_gtk" = yes])
 
58
 
 
59
if test x$enable_gtk = xyes; then
 
60
  PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.12.0 ])
 
61
  AC_SUBST(GTK_CFLAGS)
 
62
  AC_SUBST(GTK_LIBS)
 
63
fi
 
64
 
 
65
AC_ARG_ENABLE(libdrm_intel, AS_HELP_STRING([--enable-libdrm_intel],[enable building with libdrm_intel support]),enable_libdrm_intel=$enableval,enable_libdrm_intel=no)
60
66
AM_CONDITIONAL(ENABLE_LIBDRM_INTEL,  [test "$enable_libdrm_intel" = yes])
61
67
 
62
68
if test x$enable_libdrm_intel = xyes; then
100
106
  AC_DEFINE(PLY_ENABLE_LIBDRM_INTEL, 1, [Enable support for libdrm_intel driver])
101
107
fi
102
108
 
103
 
AC_ARG_ENABLE(libdrm_radeon, AS_HELP_STRING([--enable-libdrm_radeon],[enable building with libdrm_radeon support]),enable_libdrm_radeon=$enableval,enable_libdrm_radeon=yes)
 
109
AC_ARG_ENABLE(libdrm_radeon, AS_HELP_STRING([--enable-libdrm_radeon],[enable building with libdrm_radeon support]),enable_libdrm_radeon=$enableval,enable_libdrm_radeon=no)
104
110
AM_CONDITIONAL(ENABLE_LIBDRM_RADEON,  [test "$enable_libdrm_radeon" = yes])
105
111
 
106
112
if test x$enable_libdrm_radeon = xyes; then
144
150
  AC_DEFINE(PLY_ENABLE_LIBDRM_RADEON, 1, [Enable support for libdrm_radeon driver])
145
151
fi
146
152
 
147
 
AC_ARG_ENABLE(libdrm_nouveau, AS_HELP_STRING([--enable-libdrm_nouveau],[enable building with libdrm_nouveau support]),enable_libdrm_nouveau=$enableval,enable_libdrm_nouveau=yes)
 
153
AC_ARG_ENABLE(libdrm_nouveau, AS_HELP_STRING([--enable-libdrm_nouveau],[enable building with libdrm_nouveau support]),enable_libdrm_nouveau=$enableval,enable_libdrm_nouveau=no)
148
154
AM_CONDITIONAL(ENABLE_LIBDRM_NOUVEAU,  [test "$enable_libdrm_nouveau" = yes])
149
155
 
150
156
if test x$enable_libdrm_nouveau = xyes; then
188
194
  AC_DEFINE(PLY_ENABLE_LIBDRM_NOUVEAU, 1, [Enable support for libdrm_nouveau driver])
189
195
fi
190
196
 
191
 
AC_ARG_ENABLE(libkms, AS_HELP_STRING([--enable-libkms],[enable building with libkms support]),enable_libkms=$enableval,enable_libkms=yes)
 
197
AC_ARG_ENABLE(libkms, AS_HELP_STRING([--enable-libkms],[enable building with libkms support]),enable_libkms=$enableval,enable_libkms=no)
192
198
AM_CONDITIONAL(ENABLE_LIBKMS,  [test "$enable_libkms" = yes])
193
199
 
194
200
if test x$enable_libkms = xyes; then
198
204
  AC_DEFINE(PLY_ENABLE_LIBKMS, 1, [Enable support for libkms abstraction over drm drivers])
199
205
fi
200
206
 
201
 
DRM_CFLAGS="$DRM_INTEL_CFLAGS $DRM_RADEON_CFLAGS $DRM_NOUVEAU_CFLAGS $LIBKMS_CFLAG"
202
 
DRM_LIBS="$DRM_INTEL_LIBS $DRM_RADEON_LIBS $DRM_NOUVEAU_LIBS $LIBKMS_LIBS"
 
207
AC_ARG_ENABLE(drm, AS_HELP_STRING([--enable-drm-renderer],[enable building drm kms support]),enable_drm_renderer=$enableval,enable_drm_renderer=yes)
 
208
AM_CONDITIONAL(ENABLE_DRM_RENDERER,  [test "$enable_drm_renderer" = yes])
 
209
 
 
210
if test x$enable_drm_renderer = xyes; then
 
211
  PKG_CHECK_MODULES(DRM, [libdrm])
 
212
fi
 
213
 
 
214
DRM_CFLAGS="$DRM_CFLAGS $DRM_INTEL_CFLAGS $DRM_RADEON_CFLAGS $DRM_NOUVEAU_CFLAGS $LIBKMS_CFLAG"
 
215
DRM_LIBS="$DRM_LIBS $DRM_INTEL_LIBS $DRM_RADEON_LIBS $DRM_NOUVEAU_LIBS $LIBKMS_LIBS"
203
216
AC_SUBST(DRM_CFLAGS)
204
217
AC_SUBST(DRM_LIBS)
205
218
 
206
 
AM_CONDITIONAL(ENABLE_DRM_RENDERER,
207
 
               [test x$enable_libdrm_intel = xyes   \
208
 
                  -o x$enable_libdrm_radeon = xyes  \
209
 
                  -o x$enable_libdrm_nouveau = xyes \
210
 
                  -o x$enable_libkms = xyes])
211
 
 
212
219
AC_ARG_ENABLE(tracing, AS_HELP_STRING([--enable-tracing],[enable verbose tracing code]),enable_tracing=$enableval,enable_tracing=yes)
213
220
 
214
221
if test x$enable_tracing = xyes; then
222
229
AC_ARG_ENABLE(gdm-transition, AS_HELP_STRING([--enable-gdm-transition],[enable smooth transition to gdm]),enable_gdm_transition=$enableval,enable_gdm_transition=no)
223
230
 
224
231
if test x$enable_gdm_transition = xyes; then
225
 
  AC_DEFINE(PLY_ENABLE_GDM_TRANSITION, 1, [Enable smooth transition to GDM])
 
232
  AC_DEFINE(PLY_ENABLE_DEPRECATED_GDM_TRANSITION, 1, [Enable deprecated smooth transition to GDM])
226
233
fi
227
234
 
228
235
AC_ARG_ENABLE(upstart-monitoring, AS_HELP_STRING([--enable-upstart-monitoring],[listen for messages on the Upstart D-Bus interface]),enable_upstart_monitoring=$enableval,enable_upstart_monitoring=no)
247
254
 
248
255
if test x$enable_systemd_integration = xyes; then
249
256
  AC_DEFINE(PLY_ENABLE_SYSTEMD_INTEGRATION, 1, [Coordinate boot up with systemd])
 
257
  SYSTEMD_UNIT_DIR=/lib/systemd/system
 
258
  AC_SUBST(SYSTEMD_UNIT_DIR)
250
259
fi
251
260
 
252
261
AC_ARG_WITH(system-root-install, AS_HELP_STRING([--with-system-root-install],[Install client in /bin and daemon in /sbin]),with_system_root_install=${withval},with_system_root_install=yes)
276
285
AM_CONDITIONAL(WITH_LOG_VIEWER,  [test "$with_log_viewer" = yes])
277
286
 
278
287
if test x$with_log_viewer = xyes; then
 
288
  if test x$enable_gtk = xno; then
 
289
    AC_MSG_ERROR([log viewer enabled bug gtk disabled])
 
290
  fi
279
291
  AC_ARG_WITH(gdm-autostart-file, AS_HELP_STRING([--with-gdm-autostart-file],[start log viewer from gdm on boot errors]),with_gdm_autostart_file=$withval,with_gdm_autostart_file=yes)
280
292
else
281
293
  with_gdm_autostart_file=no
297
309
AC_ARG_WITH(background-end-color-stop, AS_HELP_STRING([--with-background-end-color-stop],[first color end in background gradients used by boot splash plugins]),background_end_color=${withval},background_end_color=0x3a362f)
298
310
AC_SUBST(background_end_color)
299
311
 
300
 
AC_ARG_WITH(release-file, AS_HELP_STRING([--with-release-file=<path_to_release_file>],[Release File to use to detect distribution (by default /etc/system-reelase)]),RELEASE_FILE=${withval},RELEASE_FILE=/etc/system-release)
 
312
AC_ARG_WITH(release-file, AS_HELP_STRING([--with-release-file=<path_to_release_file>],[Release File to use to detect distribution (by default /etc/system-release)]),RELEASE_FILE=${withval},RELEASE_FILE=/etc/system-release)
301
313
 
302
314
AC_SUBST(RELEASE_FILE)
303
315
AC_DEFINE_UNQUOTED(RELEASE_FILE, "$RELEASE_FILE", [Release file path])
444
456
           scripts/plymouth-populate-initrd
445
457
           scripts/plymouth-set-default-theme
446
458
           scripts/Makefile
 
459
           systemd-units/plymouth-halt.service
 
460
           systemd-units/plymouth-kexec.service
 
461
           systemd-units/plymouth-poweroff.service
 
462
           systemd-units/plymouth-quit.service
 
463
           systemd-units/plymouth-quit-wait.service
 
464
           systemd-units/plymouth-read-write.service
 
465
           systemd-units/plymouth-reboot.service
 
466
           systemd-units/plymouth-start.service
 
467
           systemd-units/plymouth-switch-root.service
 
468
           systemd-units/systemd-ask-password-plymouth.path
 
469
           systemd-units/systemd-ask-password-plymouth.service
 
470
           systemd-units/Makefile
447
471
           docs/Makefile
448
472
])
449
473
AC_OUTPUT