← Back to branch summary

~darkxst/ubuntu/raring/cogl/lp1163025

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-03-13 19:11:11 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20120313191111-3hgk529qkh9m6uk2
Tags: 1.9.8-0ubuntu1
https://launchpad.net/bugs/941617
* New upstream release (LP: #941617)
* Updated symbols & library name for soname update
* debian/control.in: Bump minimum glib to 2.28
* debian/patches/02_disable_armv5t_specific_optimization.patch: Disabled

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
1186
1186
AC_SUBST([am__untar])
1187
1187
]) # _AM_PROG_TAR
1188
1188
 
 
1189
m4_include([build/autotools/as-compiler-flag.m4])
 
1190
m4_include([build/autotools/as-linguas.m4])
 
1191
m4_include([build/autotools/gettext.m4])
 
1192
m4_include([build/autotools/gtk-doc.m4])
 
1193
m4_include([build/autotools/iconv.m4])
 
1194
m4_include([build/autotools/intlmacosx.m4])
 
1195
m4_include([build/autotools/lib-ld.m4])
 
1196
m4_include([build/autotools/lib-link.m4])
 
1197
m4_include([build/autotools/lib-prefix.m4])
 
1198
m4_include([build/autotools/libtool.m4])
 
1199
m4_include([build/autotools/ltoptions.m4])
 
1200
m4_include([build/autotools/ltsugar.m4])
 
1201
m4_include([build/autotools/ltversion.m4])
 
1202
m4_include([build/autotools/lt~obsolete.m4])
 
1203
m4_include([build/autotools/nls.m4])
 
1204
m4_include([build/autotools/po.m4])
 
1205
m4_include([build/autotools/progtest.m4])
1189
1206
# Configure paths for GLIB
1190
1207
# Owen Taylor     1997-2001
1191
1208
 
1252
1269
    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
1253
1270
    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
1254
1271
    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
 
1272
    GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
1255
1273
 
1256
1274
    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
1257
1275
    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
1388
1406
     GLIB_GENMARSHAL=""
1389
1407
     GOBJECT_QUERY=""
1390
1408
     GLIB_MKENUMS=""
 
1409
     GLIB_COMPILE_RESOURCES=""
1391
1410
     ifelse([$3], , :, [$3])
1392
1411
  fi
1393
1412
  AC_SUBST(GLIB_CFLAGS)
1395
1414
  AC_SUBST(GLIB_GENMARSHAL)
1396
1415
  AC_SUBST(GOBJECT_QUERY)
1397
1416
  AC_SUBST(GLIB_MKENUMS)
 
1417
  AC_SUBST(GLIB_COMPILE_RESOURCES)
1398
1418
  rm -f conf.glibtest
1399
1419
])
1400
1420
 
1401
 
m4_include([build/autotools/as-compiler-flag.m4])
1402
 
m4_include([build/autotools/as-linguas.m4])
1403
 
m4_include([build/autotools/gettext.m4])
1404
 
m4_include([build/autotools/gtk-doc.m4])
1405
 
m4_include([build/autotools/iconv.m4])
1406
 
m4_include([build/autotools/intlmacosx.m4])
1407
 
m4_include([build/autotools/introspection.m4])
1408
 
m4_include([build/autotools/lib-ld.m4])
1409
 
m4_include([build/autotools/lib-link.m4])
1410
 
m4_include([build/autotools/lib-prefix.m4])
1411
 
m4_include([build/autotools/libtool.m4])
1412
 
m4_include([build/autotools/ltoptions.m4])
1413
 
m4_include([build/autotools/ltsugar.m4])
1414
 
m4_include([build/autotools/ltversion.m4])
1415
 
m4_include([build/autotools/lt~obsolete.m4])
1416
 
m4_include([build/autotools/nls.m4])
1417
 
m4_include([build/autotools/po.m4])
1418
 
m4_include([build/autotools/progtest.m4])
 
1421
dnl -*- mode: autoconf -*-
 
1422
dnl Copyright 2009 Johan Dahlin
 
1423
dnl
 
1424
dnl This file is free software; the author(s) gives unlimited
 
1425
dnl permission to copy and/or distribute it, with or without
 
1426
dnl modifications, as long as this notice is preserved.
 
1427
dnl
 
1428
 
 
1429
# serial 1
 
1430
 
 
1431
m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
 
1432
[
 
1433
    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
 
1434
    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
 
1435
    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
 
1436
 
 
1437
    dnl enable/disable introspection
 
1438
    m4_if([$2], [require],
 
1439
    [dnl
 
1440
        enable_introspection=yes
 
1441
    ],[dnl
 
1442
        AC_ARG_ENABLE(introspection,
 
1443
                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
 
1444
                                 [Enable introspection for this build]),, 
 
1445
                                 [enable_introspection=auto])
 
1446
    ])dnl
 
1447
 
 
1448
    AC_MSG_CHECKING([for gobject-introspection])
 
1449
 
 
1450
    dnl presence/version checking
 
1451
    AS_CASE([$enable_introspection],
 
1452
    [no], [dnl
 
1453
        found_introspection="no (disabled, use --enable-introspection to enable)"
 
1454
    ],dnl
 
1455
    [yes],[dnl
 
1456
        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
 
1457
                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
 
1458
        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
 
1459
                         found_introspection=yes,
 
1460
                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
 
1461
    ],dnl
 
1462
    [auto],[dnl
 
1463
        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
 
1464
    ],dnl
 
1465
    [dnl        
 
1466
        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
 
1467
    ])dnl
 
1468
 
 
1469
    AC_MSG_RESULT([$found_introspection])
 
1470
 
 
1471
    INTROSPECTION_SCANNER=
 
1472
    INTROSPECTION_COMPILER=
 
1473
    INTROSPECTION_GENERATE=
 
1474
    INTROSPECTION_GIRDIR=
 
1475
    INTROSPECTION_TYPELIBDIR=
 
1476
    if test "x$found_introspection" = "xyes"; then
 
1477
       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
 
1478
       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
 
1479
       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
 
1480
       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
 
1481
       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
 
1482
       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
 
1483
       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
 
1484
       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
 
1485
    fi
 
1486
    AC_SUBST(INTROSPECTION_SCANNER)
 
1487
    AC_SUBST(INTROSPECTION_COMPILER)
 
1488
    AC_SUBST(INTROSPECTION_GENERATE)
 
1489
    AC_SUBST(INTROSPECTION_GIRDIR)
 
1490
    AC_SUBST(INTROSPECTION_TYPELIBDIR)
 
1491
    AC_SUBST(INTROSPECTION_CFLAGS)
 
1492
    AC_SUBST(INTROSPECTION_LIBS)
 
1493
    AC_SUBST(INTROSPECTION_MAKEFILE)
 
1494
 
 
1495
    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
 
1496
])
 
1497
 
 
1498
 
 
1499
dnl Usage:
 
1500
dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
 
1501
 
 
1502
AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
 
1503
[
 
1504
  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
 
1505
])
 
1506
 
 
1507
dnl Usage:
 
1508
dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
 
1509
 
 
1510
 
 
1511
AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
 
1512
[
 
1513
  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
 
1514
])
 
1515