← 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): Kees Cook
  • Date: 2010-06-09 16:01:50 UTC
  • mfrom: (1.1.22 upstream) (2.2.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100609160150-z46e8nxjxo7ed9jf
Tags: 1.4.2-1ubuntu1
* Merge from debian unstable.  Remaining changes:
  - debian/rules: don't build the docs on armel, fixes FTBFS.
* debian/rules: allow for parallel builds.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
258
258
AC_PROG_CXX
259
259
AC_LANG([C++])
260
260
ACX_PTHREAD([], [AC_MSG_ERROR([POSIX thread support is required for correct std::tr1::shared_ptr operation])])
 
261
AC_CANONICAL_HOST
261
262
AC_DISABLE_SHARED
262
263
AC_ENABLE_STATIC
263
264
AC_PROG_LIBTOOL
277
278
fi;
278
279
AM_CONDITIONAL([BUILD_DOXYGEN], [test -n "$DOXYGEN" && test "$enable_doxygen" = "yes"])
279
280
 
 
281
 
 
282
# Check for host platform
 
283
AC_MSG_CHECKING([for supported host platform type])
 
284
PLATFORM="generic"
 
285
case $host_os in
 
286
    linux*):
 
287
        PLATFORM="linux";;
 
288
    freebsd* | k*bsd*-gnu) :
 
289
        PLATFORM="freebsd";;
 
290
esac
 
291
AC_MSG_RESULT([$PLATFORM])
 
292
AC_SUBST([PLATFORM], [$PLATFORM])
 
293
 
 
294
AM_CONDITIONAL([PLATFORM_GENERIC], [test "$PLATFORM" = "generic"])
 
295
AM_CONDITIONAL([PLATFORM_LINUX], [test "$PLATFORM" = "linux"])
 
296
AM_CONDITIONAL([PLATFORM_FREEBSD], [test "$PLATFORM" = "freebsd"])
 
297
 
 
298
AH_TEMPLATE(SBUILD_PLATFORM, [Platform type, used to modify run-time platform-specific behaviour])
 
299
AC_DEFINE_UNQUOTED(SBUILD_PLATFORM, ["$PLATFORM"])
 
300
 
 
301
AH_TEMPLATE(SBUILD_HOST, [Host GNU architecture triplet])
 
302
AH_TEMPLATE(SBUILD_HOST_OS, [Host OS])
 
303
AH_TEMPLATE(SBUILD_HOST_VENDOR, [Host vendor])
 
304
AH_TEMPLATE(SBUILD_HOST_CPU, [Host CPU])
 
305
AC_DEFINE_UNQUOTED(SBUILD_HOST, ["$host"])
 
306
AC_DEFINE_UNQUOTED(SBUILD_HOST_OS, ["$host_os"])
 
307
AC_DEFINE_UNQUOTED(SBUILD_HOST_VENDOR, ["$host_vendor"])
 
308
AC_DEFINE_UNQUOTED(SBUILD_HOST_CPU, ["$host_cpu"])
 
309
 
 
310
 
280
311
# Checks for libraries.
281
312
PKG_CHECK_MODULES([UUID], [uuid],
282
313
                  [AC_DEFINE(HAVE_UUID)
532
563
  AC_DEFINE(BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD, 1)
533
564
fi
534
565
 
 
566
AC_MSG_CHECKING([for boost::program_options::validation_error in -lboost_program_options])
 
567
saved_LIBS="${LIBS}"
 
568
LIBS="${saved_LIBS} -lboost_program_options"
 
569
define([boost_error], [AC_LANG_PROGRAM([#include <boost/program_options.hpp>],
 
570
                                   [boost::program_options::validation_error err(boost::program_options::validation_error::invalid_option, "error");
 
571
])])
 
572
define([boost_error_old], [AC_LANG_PROGRAM([#include <boost/program_options.hpp>],
 
573
                                   [boost::program_options::validation_error err("error");
 
574
])])
 
575
AC_LINK_IFELSE(boost_error,
 
576
               [AC_MSG_RESULT([yes (Boost >= 1.42)])
 
577
                BOOST_PROGRAM_OPTIONS_VALIDATION_ERROR="current"],
 
578
LIBS="${saved_LIBS} -lboost_program_options"
 
579
[AC_LINK_IFELSE(boost_error_old,
 
580
               [AC_MSG_RESULT([yes (Boost < 1.42)])
 
581
                BOOST_PROGRAM_OPTIONS_VALIDATION_ERROR="old"],
 
582
               [AC_MSG_RESULT([no])
 
583
                AC_MSG_FAILURE([libboost_program_options (Boost C++ Libraries) is not installed, but is required by schroot])])])
 
584
LIBS="${saved_LIBS}"
 
585
AH_TEMPLATE(BOOST_PROGRAM_OPTIONS_VALIDATION_ERROR_OLD, [Set if boost::program_options::validation error uses old construction semantics])
 
586
if test "$BOOST_PROGRAM_OPTIONS_VALIDATION_ERROR" = "old"; then
 
587
  AC_DEFINE(BOOST_PROGRAM_OPTIONS_VALIDATION_ERROR_OLD, 1)
 
588
fi
 
589
 
535
590
AC_MSG_CHECKING([for boost::regex in -lboost_regex])
536
591
saved_LIBS="${LIBS}"
537
592
LIBS="${saved_LIBS} -lboost_regex"
754
809
AC_CONFIG_FILES([bin/dchroot/Makefile])
755
810
AC_CONFIG_FILES([bin/dchroot-dsa/Makefile])
756
811
AC_CONFIG_FILES([bin/csbuild/Makefile])
 
812
AC_CONFIG_FILES([contrib/Makefile])
 
813
AC_CONFIG_FILES([contrib/setup.d/Makefile])
757
814
AC_CONFIG_FILES([etc/Makefile])
 
815
AC_CONFIG_FILES([etc/default/Makefile])
 
816
AC_CONFIG_FILES([etc/default/freebsd/Makefile])
 
817
AC_CONFIG_FILES([etc/default/generic/Makefile])
 
818
AC_CONFIG_FILES([etc/default/linux/Makefile])
758
819
AC_CONFIG_FILES([etc/pam/Makefile])
759
820
AC_CONFIG_FILES([etc/setup.d/Makefile])
760
821
AC_CONFIG_FILES([etc/bash_completion/Makefile])