diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2005-07-23 16:04:41 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2005-07-23 16:04:41 +0000 |
| commit | ae8ef7b8f5bdd1c53e0f6cb1e1fb1e58333b27a6 (patch) | |
| tree | 9887651d67be5ec7bb157ca93a4a673b84229cd8 | |
| parent | 05bce260dae5db93c178061d411b46b06e0c5e11 (diff) | |
Get rid of DEP_{CFLAGS,LIBS}. This is what was intended, but had a bug in
rev 1.2
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index db313a2..c669bd3 100644 --- a/configure.ac +++ b/configure.ac @@ -36,14 +36,16 @@ AC_CHECK_FUNCS([strlcpy]) dnl Required dependencies PKG_CHECK_MODULES(XCLOCK_X11, x11) XAW_CHECK_XPRINT_SUPPORT(XAW) +XCLOCK_CFLAGS="$XCLOCK_X11_CFLAGS $XAW_CFLAGS" +XCLOCK_LIBS="$XCLOCK_X11_LIBS $XAW_LIBS" dnl Optional dependencies AC_ARG_WITH(xft, AC_HELP_STRING([--with-xft],[Use Xft2 and Xrender for rendering (Default is YES)]),use_xft="$withval",use_xft="try") if test x$use_xft != xno ; then PKG_CHECK_MODULES(XFT, [xrender xft]) AC_SEARCH_LIBS(sqrt, [m]) - DEP_CFLAGS="$DEP_CFLAGS $XFT_CFLAGS" - DEP_LIBS="$DEP_LIBS $XFT_LIBS" + XCLOCK_CFLAGS="$XCLOCK_CFLAGS $XFT_CFLAGS" + XCLOCK_LIBS="$XCLOCK_LIBS $XFT_LIBS" AC_DEFINE([XRENDER],1,[Define to use X Render Extension]) AC_DEFINE([XFREE86_FT2],1,[Define to use Xft2 library]) fi @@ -51,14 +53,11 @@ fi AC_ARG_WITH(xkb, AC_HELP_STRING([--with-xkb],[Use XKB to sound bells (Default is YES)]),use_xkb="$withval",use_xkb="try") if test x$use_xkb != xno ; then PKG_CHECK_MODULES(XKB, xkbfile) - DEP_CFLAGS="$DEP_CFLAGS $XKB_CFLAGS" - DEP_LIBS="$DEP_LIBS $XKB_LIBS" + XCLOCK_CFLAGS="$XCLOCK_CFLAGS $XKB_CFLAGS" + XCLOCK_LIBS="$XCLOCK_LIBS $XKB_LIBS" AC_DEFINE([XKB],1,[Define to use XkbStdBell]) fi -XCLOCK_CFLAGS="$XCLOCK_X11_CFLAGS $XAW_CFLAGS $DEP_CFLAGS" -XCLOCK_LIBS="$XCLOCK_X11_LIBS $XAW_LIBS $DEP_LIBS" - AC_SUBST(XCLOCK_CFLAGS) AC_SUBST(XCLOCK_LIBS) |