← Back to branch summary

~ubuntu-branches/ubuntu/precise/gtk+2.0/precise-updates

« back to all changes in this revision

Viewing changes to .pc/005_support_disabling_x11_extensions.patch/configure.in

  • Committer: Package Import Robot
  • Author(s): Ken VanDine
  • Date: 2011-12-01 11:40:06 UTC
  • mfrom: (1.14.11)
  • Revision ID: package-import@ubuntu.com-20111201114006-nrmf6qu3pg512veo
Tags: 2.24.8-0ubuntu1
https://launchpad.net/bugs/189494
https://launchpad.net/bugs/889019
* New upstream release 
  - gtkfilechooser should be more robust to malformed URIs
    in .gtk-bookmarks (LP: #189494)
* debian/patches/010_make_bg_changes_queue_repaint.patch
  - dropped it introduces performance regressions in some gtk2 
    apps (LP: #889019)
* 101_filechooser.patch, 000git_file_chooser.patch: dropped, upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/005_support_disabling_x11_extensions.patch/configure.in
13
13
 
14
14
m4_define([gtk_major_version], [2])
15
15
m4_define([gtk_minor_version], [24])
16
 
m4_define([gtk_micro_version], [6])
17
 
m4_define([gtk_interface_age], [6])
 
16
m4_define([gtk_micro_version], [8])
 
17
m4_define([gtk_interface_age], [8])
18
18
m4_define([gtk_binary_age],
19
19
          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
20
20
m4_define([gtk_version],
195
195
AC_PATH_PROG(NM, nm, nm)
196
196
 
197
197
dnl Initialize maintainer mode
198
 
AM_MAINTAINER_MODE
 
198
AM_MAINTAINER_MODE([enable])
199
199
 
200
200
AC_MSG_CHECKING([for some Win32 platform])
201
201
case "$host" in
1254
1254
  AM_CONDITIONAL(USE_WIN32, false)
1255
1255
fi
1256
1256
 
 
1257
AC_ARG_ENABLE(quartz-relocation,
 
1258
              [AS_HELP_STRING([--enable-quartz-relocation],
 
1259
                              [enable bundle-based relocation functions])],
 
1260
                              [quartz_relocation=yes])
 
1261
 
1257
1262
if test "x$gdktarget" = "xquartz"; then
1258
1263
  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
1259
1264
  AM_CONDITIONAL(USE_QUARTZ, true)
 
1265
  if test "x$quartz_relocation" = xyes; then
 
1266
    AC_DEFINE([QUARTZ_RELOCATION], [1], [Use NSBundle functions to determine load paths for libraries, translations, etc.])
 
1267
  fi
 
1268
 
1260
1269
else
1261
1270
  AM_CONDITIONAL(USE_QUARTZ, false)
1262
1271
fi
1546
1555
              [enable_test_print_backend=no])
1547
1556
AM_CONDITIONAL(TEST_PRINT_BACKEND, test "x$enable_test_print_backend" != "xno")
1548
1557
 
 
1558
if test "$os_win32" = "yes"; then
 
1559
  AC_CHECK_TYPES([IPrintDialogCallback],[],[],[[#include <windows.h>]])
 
1560
fi
1549
1561
 
1550
1562
################################################################
1551
1563
# Strip -export-dynamic from the link lines of various libraries