* [PATCH 0/2] Fix some autoconf issues
@ 2013-01-23 17:57 Danny Al-Gaaf
2013-01-23 17:57 ` [PATCH 1/2] configure: fix RPM_RELEASE Danny Al-Gaaf
2013-01-23 17:57 ` [PATCH 2/2] configure: remove -m4_include(m4/acx_pthread.m4) Danny Al-Gaaf
0 siblings, 2 replies; 4+ messages in thread
From: Danny Al-Gaaf @ 2013-01-23 17:57 UTC (permalink / raw)
To: ceph-devel; +Cc: Danny Al-Gaaf, Sage Weil
These patches contains some autoconf fixes/cleanups.
Danny Al-Gaaf (2):
configure: fix RPM_RELEASE
configure: remove -m4_include(m4/acx_pthread.m4)
configure.ac | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--
1.8.1.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] configure: fix RPM_RELEASE
2013-01-23 17:57 [PATCH 0/2] Fix some autoconf issues Danny Al-Gaaf
@ 2013-01-23 17:57 ` Danny Al-Gaaf
2013-01-23 17:57 ` [PATCH 2/2] configure: remove -m4_include(m4/acx_pthread.m4) Danny Al-Gaaf
1 sibling, 0 replies; 4+ messages in thread
From: Danny Al-Gaaf @ 2013-01-23 17:57 UTC (permalink / raw)
To: ceph-devel; +Cc: Danny Al-Gaaf, Sage Weil
Use git to get RPM_RELEASE only if this is a git repo
clone and if the git command is available on the system.
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---
configure.ac | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index b67e5cd..f87140f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,8 +12,15 @@ AC_PREREQ(2.59)
AC_INIT([ceph], [0.56], [ceph-devel@vger.kernel.org])
# Create release string. Used with VERSION for RPMs.
+RPM_RELEASE=0
AC_SUBST(RPM_RELEASE)
-RPM_RELEASE=`if expr index $(git describe --always) '-' > /dev/null ; then git describe --always | cut -d- -f2- | tr '-' '.' ; else echo "0"; fi`
+if test -d ".git" ; then
+ AC_CHECK_PROG(GIT_CHECK, git, yes)
+ if test x"$GIT_CHECK" = x"yes"; then
+ RPM_RELEASE=`if expr index $(git describe --always) '-' > /dev/null ; then git describe --always | cut -d- -f2- | tr '-' '.' ; else echo "0"; fi`
+ fi
+fi
+AC_MSG_NOTICE([RPM_RELEASE='$RPM_RELEASE'])
AC_CONFIG_MACRO_DIR([m4])
--
1.8.1.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] configure: remove -m4_include(m4/acx_pthread.m4)
2013-01-23 17:57 [PATCH 0/2] Fix some autoconf issues Danny Al-Gaaf
2013-01-23 17:57 ` [PATCH 1/2] configure: fix RPM_RELEASE Danny Al-Gaaf
@ 2013-01-23 17:57 ` Danny Al-Gaaf
2013-01-24 0:43 ` Gary Lowell
1 sibling, 1 reply; 4+ messages in thread
From: Danny Al-Gaaf @ 2013-01-23 17:57 UTC (permalink / raw)
To: ceph-devel; +Cc: Danny Al-Gaaf, Sage Weil
Since we use already AC_CONFIG_MACRO_DIR, no need to include m4/acx_pthread.m4
extra.
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---
configure.ac | 1 -
1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index f87140f..ffbd150 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,5 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-m4_include(m4/acx_pthread.m4)
# Autoconf
AC_PREREQ(2.59)
--
1.8.1.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] configure: remove -m4_include(m4/acx_pthread.m4)
2013-01-23 17:57 ` [PATCH 2/2] configure: remove -m4_include(m4/acx_pthread.m4) Danny Al-Gaaf
@ 2013-01-24 0:43 ` Gary Lowell
0 siblings, 0 replies; 4+ messages in thread
From: Gary Lowell @ 2013-01-24 0:43 UTC (permalink / raw)
To: Danny Al-Gaaf; +Cc: ceph-devel, Danny Al-Gaaf, Sage Weil
Hi Danny -
These two patches are now in the wip-rpm-update-2 branch. Will merge into master after build test.
Thanks,
Gary
On Jan 23, 2013, at 9:57 AM, Danny Al-Gaaf wrote:
> Since we use already AC_CONFIG_MACRO_DIR, no need to include m4/acx_pthread.m4
> extra.
>
> Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
> ---
> configure.ac | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index f87140f..ffbd150 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1,6 +1,5 @@
> # -*- Autoconf -*-
> # Process this file with autoconf to produce a configure script.
> -m4_include(m4/acx_pthread.m4)
>
> # Autoconf
> AC_PREREQ(2.59)
> --
> 1.8.1.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-01-24 0:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-23 17:57 [PATCH 0/2] Fix some autoconf issues Danny Al-Gaaf
2013-01-23 17:57 ` [PATCH 1/2] configure: fix RPM_RELEASE Danny Al-Gaaf
2013-01-23 17:57 ` [PATCH 2/2] configure: remove -m4_include(m4/acx_pthread.m4) Danny Al-Gaaf
2013-01-24 0:43 ` Gary Lowell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.