[25608] in Source-Commits
/svn/athena r25121 - in trunk/debathena/debathena/aclocal: aclocal debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Mon May 2 03:12:11 2011
Date: Mon, 2 May 2011 03:12:05 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <201105020712.p427C5ED007679@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2011-05-02 03:12:05 -0400 (Mon, 02 May 2011)
New Revision: 25121
Modified:
trunk/debathena/debathena/aclocal/aclocal/athena_com_err.m4
trunk/debathena/debathena/aclocal/debian/changelog
Log:
In aclocal:
* Make ATHENA_UTIL_COM_ERR use pkg-config to find com_err's location
(and set CFLAGS instead of CPPFLAGS as pkg-config wants), and prefix
CFLAGS and LDFLAGS so as to cause the normal com_err to be found in
preference to AFS' variant.
Modified: trunk/debathena/debathena/aclocal/aclocal/athena_com_err.m4
===================================================================
--- trunk/debathena/debathena/aclocal/aclocal/athena_com_err.m4 2011-05-02 05:50:44 UTC (rev 25120)
+++ trunk/debathena/debathena/aclocal/aclocal/athena_com_err.m4 2011-05-02 07:12:05 UTC (rev 25121)
@@ -17,7 +17,7 @@
dnl ATHENA_UTIL_COM_ERR
dnl Generates error if com_err not found.
dnl
-dnl All of the macros may extend CPPFLAGS and LDFLAGS to let the
+dnl All of the macros may extend CFLAGS and LDFLAGS to let the
dnl compiler find the requested libraries. Put ATHENA_UTIL_COM_ERR
dnl and ATHENA_UTIL_SS before ATHENA_AFS or ATHENA_AFS_REQUIRED; there
dnl is a com_err library in the AFS libraries which requires -lutil.
@@ -28,13 +28,13 @@
[AC_ARG_WITH(com_err,
[ --with-com_err=PREFIX Specify location of com_err],
[com_err="$withval"], [com_err=yes])
-if test "$com_err" != no; then
- if test "$com_err" != yes; then
- CPPFLAGS="$CPPFLAGS -I$com_err/include"
- LDFLAGS="$LDFLAGS -L$com_err/lib"
- fi
+AS_IF([test "$com_err" != no],
+ [AS_IF([test "$com_err" != yes],
+ [COM_ERR_CFLAGS="-I$com_err/include"
+ COM_ERR_LDFLAGS="-L$com_err/lib"])
+ PKG_CHECK_MODULES([COM_ERR], [com_err])
+ CFLAGS="$COM_ERR_CFLAGS $CFLAGS"
+ LDFLAGS="$COM_ERR_LDFLAGS $LDFLAGS"
AC_SEARCH_LIBS(com_err, com_err, ,
- [AC_MSG_ERROR(com_err library not found)])
-else
- AC_MSG_ERROR(This package requires com_err.)
-fi])
+ [AC_MSG_ERROR(com_err library not found)])],
+ [AC_MSG_ERROR(This package requires com_err.)])])
Modified: trunk/debathena/debathena/aclocal/debian/changelog
===================================================================
--- trunk/debathena/debathena/aclocal/debian/changelog 2011-05-02 05:50:44 UTC (rev 25120)
+++ trunk/debathena/debathena/aclocal/debian/changelog 2011-05-02 07:12:05 UTC (rev 25121)
@@ -1,3 +1,12 @@
+debathena-aclocal (1.1) unstable; urgency=low
+
+ * Make ATHENA_UTIL_COM_ERR use pkg-config to find com_err's location
+ (and set CFLAGS instead of CPPFLAGS as pkg-config wants), and prefix
+ CFLAGS and LDFLAGS so as to cause the normal com_err to be found in
+ preference to AFS' variant.
+
+ -- Geoffrey Thomas <geofft@mit.edu> Mon, 02 May 2011 03:09:53 -0400
+
debathena-aclocal (1.0) unstable; urgency=low
* Initial commit.
