diff options
| author | Glenn Morris | 2014-05-02 19:31:41 -0400 |
|---|---|---|
| committer | Glenn Morris | 2014-05-02 19:31:41 -0400 |
| commit | 53a7da76db34b7fa8b3702760024865e46efbc78 (patch) | |
| tree | 51eb1586787e0e1000d9c54c3478aaea33a6ccdb | |
| parent | ef9ea0a623c0b801b20ff54fa9318a74a84793f2 (diff) | |
| download | emacs-53a7da76db34b7fa8b3702760024865e46efbc78.tar.gz emacs-53a7da76db34b7fa8b3702760024865e46efbc78.zip | |
* configure.ac (PKG_CONFIG_PATH): Declare with AC_ARG_VAR.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 5 insertions, 0 deletions
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-05-02 Glenn Morris <rgm@gnu.org> | 1 | 2014-05-02 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * configure.ac (PKG_CONFIG_PATH): Declare with AC_ARG_VAR. | ||
| 4 | |||
| 3 | * configure.ac (--with-pkg-config-prog): Remove. | 5 | * configure.ac (--with-pkg-config-prog): Remove. |
| 4 | Use the PKG_CONFIG environment variable instead if you need it. | 6 | Use the PKG_CONFIG environment variable instead if you need it. |
| 5 | 7 | ||
diff --git a/configure.ac b/configure.ac index 81b8537f0bd..ee3216d63f4 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -1332,6 +1332,9 @@ AC_DEFINE_UNQUOTED(SYSTEM_TYPE, "$SYSTEM_TYPE", | |||
| 1332 | 1332 | ||
| 1333 | m4_pattern_forbid([^PKG_]) | 1333 | m4_pattern_forbid([^PKG_]) |
| 1334 | 1334 | ||
| 1335 | AC_ARG_VAR(PKG_CONFIG_PATH, [Colon-separated list of directories | ||
| 1336 | searched by pkg-config]) | ||
| 1337 | |||
| 1335 | pre_PKG_CONFIG_CFLAGS=$CFLAGS | 1338 | pre_PKG_CONFIG_CFLAGS=$CFLAGS |
| 1336 | pre_PKG_CONFIG_LIBS=$LIBS | 1339 | pre_PKG_CONFIG_LIBS=$LIBS |
| 1337 | 1340 | ||