diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-01-16 09:00:04 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-01-16 09:00:04 +1100 |
commit | c92a1d0752abf42a76e16e7c19229841ac35dc81 (patch) | |
tree | f5702890d17180c6b33285c14b05bc53b0ca629c /source4/lib/replace/getpass.m4 | |
parent | 955b110818c00170f7b93d2975de467551c8bc06 (diff) | |
parent | b1fcae724156c2b25f41264943cf4cec8fe68821 (diff) | |
download | samba-c92a1d0752abf42a76e16e7c19229841ac35dc81.tar.gz samba-c92a1d0752abf42a76e16e7c19229841ac35dc81.tar.bz2 samba-c92a1d0752abf42a76e16e7c19229841ac35dc81.zip |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit d8a805a2544c8864136f77e9086b2a01ae79a1d5)
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 |