diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 88 |
1 files changed, 19 insertions, 69 deletions
diff --git a/configure.ac b/configure.ac index 7acd57557495..043aed5b369a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,6 @@ -AC_INIT(nix, m4_esyscmd([echo -n $(cat ./version)$VERSION_SUFFIX])) +AC_INIT(nix, m4_esyscmd([bash -c "echo -n $(cat ./version)$VERSION_SUFFIX"])) AC_CONFIG_SRCDIR(README) AC_CONFIG_AUX_DIR(config) -AM_INIT_AUTOMAKE([dist-bzip2 foreign]) - -AC_DEFINE_UNQUOTED(NIX_VERSION, ["$VERSION"], [Nix version.]) AC_PROG_SED @@ -50,17 +47,6 @@ AC_DEFINE_UNQUOTED(SYSTEM, ["$system"], [platform identifier (`cpu-os')]) test "$localstatedir" = '${prefix}/var' && localstatedir=/nix/var -# Windows-specific stuff. On Cygwin, dynamically linking against the -# ATerm DLL works, except that it requires the ATerm "lib" directory -# to be in $PATH, as Windows doesn't have anything like an RPATH -# embedded in executable. Since this is kind of annoying, we use -# static libraries for now. -if test "$sys_name" = "cygwin"; then - AC_DISABLE_SHARED - AC_ENABLE_STATIC -fi - - # Solaris-specific stuff. if test "$sys_name" = sunos; then # Solaris requires -lsocket -lnsl for network functions @@ -73,21 +59,6 @@ CXXFLAGS=${CXXFLAGS:--g -O3 -Wall} AC_PROG_CC AC_PROG_CXX -# To build programs to be run in the build machine. -if test "$CC_FOR_BUILD" = ""; then - if test "$cross_compiling" = "yes"; then - AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc) - else - CC_FOR_BUILD="$CC" - fi -fi -AC_SUBST([CC_FOR_BUILD]) - -# We are going to use libtool. -AC_DISABLE_STATIC -AC_ENABLE_SHARED -AC_PROG_LIBTOOL - # Use 64-bit file system calls so that we can support files > 2 GiB. AC_SYS_LARGEFILE @@ -209,7 +180,7 @@ AC_MSG_RESULT(yes) AC_MSG_CHECKING([for the Perl installation prefix]) perlversion=$($perl -e 'use Config; print $Config{version};') perlarchname=$($perl -e 'use Config; print $Config{archname};') -AC_SUBST(perllibdir, [$\(libdir\)/perl5/site_perl/$perlversion/$perlarchname]) +AC_SUBST(perllibdir, [${libdir}/perl5/site_perl/$perlversion/$perlarchname]) AC_MSG_RESULT($perllibdir) @@ -232,12 +203,6 @@ AC_ARG_WITH(docbook-xsl, AC_HELP_STRING([--with-docbook-xsl=PATH], AC_SUBST(docbookxsl) -AC_ARG_WITH(xml-flags, AC_HELP_STRING([--with-xml-flags=FLAGS], - [extra flags to be passed to xmllint and xsltproc]), - xmlflags=$withval, xmlflags=) -AC_SUBST(xmlflags) - - AC_ARG_WITH(store-dir, AC_HELP_STRING([--with-store-dir=PATH], [path of the Nix store (defaults to /nix/store)]), storedir=$withval, storedir='/nix/store') @@ -245,15 +210,15 @@ AC_SUBST(storedir) # Look for OpenSSL, an optional dependency. -AC_PATH_PROG(openssl_prog, openssl, openssl) # if not found, call openssl in $PATH -AC_SUBST(openssl_prog) -AC_DEFINE_UNQUOTED(OPENSSL_PATH, ["$openssl_prog"], [Path of the OpenSSL binary]) +AC_PATH_PROG(openssl, openssl, openssl) # if not found, call openssl in $PATH +AC_SUBST(openssl) +AC_DEFINE_UNQUOTED(OPENSSL_PATH, ["$openssl"], [Path of the OpenSSL binary]) PKG_CHECK_MODULES([OPENSSL], [libcrypto], [AC_DEFINE([HAVE_OPENSSL], [1], [Whether to use OpenSSL.]) CXXFLAGS="$OPENSSL_CFLAGS $CXXFLAGS" - have_openssl=1], [true]) -AM_CONDITIONAL(HAVE_OPENSSL, test "$have_openssl" = 1) + have_openssl=1], [have_openssl=]) +AC_SUBST(HAVE_OPENSSL, [$have_openssl]) # Look for libbz2, a required dependency. @@ -319,7 +284,6 @@ if test "$enable_shared" = no; then # Perl bindings require shared libraries. perlbindings=no fi -AM_CONDITIONAL(PERL_BINDINGS, test "$perlbindings" = "yes") AC_SUBST(perlbindings) AC_MSG_RESULT($perlbindings) @@ -327,7 +291,7 @@ AC_MSG_RESULT($perlbindings) AC_ARG_ENABLE(init-state, AC_HELP_STRING([--disable-init-state], [do not initialise DB etc. in `make install']), init_state=$enableval, init_state=yes) -AM_CONDITIONAL(INIT_STATE, test "$init_state" = "yes") +#AM_CONDITIONAL(INIT_STATE, test "$init_state" = "yes") # Setuid installations. @@ -361,29 +325,15 @@ fi AC_SUBST(tarFlags) -AM_CONFIG_HEADER([config.h]) -AC_CONFIG_FILES([Makefile - src/Makefile - src/boost/Makefile - src/boost/format/Makefile - src/libutil/Makefile - src/libstore/Makefile - src/libmain/Makefile - src/nix-store/Makefile - src/nix-hash/Makefile - src/libexpr/Makefile - src/nix-instantiate/Makefile - src/nix-env/Makefile - src/nix-daemon/Makefile - src/nix-log2xml/Makefile - src/bsdiff-4.3/Makefile - perl/Makefile - scripts/Makefile - corepkgs/Makefile - doc/Makefile - doc/manual/Makefile - misc/Makefile - misc/emacs/Makefile - tests/Makefile - ]) +# Expand all variables in config.status. +test "$prefix" = NONE && prefix=$ac_default_prefix +test "$exec_prefix" = NONE && exec_prefix='${prefix}' +for name in $ac_subst_vars; do + declare $name="$(eval echo "${!name}")" + declare $name="$(eval echo "${!name}")" + declare $name="$(eval echo "${!name}")" +done + +AC_CONFIG_HEADER([config.h]) +AC_CONFIG_FILES([]) AC_OUTPUT |