diff options
| author | Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com> | 2013-10-14 15:01:39 +0000 |
|---|---|---|
| committer | Rich Johnston <rjohnston@sgi.com> | 2013-10-16 15:20:35 -0500 |
| commit | f1d5892e2883cf5df34d455b7beb7003f6e315e0 (patch) | |
| tree | 3cac3df6f89fe3d20016aa2a8a1eaaea5128dad6 /m4 | |
| parent | cd7eb340dd2eded93f41bc096954017e2f9fa58d (diff) | |
xfstests: Incorrect check for gdbm/ndbm.h
Current version of AC_PACKAGE_WANT_NDBM has following bugs:
* a typo (',') next to 'gdbm/ndbm.h', so C compiler fails
with a syntax error when trying to compile
"#include <gdbm/ndbm.h,>"
* autoconf never defines HAVE_GDBM_NDBM_H_ because it
converts both header names (gdbm/ndbm.h, gdbm-ndbm.h)
to GDBM_NDBM_H
Because of these bugs 'dbtest' can't be compiled on systems where
'gdbm-ndbm.h' header is absent but 'gdbm/ndbm.h' is present.
Fixed this.
Signed-off-by: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/package_gdbmdev.m4 | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/m4/package_gdbmdev.m4 b/m4/package_gdbmdev.m4 index c07f75d8..ae76e340 100644 --- a/m4/package_gdbmdev.m4 +++ b/m4/package_gdbmdev.m4 @@ -19,7 +19,18 @@ AC_DEFUN([AC_PACKAGE_WANT_NDBM], ]) AC_DEFUN([AC_PACKAGE_WANT_GDBM], - [ AC_CHECK_HEADERS([gdbm/ndbm.h, gdbm-ndbm.h], [ have_db=true ], [ have_db=false ]) + [ AC_CHECK_HEADER(gdbm-ndbm.h, [ gdbm_ndbm=true; have_db=true ], [ gdbm_ndbm=false; have_db=false ]) + + if test $gdbm_ndbm = true; then + AC_DEFINE(HAVE_GDBM_NDBM_H, [1], [Define to 1 if you have the <gdbm-ndbm.h> header file.]) + else + AS_UNSET([ac_cv_header_gdbm_ndbm_h]) + AC_CHECK_HEADER(gdbm/ndbm.h, [ gdbm_ndbm_=true; have_db=true ], [ gdbm_ndbm_=false; have_db=false ]) + if test $gdbm_ndbm_ = true; then + AC_DEFINE(HAVE_GDBM_NDBM_H_, [1], [Define to 1 if you have the <gdbm/ndbm.h> header file.]) + fi + fi + found=false libgdbm="" |