diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2016-09-04 18:29:49 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2016-09-04 18:29:49 +0100 |
| commit | 93199a5240a48f6eb79cb91bd89a7bbc289f2b56 (patch) | |
| tree | 2540fdb5e7bd7a5d18e6cd99d605e3780f02b830 /configure.ac | |
| parent | 7579656ff165620048b28829ad8aa10ba04d5ef9 (diff) | |
Unifdef XPM
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 737cd8f..b7b6ecd 100644 --- a/configure.ac +++ b/configure.ac @@ -69,9 +69,6 @@ CHOOSER_CFLAGS="$CHOOSER_CFLAGS" # Find needed libraries for TCP sockets (pre-pended in $LIBS) XTRANS_CONNECTION_FLAGS - - - # FIXME: Find better test for which OS'es use su -m - for now, just try to # mirror the Imakefile setting of: # if defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(DarwinArchitecture) @@ -238,19 +235,9 @@ if test "x$USE_XFT" = "xyes" ; then fi # XPM logos for the greeter screen -AC_ARG_ENABLE(xpm-logos, - AS_HELP_STRING([--enable-xpm-logos], - [Display xpm logos in greeter (default is YES)]), - [USE_XPM="$enableval"], - PKG_CHECK_EXISTS(xpm, [USE_XPM="yes"], [USE_XPM="no"])) -if test "x$USE_XPM" = "xyes" ; then - PKG_CHECK_MODULES(XPM, xpm) - GREETER_CFLAGS="$GREETER_CFLAGS $XPM_CFLAGS" - GREETER_LIBS="$GREETER_LIBS $XPM_LIBS" - AC_DEFINE([XPM], 1, - [Define to 1 to display XPM logos on greeter screen]) -fi -AM_CONDITIONAL(USE_XPM, test "x$USE_XPM" = "xyes") +PKG_CHECK_MODULES(XPM, xpm) +GREETER_CFLAGS="$GREETER_CFLAGS $XPM_CFLAGS" +GREETER_LIBS="$GREETER_LIBS $XPM_LIBS" AC_ARG_WITH(color-pixmap, AS_HELP_STRING([--with-color-pixmap=<filename>], |