← Back to branch summary

~ubuntu-branches/ubuntu/wily/wdm/wily-proposed

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Agustin Martin Domingo
  • Date: 2012-01-16 16:08:35 UTC
  • Revision ID: package-import@ubuntu.com-20120116160835-0ud3gu3jh3nihy8h
Tags: 1.28-9
http://bugs.debian.org/655800
* QA upload.
* debian/{rules,control}: Set compile/link flags to those
  provided by dpkg-buildflags. Needs a recent enough dpkg-dev.
* debian/rules:
  - Drop ancient and now unsupported --with-gfx-{incs,libs}.
    Set pixmaps dir with --with-gfxdir.
* 03_autoconf.patch:
  - Add test for wutils flags and libs, "wusleep" is now only
    in libWUtil. Hopefully (Closes: #655800).
  - Do not link against ICE,SM,Xft. xorg does not need it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
141
141
XCFLAGS="$X_CFLAGS"
142
142
XLDFLAGS="$X_LIBS"
143
143
XLIBS="$X_PRE_LIBS -lXext -lX11 -lXft -lm $X_EXTRA_LIBS"
 
144
# Debian only: For xorg we do not need all the libraries above
 
145
XLIBS="-lX11 $X_EXTRA_LIBS"
144
146
 
145
147
AC_ARG_ENABLE(xinerama,
146
148
        AC_HELP_STRING([--disable-xinerama],[explicit disable use of libXinerama]))
159
161
        AC_MSG_ERROR(['get-wings-flags' command was not found in \$PATH, please upgrade your WindowMaker.])
160
162
fi
161
163
 
162
 
WCFLAGS=`get-wings-flags --cflags`
163
 
WLDFLAGS=`get-wings-flags --ldflags`
164
 
WLIBS=`get-wings-flags --libs`
 
164
WCFLAGS="`get-wings-flags --cflags` `get-wutil-flags --cflags`"
 
165
WLDFLAGS="`get-wings-flags --ldflags` `get-wutil-flags --ldflags`"
 
166
WLIBS="`get-wings-flags --libs` `get-wutil-flags --libs`"
165
167
 
166
168
AC_SUBST(XLIBS)
167
169
AC_SUBST(XCFLAGS)