diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-06-01 15:13:27 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:24 -0500 |
| commit | 9318fdbb3346da0374ab859055ea399dff86a861 (patch) | |
| tree | afd9d22a52e44edd2ab124e4831cff6d39dd0652 /source4/aclocal.m4 | |
| parent | 63990406aef0118d459b27e89b92f4d31c7a12fd (diff) | |
| download | samba-9318fdbb3346da0374ab859055ea399dff86a861.tar.gz samba-9318fdbb3346da0374ab859055ea399dff86a861.tar.bz2 samba-9318fdbb3346da0374ab859055ea399dff86a861.zip | |
r967: move some configure checks to seperate files
metze
(This used to be commit 2d109074e8be712a6eb0cfc76439176e3dcdee3a)
Diffstat (limited to 'source4/aclocal.m4')
| -rw-r--r-- | source4/aclocal.m4 | 72 |
1 files changed, 7 insertions, 65 deletions
diff --git a/source4/aclocal.m4 b/source4/aclocal.m4 index 4f42b50f84..e63ee54d8d 100644 --- a/source4/aclocal.m4 +++ b/source4/aclocal.m4 @@ -3,7 +3,6 @@ dnl if the cache file is inconsistent with the current host, dnl target and build system types, execute CMD or print a default dnl error message. AC_DEFUN(AC_VALIDATE_CACHE_SYSTEM_TYPE, [ - AC_REQUIRE([AC_CANONICAL_SYSTEM]) AC_MSG_CHECKING([config.cache system type]) if { test x"${ac_cv_host_system_type+set}" = x"set" && test x"$ac_cv_host_system_type" != x"$host"; } || @@ -560,69 +559,12 @@ if test "$2" != "/usr/lib" ; then fi ]) -dnl AC_ENABLE_SHARED - implement the --enable-shared flag -dnl Usage: AC_ENABLE_SHARED[(DEFAULT)] -dnl Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -dnl `yes'. -AC_DEFUN([AC_ENABLE_SHARED], -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(shared, -changequote(<<, >>)dnl -<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case $enableval in -yes) enable_shared=yes ;; -no) enable_shared=no ;; -*) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - - done - IFS="$ac_save_ifs" - ;; -esac], -enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl -]) - -dnl AC_ENABLE_STATIC - implement the --enable-static flag -dnl Usage: AC_ENABLE_STATIC[(DEFAULT)] -dnl Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -dnl `yes'. -AC_DEFUN([AC_ENABLE_STATIC], -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(static, -changequote(<<, >>)dnl -<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case $enableval in -yes) enable_static=yes ;; -no) enable_static=no ;; -*) - enable_static=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_static=AC_ENABLE_STATIC_DEFAULT)dnl -]) - -dnl AC_DISABLE_STATIC - set the default static flag to --disable-static -AC_DEFUN([AC_DISABLE_STATIC], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_STATIC(no)]) - sinclude(build/smb_build/public.m4) sinclude(build/smb_build/core.m4) +sinclude(build/smb_build/env.m4) +sinclude(build/smb_build/check_path.m4) +sinclude(build/smb_build/check_perl.m4) +sinclude(build/smb_build/check_cc.m4) +sinclude(build/smb_build/check_ld.m4) +sinclude(build/smb_build/check_shld.m4) +sinclude(build/smb_build/check_types.m4) |