diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-01-16 09:26:24 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-01-16 09:26:24 +1100 |
commit | e02e67ec36ecc5f5af2fcf3a7c6b0282173df8aa (patch) | |
tree | 0e615183dba95d8268b8e9bd553928581eca1ccb /source4/lib/replace/getpass.m4 | |
parent | 9ff39862266f19c2a8e0243ec97ea8d7c463c3ef (diff) | |
parent | c92a1d0752abf42a76e16e7c19229841ac35dc81 (diff) | |
download | samba-e02e67ec36ecc5f5af2fcf3a7c6b0282173df8aa.tar.gz samba-e02e67ec36ecc5f5af2fcf3a7c6b0282173df8aa.tar.bz2 samba-e02e67ec36ecc5f5af2fcf3a7c6b0282173df8aa.zip |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit c4aba5ad01f5095ad7a9d0d0f1e3c6afedbbd9b7)
Diffstat (limited to 'source4/lib/replace/getpass.m4')
-rw-r--r-- | source4/lib/replace/getpass.m4 | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source4/lib/replace/getpass.m4 b/source4/lib/replace/getpass.m4 index 17dfdf7bf5..c4da9aae59 100644 --- a/source4/lib/replace/getpass.m4 +++ b/source4/lib/replace/getpass.m4 @@ -1,3 +1,11 @@ +AC_CHECK_FUNC(getpass, samba_cv_HAVE_GETPASS=yes) +AC_CHECK_FUNC(getpassphrase, samba_cv_HAVE_GETPASSPHRASE=yes) +if test x"$samba_cv_HAVE_GETPASS" = x"yes" -a x"$samba_cv_HAVE_GETPASSPHRASE" = x"yes"; then + AC_DEFINE(REPLACE_GETPASS_BY_GETPASSPHRASE, 1, [getpass returns <9 chars where getpassphrase returns <265 chars]) + AC_DEFINE(REPLACE_GETPASS,1,[Whether getpass should be replaced]) + LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o" +else + AC_CACHE_CHECK([whether getpass should be replaced],samba_cv_REPLACE_GETPASS,[ SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$libreplacedir/" @@ -12,3 +20,5 @@ if test x"$samba_cv_REPLACE_GETPASS" = x"yes"; then AC_DEFINE(REPLACE_GETPASS,1,[Whether getpass should be replaced]) LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o" fi + +fi |