* [PATCH] Incorrect check for gdbm/ndbm.h
@ 2013-10-09 10:01 Stanislav Kholmanskikh
2013-10-11 6:42 ` [PATCH RESEND] xfstests: " Stanislav Kholmanskikh
0 siblings, 1 reply; 6+ messages in thread
From: Stanislav Kholmanskikh @ 2013-10-09 10:01 UTC (permalink / raw)
To: xfs; +Cc: vasily.isaenko
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>
---
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 c07f75d..a57e3a2 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=""
--
1.7.1
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH RESEND] xfstests: Incorrect check for gdbm/ndbm.h
2013-10-09 10:01 [PATCH] Incorrect check for gdbm/ndbm.h Stanislav Kholmanskikh
@ 2013-10-11 6:42 ` Stanislav Kholmanskikh
2013-10-13 21:57 ` Dave Chinner
0 siblings, 1 reply; 6+ messages in thread
From: Stanislav Kholmanskikh @ 2013-10-11 6:42 UTC (permalink / raw)
To: xfs; +Cc: vasily.isaenko
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>
---
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 c07f75d..a57e3a2 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=""
--
1.7.1
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH RESEND] xfstests: Incorrect check for gdbm/ndbm.h
2013-10-11 6:42 ` [PATCH RESEND] xfstests: " Stanislav Kholmanskikh
@ 2013-10-13 21:57 ` Dave Chinner
2013-10-14 15:01 ` [PATCH RESEND V2] " Stanislav Kholmanskikh
0 siblings, 1 reply; 6+ messages in thread
From: Dave Chinner @ 2013-10-13 21:57 UTC (permalink / raw)
To: Stanislav Kholmanskikh; +Cc: vasily.isaenko, xfs
On Fri, Oct 11, 2013 at 10:42:31AM +0400, Stanislav Kholmanskikh wrote:
> 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>
> ---
> 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 c07f75d..a57e3a2 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])
Whitespace problem here.
Otherwise it looks fine.
Acked-by: Dave Chinner <dchinner@redhat.com>
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH RESEND V2] xfstests: Incorrect check for gdbm/ndbm.h
2013-10-13 21:57 ` Dave Chinner
@ 2013-10-14 15:01 ` Stanislav Kholmanskikh
2013-10-14 20:09 ` Dave Chinner
2013-10-16 20:39 ` Rich Johnston
0 siblings, 2 replies; 6+ messages in thread
From: Stanislav Kholmanskikh @ 2013-10-14 15:01 UTC (permalink / raw)
To: xfs; +Cc: vasily.isaenko
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>
---
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 c07f75d..ae76e34 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=""
--
1.7.1
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH RESEND V2] xfstests: Incorrect check for gdbm/ndbm.h
2013-10-14 15:01 ` [PATCH RESEND V2] " Stanislav Kholmanskikh
@ 2013-10-14 20:09 ` Dave Chinner
2013-10-16 20:39 ` Rich Johnston
1 sibling, 0 replies; 6+ messages in thread
From: Dave Chinner @ 2013-10-14 20:09 UTC (permalink / raw)
To: Stanislav Kholmanskikh; +Cc: vasily.isaenko, xfs
On Mon, Oct 14, 2013 at 07:01:39PM +0400, Stanislav Kholmanskikh wrote:
> 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>
Looks good now.
Reviewed-by: Dave Chinner <dchinner@redhat.com>
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH RESEND V2] xfstests: Incorrect check for gdbm/ndbm.h
2013-10-14 15:01 ` [PATCH RESEND V2] " Stanislav Kholmanskikh
2013-10-14 20:09 ` Dave Chinner
@ 2013-10-16 20:39 ` Rich Johnston
1 sibling, 0 replies; 6+ messages in thread
From: Rich Johnston @ 2013-10-16 20:39 UTC (permalink / raw)
To: Stanislav Kholmanskikh, xfs; +Cc: vasily.isaenko
This has been committed.
Thanks
--Rich
commit f1d5892e2883cf5df34d455b7beb7003f6e315e0
Author: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
Date: Mon Oct 14 15:01:39 2013 +0000
xfstests: Incorrect check for gdbm/ndbm.h
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-10-16 20:38 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-09 10:01 [PATCH] Incorrect check for gdbm/ndbm.h Stanislav Kholmanskikh
2013-10-11 6:42 ` [PATCH RESEND] xfstests: " Stanislav Kholmanskikh
2013-10-13 21:57 ` Dave Chinner
2013-10-14 15:01 ` [PATCH RESEND V2] " Stanislav Kholmanskikh
2013-10-14 20:09 ` Dave Chinner
2013-10-16 20:39 ` Rich Johnston
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox