← Back to branch summary

~noskcaj/ubuntu/wily/lightdm-gtk-greeter/merge

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Package Import Robot
  • Author(s): Sean Davis
  • Date: 2014-08-20 19:39:03 UTC
  • mto: (1.3.7 experimental)
  • mto: This revision was merged to the branch mainline in revision 23.
  • Revision ID: package-import@ubuntu.com-20140820193903-mvnpq7n5jipeh3la
Tags: upstream-1.9.0
Import upstream version 1.9.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
40
40
    dnl ******************************
41
41
 
42
42
    AC_ARG_ENABLE(compile-warnings, 
43
 
                  AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
 
43
                  AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
44
44
                                 [Turn on compiler warnings]),,
45
45
                  [enable_compile_warnings="m4_default([$1],[yes])"])
46
46
 
85
85
    minimum)
86
86
        warning_flags="-Wall"
87
87
        ;;
88
 
    yes)
89
 
        warning_flags="$base_warn_flags $base_error_flags $additional_flags"
90
 
        ;;
91
 
    maximum|error)
 
88
    yes|maximum|error)
92
89
        warning_flags="$base_warn_flags $base_error_flags $additional_flags"
93
90
        ;;
94
91
    *)
122
119
    AC_MSG_RESULT($tested_warning_flags)
123
120
 
124
121
    AC_ARG_ENABLE(iso-c,
125
 
                  AC_HELP_STRING([--enable-iso-c],
 
122
                  AS_HELP_STRING([--enable-iso-c],
126
123
                                 [Try to warn if code is not ISO C ]),,
127
124
                  [enable_iso_c=no])
128
125
 
150
147
 
151
148
AC_DEFUN([GNOME_CXX_WARNINGS],[
152
149
  AC_ARG_ENABLE(cxx-warnings,
153
 
                AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
 
150
                AS_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
154
151
                               [Turn on compiler warnings.]),,
155
152
                [enable_cxx_warnings="m4_default([$1],[minimum])"])
156
153
 
176
173
  AC_MSG_RESULT($warnCXXFLAGS)
177
174
 
178
175
   AC_ARG_ENABLE(iso-cxx,
179
 
                 AC_HELP_STRING([--enable-iso-cxx],
 
176
                 AS_HELP_STRING([--enable-iso-cxx],
180
177
                                [Try to warn if code is not ISO C++ ]),,
181
178
                 [enable_iso_cxx=no])
182
179
 
491
488
fi[]dnl
492
489
])# PKG_CHECK_MODULES
493
490
 
 
491
 
 
492
# PKG_INSTALLDIR(DIRECTORY)
 
493
# -------------------------
 
494
# Substitutes the variable pkgconfigdir as the location where a module
 
495
# should install pkg-config .pc files. By default the directory is
 
496
# $libdir/pkgconfig, but the default can be changed by passing
 
497
# DIRECTORY. The user can override through the --with-pkgconfigdir
 
498
# parameter.
 
499
AC_DEFUN([PKG_INSTALLDIR],
 
500
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
 
501
m4_pushdef([pkg_description],
 
502
    [pkg-config installation directory @<:@]pkg_default[@:>@])
 
503
AC_ARG_WITH([pkgconfigdir],
 
504
    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
 
505
    [with_pkgconfigdir=]pkg_default)
 
506
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
 
507
m4_popdef([pkg_default])
 
508
m4_popdef([pkg_description])
 
509
]) dnl PKG_INSTALLDIR
 
510
 
 
511
 
 
512
# PKG_NOARCH_INSTALLDIR(DIRECTORY)
 
513
# -------------------------
 
514
# Substitutes the variable noarch_pkgconfigdir as the location where a
 
515
# module should install arch-independent pkg-config .pc files. By
 
516
# default the directory is $datadir/pkgconfig, but the default can be
 
517
# changed by passing DIRECTORY. The user can override through the
 
518
# --with-noarch-pkgconfigdir parameter.
 
519
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
 
520
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
 
521
m4_pushdef([pkg_description],
 
522
    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
 
523
AC_ARG_WITH([noarch-pkgconfigdir],
 
524
    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
 
525
    [with_noarch_pkgconfigdir=]pkg_default)
 
526
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
 
527
m4_popdef([pkg_default])
 
528
m4_popdef([pkg_description])
 
529
]) dnl PKG_NOARCH_INSTALLDIR
 
530
 
 
531
 
 
532
# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
 
533
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 
534
# -------------------------------------------
 
535
# Retrieves the value of the pkg-config variable for the given module.
 
536
AC_DEFUN([PKG_CHECK_VAR],
 
537
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 
538
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
 
539
 
 
540
_PKG_CONFIG([$1], [variable="][$3]["], [$2])
 
541
AS_VAR_COPY([$1], [pkg_cv_][$1])
 
542
 
 
543
AS_VAR_IF([$1], [""], [$5], [$4])dnl
 
544
])# PKG_CHECK_VAR
 
545
 
494
546
# Copyright (C) 2002-2013 Free Software Foundation, Inc.
495
547
#
496
548
# This file is free software; the Free Software Foundation
1044
1096
END
1045
1097
    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
1046
1098
  fi
1047
 
fi])
 
1099
fi
 
1100
])
1048
1101
 
1049
1102
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
1050
1103
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further