← Back to branch summary

~ubuntu-branches/ubuntu/trusty/schroot/trusty

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Roger Leigh
  • Date: 2010-01-16 15:52:15 UTC
  • mfrom: (1.1.21 upstream) (2.2.1 sid)
  • Revision ID: james.westby@ubuntu.com-20100116155215-xzm51gxfze63htsl
http://bugs.debian.org/563818
http://bugs.debian.org/519745
http://bugs.debian.org/520781
* New upstream stable release.
* debian/control: Add ${misc:Depends}.
* Updated it translation.  Thanks to Vincenzo Campanella.
* Updated zh_CN translation.  Thanks to Ji ZhengYu.
* Updated de translattion (Closes: #563818).  Thanks to Holger
  Wansing.
* Updated bash completion script (Closes: #519745).  Thanks to
  Tim Abbott.
* Use boost::filesystem for portable directory iteration,
  removing existing path length restrictions (Closes: #520781).

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
92
92
AC_SUBST([SBUILD_BINARY_AGE])
93
93
 
94
94
dnl Initialise automake stuff.
95
 
AM_INIT_AUTOMAKE([1.10 gnu check-news dist-bzip2 no-dist-gzip tar-pax silent-rules])
 
95
AM_INIT_AUTOMAKE([1.10 gnu check-news dist-bzip2 no-dist-gzip tar-pax])
 
96
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
96
97
AM_MAINTAINER_MODE
97
98
RELEASE_DATE='sbuild_m4_esyscmd_s(date --date='sbuild_m4_esyscmd_s([sed -ne '/^Release-Date:/{s/Release-Date:[[:space:]][[:space:]]*//p;q}' VERSION])' '+%s')'
98
99
RELEASE_DATE_S='sbuild_m4_esyscmd_s([sed -ne '/^Release-Date:/{s/Release-Date:[[:space:]][[:space:]]*//p;q}' VERSION])'
495
496
 
496
497
AC_MSG_CHECKING([for boost::program_options::variables_map in -lboost_program_options])
497
498
saved_LIBS="${LIBS}"
498
 
LIBS="${LIBS} -lboost_program_options"
499
 
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/program_options.hpp>],
500
 
                               [boost::program_options::variables_map::variables_map dummy()])],
 
499
LIBS="${saved_LIBS} -lboost_program_options"
 
500
define([testprog], [AC_LANG_PROGRAM([#include <boost/program_options.hpp>],
 
501
                                   [boost::program_options::variables_map::variables_map dummy()])])
 
502
AC_LINK_IFELSE(testprog,
501
503
               [AC_MSG_RESULT([yes])
502
504
                BOOST_LIBS="${BOOST_LIBS} -lboost_program_options"],
 
505
LIBS="${saved_LIBS} -lboost_program_options-mt"
 
506
[AC_LINK_IFELSE(testprog,
 
507
               [AC_MSG_RESULT([yes])
 
508
                BOOST_LIBS="${BOOST_LIBS} -lboost_program_options-mt"],
503
509
               [AC_MSG_RESULT([no])
504
 
                AC_MSG_FAILURE([libboost_program_options (Boost C++ Libraries) is not installed, but is required by schroot])])
 
510
                AC_MSG_FAILURE([libboost_program_options (Boost C++ Libraries) is not installed, but is required by schroot])])])
505
511
LIBS="${saved_LIBS}"
506
512
 
507
513
AC_MSG_CHECKING([for boost::program_options::options_description::options() in -lboost_program_options])
508
514
saved_LIBS="${LIBS}"
509
 
LIBS="${LIBS} -lboost_program_options"
510
 
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/program_options.hpp>],
511
 
                               [boost::program_options::options_description testgrp("test group");
512
 
                                bool notused = testgrp.options().empty();
513
 
])],
 
515
LIBS="${saved_LIBS} -lboost_program_options"
 
516
define([testprog], [AC_LANG_PROGRAM([#include <boost/program_options.hpp>],
 
517
                                   [boost::program_options::options_description testgrp("test group");
 
518
                                    bool notused = testgrp.options().empty();
 
519
])])
 
520
AC_LINK_IFELSE(testprog,
 
521
               [AC_MSG_RESULT([yes])
 
522
                BOOST_PROGRAM_OPTIONS_DESCRIPTION_METHODS="current"],
 
523
LIBS="${saved_LIBS} -lboost_program_options"
 
524
[AC_LINK_IFELSE(testprog,
514
525
               [AC_MSG_RESULT([yes])
515
526
                BOOST_PROGRAM_OPTIONS_DESCRIPTION_METHODS="current"],
516
527
               [AC_MSG_RESULT([no])
517
 
                BOOST_PROGRAM_OPTIONS_DESCRIPTION_METHODS="old"])
 
528
                BOOST_PROGRAM_OPTIONS_DESCRIPTION_METHODS="old"])])
518
529
LIBS="${saved_LIBS}"
519
530
AH_TEMPLATE(BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD, [Set if boost::program_options::options_description::options() is not available])
520
531
if test "$BOOST_PROGRAM_OPTIONS_DESCRIPTION_METHODS" = "old"; then
523
534
 
524
535
AC_MSG_CHECKING([for boost::regex in -lboost_regex])
525
536
saved_LIBS="${LIBS}"
526
 
LIBS="${LIBS} -lboost_regex"
527
 
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/regex.hpp>],
528
 
                               [boost::regex("^foo[bar]$")])],
 
537
LIBS="${saved_LIBS} -lboost_regex"
 
538
define([testprog], [AC_LANG_PROGRAM([#include <boost/regex.hpp>],
 
539
                                   [boost::regex("^foo[bar]$")])])
 
540
AC_LINK_IFELSE(testprog,
529
541
               [AC_MSG_RESULT([yes])
530
542
                BOOST_LIBS="${BOOST_LIBS} -lboost_regex"],
 
543
LIBS="${saved_LIBS} -lboost_regex-mt"
 
544
[AC_LINK_IFELSE(testprog,
 
545
               [AC_MSG_RESULT([yes])
 
546
                BOOST_LIBS="${BOOST_LIBS} -lboost_regex-mt"],
531
547
               [AC_MSG_RESULT([no])
532
 
                AC_MSG_FAILURE([libboost_regex (Boost C++ Libraries) is not installed, but is required by schroot])])
 
548
                AC_MSG_FAILURE([libboost_regex (Boost C++ Libraries) is not installed, but is required by schroot])])])
533
549
LIBS="${saved_LIBS}"
534
550
 
535
551
AC_MSG_CHECKING([for boost::filesystem in -lboost_filesystem])
536
552
saved_LIBS="${LIBS}"
537
 
LIBS="${LIBS} -lboost_filesystem"
538
 
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/filesystem.hpp>],
539
 
                               [boost::filesystem::is_directory("/")])],
 
553
LIBS="${saved_LIBS} -lboost_filesystem"
 
554
define([testprog], [AC_LANG_PROGRAM([#include <boost/filesystem.hpp>],
 
555
                                   [boost::filesystem::is_directory("/")])])
 
556
AC_LINK_IFELSE(testprog,
540
557
               [AC_MSG_RESULT([yes])
541
558
                BOOST_FILESYSTEM_LIBS="-lboost_filesystem"],
 
559
LIBS="${saved_LIBS} -lboost_filesystem-mt"
 
560
[AC_LINK_IFELSE(testprog,
 
561
               [AC_MSG_RESULT([yes])
 
562
                BOOST_FILESYSTEM_LIBS="-lboost_filesystem-mt"],
542
563
               [AC_MSG_RESULT([no])
543
 
                AC_MSG_FAILURE([libboost_filesystem (Boost C++ Libraries) is not installed, but is required by schroot])])
 
564
                AC_MSG_FAILURE([libboost_filesystem (Boost C++ Libraries) is not installed, but is required by schroot])])])
544
565
LIBS="${saved_LIBS}"
545
566
 
546
567
AC_SUBST([BOOST_LIBS])