← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/evince/oneiric-updates

« back to all changes in this revision

Viewing changes to .pc/01_lpi.patch/configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya, Josselin Mouette, Rodrigo Moya
  • Date: 2011-05-19 12:12:42 UTC
  • mfrom: (1.1.65 upstream) (1.3.6 experimental)
  • Revision ID: james.westby@ubuntu.com-20110519121242-967hbn2nh2hunp4y
Tags: 3.0.0-4ubuntu1
http://bugs.debian.org/619564
http://bugs.debian.org/627027
http://bugs.debian.org/551734
http://bugs.debian.org/581441
[ Josselin Mouette ]
* bug-presubj: please document where to report rendering bugs.
* evince.mime: dropped. We have desktop files to handle MIME 
  associations, no need to maintain an alternate system by hand.
  Closes: #619564, #627027, #551734, #581441.

[ Rodrigo Moya ]
* Rebase from Debian and GNOME3 PPA (thanks to Rico Tzschichholz).
  Remaining Ubuntu changes:
* debian/apparmor-profile:
* debian/apparmor-profile.abstraction:
* debian/evince.apport:
* debian/evince-common.dirs:
* debian/evince-common.postinst:
* debian/evince-common.postrm:
  - Add apparmor profile
* debian/control:
  - Build-Depend on debhelper (>= 7.4.20ubuntu5), gnome-common,
    hardening-includes and liblaunchpad-integration-3.0-dev
  - Standards-Version is 3.9.1
  - Depend on apparmor
* debian/rules:
  - Include hardening.make
  - Add rule to install apparmor files
* debian/watch:
  - Watch unstable series
* debian/patches/01_lpi.patch:
  - Launchpad integration patch
* debian/patches/04_gold.patch:
  - Link against libz
* debian/patches/05_library-path.patch:
  - Fix library path for g-ir-scanner

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/01_lpi.patch/configure.ac
2
2
# Versioning
3
3
# *****************************************************************************
4
4
 
5
 
m4_define([ev_major_version],[2])
6
 
m4_define([ev_minor_version],[32])
 
5
m4_define([ev_major_version],[3])
 
6
m4_define([ev_minor_version],[0])
7
7
m4_define([ev_micro_version],[0])
8
8
m4_define([ev_extra_version],[])
9
9
m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version])
10
10
 
11
11
# The evince API version
12
 
m4_define([ev_api_version], [2.32])
 
12
m4_define([ev_api_version], [3.0])
13
13
 
14
14
# Libtool versioning. The backend and view libraries have separate versions.
15
15
# Before making a release, the libtool version should be modified.
121
121
AM_CONDITIONAL([PLATFORM_HILDON],[test "$with_platform" = "hildon"])
122
122
AM_CONDITIONAL([PLATFORM_WIN32],[test "$with_platform" = "win32"])
123
123
 
124
 
AC_MSG_CHECKING([which gtk+ version to compile against])
125
 
AC_ARG_WITH([gtk],
126
 
  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
127
 
  [case "$with_gtk" in
128
 
     2.0|3.0) ;;
129
 
     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
130
 
   esac],
131
 
  [with_gtk=2.0])
132
 
AC_MSG_RESULT([$with_gtk])
133
 
 
134
124
dnl Specify required versions of dependencies
135
 
CAIRO_REQUIRED=1.9.10
 
125
CAIRO_REQUIRED=1.10.0
136
126
GLIB_REQUIRED=2.25.11
137
127
KEYRING_REQUIRED=2.22.0
138
 
 
139
 
case "$with_gtk" in
140
 
  2.0) GTK_API_VERSION=2.0
141
 
       GAIL_API_VERSION=
142
 
       GTK_REQUIRED=2.21.5
143
 
       ;;
144
 
  3.0) GTK_API_VERSION=3.0
145
 
       GAIL_API_VERSION=-3.0
146
 
       GTK_REQUIRED=2.90.5
147
 
       ;;
148
 
esac
 
128
GTK_REQUIRED=3.0.2
 
129
NAUTILUS_REQUIRED=2.91.4
149
130
 
150
131
AC_SUBST([GLIB_REQUIRED])
151
132
AC_SUBST([GTK_REQUIRED])
152
 
AC_SUBST([GTK_API_VERSION])
153
133
 
154
134
GNOME_ICON_THEME_REQUIRED=2.17.1
155
135
LIBXML_REQUIRED=2.5.0
164
144
# SHELL_LIBS
165
145
 
166
146
 
167
 
PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
168
 
PKG_CHECK_MODULES(LIBVIEW, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gail$GAIL_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
169
 
PKG_CHECK_MODULES(BACKEND, cairo >= $CAIRO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
170
 
PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
 
147
PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
 
148
PKG_CHECK_MODULES(LIBVIEW, gtk+-3.0 >= $GTK_REQUIRED gail-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
 
149
PKG_CHECK_MODULES(BACKEND, cairo >= $CAIRO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED)
 
150
PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
171
151
 
172
152
SHELL_PLATFORM_PKGS=
173
153
case "$with_platform" in
193
173
        ;;
194
174
esac
195
175
 
196
 
PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
 
176
PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
197
177
 
198
178
# *********
199
179
# SM client
200
180
# *********
201
181
 
202
 
GDK_TARGET="$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)"
 
182
GDK_TARGET="$($PKG_CONFIG --variable target gdk-3.0)"
203
183
 
204
184
AC_MSG_CHECKING([which smclient backend to use])
205
185
AC_ARG_WITH([smclient],
221
201
  AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
222
202
 
223
203
  case "$with_smclient" in
224
 
    xsmp) SMCLIENT_PKGS="sm >= 1.0.0" ;;
 
204
    xsmp) SMCLIENT_PKGS="sm >= 1.0.0 ice" ;;
225
205
    *) SMCLIENT_PKGS="" ;;
226
206
  esac
227
207
 
228
 
  PKG_CHECK_MODULES([SMCLIENT],[gtk+-$GTK_API_VERSION gthread-2.0 $SMCLIENT_PKGS])
 
208
  PKG_CHECK_MODULES([SMCLIENT],[gtk+-3.0 gthread-2.0 $SMCLIENT_PKGS])
229
209
  AC_SUBST([SMCLIENT_CFLAGS])
230
210
  AC_SUBST([SMCLIENT_LIBS])
231
211
fi
262
242
AC_MSG_RESULT([$with_gtk_unix_print])
263
243
 
264
244
if test "$with_gtk_unix_print" = "yes"; then
265
 
   PKG_CHECK_MODULES(GTKUNIXPRINT, [gtk+-unix-print-$GTK_API_VERSION >= $GTK_REQUIRED])
 
245
   PKG_CHECK_MODULES(GTKUNIXPRINT, [gtk+-unix-print-3.0 >= $GTK_REQUIRED])
266
246
   AC_DEFINE([GTKUNIXPRINT_ENABLED], [1], [Define if gtk+-unix-print is enabled.])
267
247
fi
268
248
 
306
286
 
307
287
AM_CONDITIONAL([ENABLE_DBUS], [test "$enable_dbus" = "yes"])
308
288
 
309
 
dnl ========= Check for GConf
310
 
 
311
 
AC_MSG_CHECKING([whether GConf support is requested])
312
 
AC_ARG_WITH([gconf],
313
 
  [AS_HELP_STRING([--without-gconf],
314
 
                  [Disable the use of gconf])],
315
 
  [],
316
 
  [case "$os_win32" in
317
 
     yes) with_gconf=no ;;
318
 
     *) with_gconf=yes ;;
319
 
   esac])
320
 
AC_MSG_RESULT([$with_gconf])
321
 
 
322
 
AM_CONDITIONAL([WITH_GCONF],[test "$with_gconf" = "yes"])
323
 
 
324
 
if test "$with_gconf" = "yes"; then
325
 
   PKG_CHECK_MODULES([GCONF],[gconf-2.0])
326
 
   AC_DEFINE([WITH_GCONF],[1],[Define if GConf support is enabled])
327
 
 
328
 
   AM_GCONF_SOURCE_2
329
 
 
330
 
   AC_PATH_PROG([GCONFTOOL], [gconftool-2], [false])
331
 
   if test "$GCONFTOOL" = "false"; then
332
 
      AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
333
 
   fi
334
 
else
335
 
   AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],false)
 
289
dnl ========= Check for Desktop Schemas
 
290
PKG_CHECK_MODULES([DESKTOP_SCHEMAS], [gsettings-desktop-schemas],
 
291
                  has_desktop_schemas=yes, has_desktop_schemas=no)
 
292
if test x$has_desktop_schemas = xyes; then
 
293
   AC_DEFINE([HAVE_DESKTOP_SCHEMAS], [1], [Whether GSettings Desktop Schemas are available])
336
294
fi
337
295
 
338
296
dnl Debug mode
369
327
AC_SUBST(BACKEND_CFLAGS)
370
328
AC_SUBST(BACKEND_LIBS)
371
329
 
372
 
SHELL_CFLAGS="$SHELL_CORE_CFLAGS $KEYRING_CFLAGS $GCONF_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS"
373
 
SHELL_LIBS="$SHELL_CORE_LIBS $KEYRING_LIBS $GCONF_LIBS -lz -lm"
 
330
SHELL_CFLAGS="$SHELL_CORE_CFLAGS $KEYRING_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS"
 
331
SHELL_LIBS="$SHELL_CORE_LIBS $KEYRING_LIBS -lz -lm"
374
332
AC_SUBST(SHELL_CFLAGS)
375
333
AC_SUBST(SHELL_LIBS)
376
334
 
394
352
    esac])
395
353
 
396
354
if test "$enable_nautilus" = "yes" ; then
397
 
  PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-$GTK_API_VERSION $MM gthread-2.0 libnautilus-extension],
 
355
  PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-3.0 $MM gthread-2.0 libnautilus-extension >= $NAUTILUS_REQUIRED],
398
356
                    [],[AC_MSG_ERROR([libnautilus-extension not found; use --disable-nautilus to disable the nautilus extensions])])
399
357
  NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
400
358
  AC_SUBST([nautilusextensiondir],[$NAUTILUS_EXTENSION_DIR])
433
391
    esac])
434
392
 
435
393
if test x$enable_previewer = "xyes" ; then
436
 
  PKG_CHECK_MODULES([PREVIEWER],[gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED])
 
394
  PKG_CHECK_MODULES([PREVIEWER],[gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED])
437
395
fi
438
396
 
439
397
AM_CONDITIONAL([ENABLE_PREVIEWER],[test "$enable_previewer" = "yes"])
496
454
  [enable_pdf=yes])
497
455
 
498
456
if test "x$enable_pdf" = "xyes"; then
499
 
    POPPLER_REQUIRED=0.14.0
 
457
    POPPLER_REQUIRED=0.16.0
500
458
    PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED,enable_pdf=yes,enable_pdf=no)
501
459
 
502
460
    if test "x$enable_pdf" = "xyes"; then
503
 
            evince_save_LIBS=$LIBS
504
 
            LIBS="$LIBS $POPPLER_LIBS"
505
 
            AC_CHECK_FUNCS(poppler_page_get_text_layout)
506
 
            AC_CHECK_FUNCS(poppler_page_get_selected_text)
507
 
            AC_CHECK_FUNCS(poppler_page_add_annot)
508
 
            LIBS=$evince_save_LIBS
509
461
            PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)
510
462
            if test x$enable_cairo_pdf = xyes; then
511
463
                    AC_DEFINE([HAVE_CAIRO_PDF], [1], [defined if cairo-pdf is available])
646
598
 
647
599
dnl ================== End of dvi checks ===================================================
648
600
 
649
 
dnl ================== pixbuf checks ===================================================
650
 
 
651
 
AC_ARG_ENABLE(pixbuf,
652
 
            [AS_HELP_STRING([--enable-pixbuf],
653
 
                            [Compile with support of pixbuf])],
654
 
            [enable_pixbuf=$enableval],
655
 
            [enable_pixbuf=no])
656
 
            
657
 
if test "x$enable_pixbuf" = "xyes"; then
658
 
        AC_DEFINE([ENABLE_PIXBUF], [1], [Enable pixbuf support.])
659
 
fi
660
 
 
661
 
AM_CONDITIONAL(ENABLE_PIXBUF, test x$enable_pixbuf = xyes)
662
 
 
663
 
dnl ================== End of pixbuf checks ===================================================
664
 
 
665
601
dnl ================== comic book checks ===================================================
666
602
 
667
603
AC_ARG_ENABLE(comics,
677
613
 
678
614
dnl ================== End of comic book checks ============================================
679
615
 
680
 
dnl ================== impress book checks ===================================================
681
 
 
682
 
AC_ARG_ENABLE(impress,
683
 
        [AS_HELP_STRING([--enable-impress],
684
 
                        [Compile with support for impress presentations])],
685
 
        [enable_impress=$enableval],
686
 
        [enable_impress=no])
687
 
        
688
 
if test "x$enable_impress" = "xyes"; then
689
 
        AC_DEFINE([ENABLE_IMPRESS], [1], [Enable support for impress.])
690
 
fi 
691
 
AM_CONDITIONAL(ENABLE_IMPRESS, test x$enable_impress = xyes)
692
 
 
693
 
dnl ================== End of impress book checks ============================================
 
616
dnl ================== XPS checks ===================================================
 
617
 
 
618
AC_ARG_ENABLE(xps,
 
619
        [AS_HELP_STRING([--enable-xps],
 
620
                        [Compile with support for XPS documents.])],
 
621
        [enable_xps=$enableval],
 
622
        [enable_xps=yes])
 
623
 
 
624
if test "x$enable_xps" = "xyes"; then
 
625
   GXPS_REQUIRED=0.0.1
 
626
   PKG_CHECK_MODULES(GXPS, libgxps >= $GXPS_REQUIRED,enable_xps=yes,enable_xps=no)
 
627
 
 
628
   if test "x$enable_xps" = "xyes"; then
 
629
      AC_DEFINE([ENABLE_XPS], [1], [Enable support for XPS documents.])
 
630
   else
 
631
      enable_xps="no"
 
632
      AC_MSG_WARN(["XPS support is disabled since libgxps (version >= $GXPS_REQUIRED) is needed])
 
633
   fi
 
634
fi
 
635
 
 
636
AM_CONDITIONAL(ENABLE_XPS, test x$enable_xps = xyes)
 
637
 
 
638
dnl ================== End of XPS checks ===================================================
694
639
 
695
640
dnl =================== Mime types list ====================================================
696
641
 
697
642
if test "x$enable_pdf" = "xyes" ; then
698
 
        EVINCE_MIME_TYPES="application/pdf;application/x-bzpdf;application/x-gzpdf;"
 
643
        EVINCE_MIME_TYPES="application/pdf;application/x-bzpdf;application/x-gzpdf;application/x-xzpdf;"
699
644
fi
700
645
if test "x$enable_ps" = "xyes" ; then
701
646
        EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/postscript;application/x-bzpostscript;application/x-gzpostscript;image/x-eps;image/x-bzeps;image/x-gzeps;"
712
657
if test "x$enable_comics" = "xyes"; then
713
658
        EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;"
714
659
fi
715
 
if test "x$enable_pixbuf" = "xyes"; then
716
 
        EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/*;"
717
 
fi
718
 
if test "x$enable_impress" = "xyes"; then
719
 
        EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/vnd.sun.xml.impress;application/vnd.oasis.opendocument.presentation;"
 
660
if test "x$enable_xps" = "xyes"; then
 
661
        EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/oxps;application/vnd.ms-xpsdocument;"
720
662
fi
721
663
AC_SUBST(EVINCE_MIME_TYPES)
722
664
 
757
699
GTK_DOC_CHECK([1.13],[--flavour no-tmpl])
758
700
 
759
701
AC_SUBST([GLIB_PREFIX],[$($PKG_CONFIG --variable=prefix glib-2.0)])
760
 
AC_SUBST([GTK_PREFIX],[$($PKG_CONFIG --variable=prefix gtk+-$GTK_API_VERSION)])
 
702
AC_SUBST([GTK_PREFIX],[$($PKG_CONFIG --variable=prefix gtk+-3.0)])
761
703
 
762
704
# ******************
763
705
# Backends directory
792
734
backend/djvu/Makefile
793
735
backend/dvi/Makefile
794
736
backend/dvi/mdvi-lib/Makefile
795
 
backend/impress/Makefile
796
737
backend/pdf/Makefile
797
 
backend/pixbuf/Makefile
798
738
backend/ps/Makefile
799
739
backend/tiff/Makefile
 
740
backend/xps/Makefile
800
741
cut-n-paste/Makefile
801
742
cut-n-paste/gimpcellrenderertoggle/Makefile
802
743
cut-n-paste/smclient/Makefile
825
766
data/icons/48x48/Makefile
826
767
data/icons/48x48/apps/Makefile
827
768
data/icons/48x48/actions/Makefile
 
769
data/icons/256x256/Makefile
 
770
data/icons/256x256/apps/Makefile
828
771
data/icons/scalable/Makefile
829
 
data/icons/scalable/apps/Makefile
830
772
data/icons/scalable/actions/Makefile
831
773
data/icons/scalable/mimetypes/Makefile
832
774
help/Makefile
858
800
echo "
859
801
Configure summary:
860
802
        Platform...........:  $with_platform
861
 
        GTK+ version.......:  $with_gtk
862
 
        GConf Support......:  $with_gconf
863
803
        GTK+ Unix Print....:  $with_gtk_unix_print
864
804
        Keyring Support....:  $with_keyring
865
805
        DBUS Support.......:  $enable_dbus
878
818
        TIFF Backend.......:  $enable_tiff
879
819
        DJVU Backend.......:  $enable_djvu
880
820
        DVI Backend........:  $enable_dvi
881
 
        Pixbuf Backend.....:  $enable_pixbuf
882
821
        Comics Backend.....:  $enable_comics
883
 
        Impress Backend....:  $enable_impress
 
822
        XPS Backend........:  $enable_xps
884
823
"