diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-02-06 02:10:27 -0500 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-02-06 13:20:23 +0100 |
| commit | b7f95244497a32f67f60ec16dabc665c05bab734 (patch) | |
| tree | 39e8eb8210d3c94cb067e055c56bd4e85d5247e4 /m4/ax_create_pkgconfig_info.m4 | |
| parent | 3d38b2f4cf512334b678afa0ba492b8dd897ddec (diff) | |
| download | autoconf-archive-b7f95244497a32f67f60ec16dabc665c05bab734.tar.gz | |
AX_CREATE_PKGCONFIG_INFO: don't add user CPPFLAGS/LDFLAGS to pc files
CPPFLAGS and LDFLAGS are settings that come from the user. These
should not be placed into .pc files. Since this helper already
provides variables for getting cflags/ldflags into the .pc file,
just punt the user sourcing.
Diffstat (limited to 'm4/ax_create_pkgconfig_info.m4')
| -rw-r--r-- | m4/ax_create_pkgconfig_info.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/m4/ax_create_pkgconfig_info.m4 b/m4/ax_create_pkgconfig_info.m4 index dc249b2..308e64f 100644 --- a/m4/ax_create_pkgconfig_info.m4 +++ b/m4/ax_create_pkgconfig_info.m4 @@ -14,8 +14,8 @@ # $2 = (empty) # $3 = $PACKAGE_LIBS $LIBS (as set at that point in configure.ac) # $4 = $PACKAGE_SUMMARY (or $1 Library) -# $5 = $CPPFLAGS $PACKAGE_CFLAGS (as set at the point in configure.ac) -# $6 = $LDFLAGS $PACKAGE_LDFLAGS (as set at the point in configure.ac) +# $5 = $PACKAGE_CFLAGS (as set at the point in configure.ac) +# $6 = $PACKAGE_LDFLAGS (as set at the point in configure.ac) # # PACKAGE_NAME defaults to $PACKAGE if not set. # PACKAGE_LIBS defaults to -l$PACKAGE_NAME if not set. @@ -58,7 +58,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 11 +#serial 12 AC_DEFUN([AX_CREATE_PKGCONFIG_INFO],[dnl AS_VAR_PUSHDEF([PKGCONFIG_suffix],[ax_create_pkgconfig_suffix])dnl @@ -147,13 +147,13 @@ PKGCONFIG_libs=`eval echo "$PKGCONFIG_libs"` AC_MSG_RESULT($PKGCONFIG_libs) AC_MSG_CHECKING(our pkgconfig cppflags) -PKGCONFIG_cppflags="ifelse($5,,$CPPFLAGS $PACKAGE_CFLAGS,$5)" +PKGCONFIG_cppflags="ifelse($5,,$PACKAGE_CFLAGS,$5)" PKGCONFIG_cppflags=`eval echo "$PKGCONFIG_cppflags"` PKGCONFIG_cppflags=`eval echo "$PKGCONFIG_cppflags"` AC_MSG_RESULT($PKGCONFIG_cppflags) AC_MSG_CHECKING(our pkgconfig ldflags) -PKGCONFIG_ldflags="ifelse($6,,$LDFLAGS $PACKAGE_LDFLAGS,$5)" +PKGCONFIG_ldflags="ifelse($6,,$PACKAGE_LDFLAGS,$5)" PKGCONFIG_ldflags=`eval echo "$PKGCONFIG_ldflags"` PKGCONFIG_ldflags=`eval echo "$PKGCONFIG_ldflags"` AC_MSG_RESULT($PKGCONFIG_ldflags) |