aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Fernando J. Pereda <ferdy@ferdyx.org> 2008-09-03 16:39:34 +0000
committerAvatar Fernando J. Pereda <ferdy@ferdyx.org> 2008-09-03 17:57:36 +0000
commitb34bc4e363d0e5b5625eb4df029842b1efd25974 (patch)
tree77ed7011b4f2337681f31cff392c6a3f19db42c0
parent6829d50b86eda8a0055f30e312fca1853a1d557c (diff)
downloadpaludis-b34bc4e363d0e5b5625eb4df029842b1efd25974.tar.gz
paludis-b34bc4e363d0e5b5625eb4df029842b1efd25974.tar.xz
Append GITHEAD to PC_SLOT for development versions to avoid libtool fuckage.
-rw-r--r--configure.ac45
1 files changed, 26 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac
index 0c7d7f6..ef48754 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,8 +27,34 @@ AC_LANG([C++])
PALUDIS_CXXFLAGS=
+dnl {{{ git revision
+if test -d "${GIT_DIR:-${ac_top_srcdir:-./}/.git}" ; then
+ GITHEAD=`git describe 2>/dev/null`
+ if test -z ${GITHEAD} ; then
+ GITHEAD=`git rev-parse HEAD`
+ fi
+ if test -n "`git diff-index -m --name-only HEAD`" ; then
+ GITHEAD=${GITHEAD}-dirty
+ fi
+else
+ GITVERSION=
+fi
+AC_MSG_CHECKING([for git head])
+AC_ARG_WITH([git-head],
+ AS_HELP_STRING([--with-git-head], [Specify Git head]),
+ GITHEAD=`eval echo $withval`,
+ GITHEAD=`eval echo $GITHEAD`)
+AC_MSG_RESULT([$GITHEAD])
+AC_SUBST([GITHEAD])
+dnl }}}
+
PALUDIS_PC_VERSION="${VERSION_FULL}"
PALUDIS_PC_SLOT="${VERSION_MAJOR}.${VERSION_MINOR}"
+
+if [ $((VERSION_MINOR % 2)) == 1 ] ; then
+ PALUDIS_PC_SLOT="${PALUDIS_PC_SLOT}_"`printf "%.8s" ${GITHEAD}`
+fi
+
PALUDIS_PC_CFLAGS=
PALUDIS_PC_LIBS="-lpaludis_${PALUDIS_PC_SLOT} -lpaludisutil_${PALUDIS_PC_SLOT} -lpaludisargs_${PALUDIS_PC_SLOT}"
dnl }}}
@@ -1388,25 +1414,6 @@ BUILDHOST=`hostname`
AC_SUBST([BUILDHOST])
BUILDDATE=`date +%Y-%m-%dT%H:%M:%S%z`
AC_SUBST([BUILDDATE])
-
-if test -d "${GIT_DIR:-${ac_top_srcdir:-./}/.git}" ; then
- GITHEAD=`git describe 2>/dev/null`
- if test -z ${GITHEAD} ; then
- GITHEAD=`git rev-parse HEAD`
- fi
- if test -n "`git diff-index -m --name-only HEAD`" ; then
- GITHEAD=${GITHEAD}-dirty
- fi
-else
- GITVERSION=
-fi
-AC_MSG_CHECKING([for git head])
-AC_ARG_WITH([git-head],
- AS_HELP_STRING([--with-git-head], [Specify Git head]),
- GITHEAD=`eval echo $withval`,
- GITHEAD=`eval echo $GITHEAD`)
-AC_MSG_RESULT([$GITHEAD])
-AC_SUBST([GITHEAD])
dnl }}}
dnl {{{ output