← Back to branch summary

~ubuntu-branches/ubuntu/maverick/glib2.0/maverick

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-08-09 11:51:31 UTC
  • mfrom: (1.51.1 upstream) (3.4.23 experimental)
  • Revision ID: james.westby@ubuntu.com-20100809115131-pbojavp0jx7vtcah
Tags: 2.25.13-1ubuntu1
* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control.in:
  - Add Vcs-Bzr link
  - Recommend libdconf0
  - Don't use "linux-any" for now since soyuz doesn't handle it
  - Suggest python-subunit for dev package
* debian/libglib2.0-0.symbols:
  - Updated the symbols list for the gio launcher handler
* debian/rules:
  - Stop installing the sizable upstream changelog.
* debian/patches/01_gettext-desktopfiles.patch:
  - Updated to use gettext for X-GNOME-Fullname too
* debian/patches/05_file_size_units.patch:
  - Use base 10 units in g_format_size_for_display() (disabled)
* debian/patches/61_glib-compile-schemas-path.patch:
  - Don't use that change since there is a depends which assures to the 
    upstream binary location to be there
* debian/patches/71_gio_launch_handler.patch:
  - New GIO default launch handle feature required for wncksync
* debian/watch:
  - Watch for unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
22
22
#
23
23
m4_define([glib_major_version], [2])
24
24
m4_define([glib_minor_version], [25])
25
 
m4_define([glib_micro_version], [12])
 
25
m4_define([glib_micro_version], [13])
26
26
m4_define([glib_interface_age], [0])
27
27
m4_define([glib_binary_age],
28
28
          [m4_eval(100 * glib_minor_version + glib_micro_version)])
100
100
dnl Initialize maintainer mode
101
101
AM_MAINTAINER_MODE
102
102
 
 
103
dnl Checks for programs.
 
104
AC_PROG_CC
 
105
AC_PROG_CPP
 
106
 
103
107
AC_CANONICAL_HOST
104
108
 
105
109
AC_MSG_CHECKING([for the BeOS])
259
263
AC_SUBST(ABS_GLIB_RUNTIME_LIBDIR)
260
264
AM_CONDITIONAL(HAVE_GLIB_RUNTIME_LIBDIR, [test "x$with_runtime_libdir" != "x"])
261
265
 
262
 
dnl Checks for programs.
263
 
AC_PROG_CC
264
 
AC_PROG_CPP
265
 
 
266
266
dnl Check for a working C++ compiler, but do not bail out, if none is found.
267
267
AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], [gcc])
268
268
AC_LANG_SAVE
277
277
 
278
278
AC_SYS_LARGEFILE
279
279
 
280
 
#
281
 
# Find pkg-config
282
 
#
283
 
AC_PATH_PROG(PKG_CONFIG, [pkg-config], [no])
284
 
if test x$PKG_CONFIG = xno ; then
285
 
  AC_MSG_ERROR([*** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/])
286
 
fi
287
 
 
288
 
if $PKG_CONFIG --atleast-pkgconfig-version 0.16 ; then
289
 
  :
290
 
else
291
 
  AC_MSG_ERROR([*** pkg-config too old; version 0.16 or better required.])
292
 
fi
 
280
PKG_PROG_PKG_CONFIG(0.16)
293
281
 
294
282
if test "x$enable_debug" = "xyes"; then
295
283
  if test x$cflags_set != xset ; then
3660
3648
 
3661
3649
AC_SUBST(GLIB_LINK_FLAGS)
3662
3650
 
 
3651
#
 
3652
# Define variables corresponding to the correct include paths to use for
 
3653
# in-tree building.
 
3654
#
 
3655
 
 
3656
# for config.h:
 
3657
config_h_INCLUDES='-I$(top_builddir)'
 
3658
AC_SUBST(config_h_INCLUDES)
 
3659
 
 
3660
# glib:
 
3661
#   config.h
 
3662
#   $(top_builddir)/glib: for glibconfig.h
 
3663
#   $(top_srcdir)/glib:   for glib.h
 
3664
#   $(top_srcdir):        for everything
 
3665
glib_INCLUDES='$(config_h_INCLUDES) -I$(top_builddir)/glib -I$(top_srcdir)/glib -I$(top_srcdir)'
 
3666
AC_SUBST(glib_INCLUDES)
 
3667
 
 
3668
# gthread:
 
3669
#   same as glib
 
3670
gthread_INCLUDES='$(glib_INCLUDES)'
 
3671
AC_SUBST(gthread_INCLUDES)
 
3672
 
 
3673
# gobject:
 
3674
#   same as gthread
 
3675
gobject_INCLUDES='$(gthread_INCLUDES)'
 
3676
AC_SUBST(gobject_INCLUDES)
 
3677
 
 
3678
# gmodule:
 
3679
#   glib includes
 
3680
#   $(top_srcdir)/gmodule: for gmodule.h
 
3681
gmodule_INCLUDES='$(glib_INCLUDES) -I$(top_srcdir)/gmodule'
 
3682
AC_SUBST(gmodule_INCLUDES)
 
3683
 
 
3684
# gio:
 
3685
#   same as gmodule
 
3686
gio_INCLUDES='$(gmodule_INCLUDES)'
 
3687
AC_SUBST(gio_INCLUDES)
 
3688
 
 
3689
 
3663
3690
AC_CONFIG_FILES([
3664
3691
glib-2.0.pc
3665
3692
glib-2.0-uninstalled.pc