diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-08-08 10:15:51 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-08-08 10:15:51 -0400 |
| commit | 85b1eda6ac104850add5a98fc4caca7f59d7cb19 (patch) | |
| tree | 6414003e4a08a107d804b75b6bf85db109fa2a0b | |
| parent | d4de9e32fd109562a31609b338843b396c848995 (diff) | |
config: merge BITMAP dependencies into one statement
PKG_CHECK_MODULES will merge -I and lib directives.
It will also AC_SUBST BITMAP_CFLAGS and BITMAP_LIBS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 3f3f390..d60e416 100644 --- a/configure.ac +++ b/configure.ac @@ -38,29 +38,13 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_INSTALL - AC_CHECK_FUNC([mkstemp], AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the "mkstemp" function.])) -# bmtoa checks for packages +# Obtain compiler/linker options from depedencies PKG_CHECK_MODULES(BMTOA, x11 xmu) -AC_SUBST(BMTOA_CFLAGS) -AC_SUBST(BMTOA_LIBS) - -# atobm checks for packages PKG_CHECK_MODULES(ATOBM, x11) -AC_SUBST(ATOBM_CFLAGS) -AC_SUBST(ATOBM_LIBS) - -# bitmap checks for packages -PKG_CHECK_MODULES(BITMAP, xaw7 xmu) -PKG_CHECK_MODULES(XBITMAPS, xbitmaps) - -BITMAP_CFLAGS="$BITMAP_CFLAGS $XBITMAPS_CFLAGS" -BITMAP_LIBS="$BITMAP_LIBS $XBITMAPS_LIBS" - -AC_SUBST(BITMAP_CFLAGS) -AC_SUBST(BITMAP_LIBS) +PKG_CHECK_MODULES(BITMAP, xbitmaps xaw7 xmu) PKG_CHECK_MODULES(APPDEFS, xt) xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` |