← Back to branch summary

~ubuntu-branches/ubuntu/lucid/sawfish/lucid-updates

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Luis Rodrigo Gallardo Cruz
  • Date: 2009-03-05 11:53:27 UTC
  • mfrom: (1.2.8 upstream) (3.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090305115327-1r4yg4eeodiyzu6z
Tags: 1:1.3.4-1
http://bugs.debian.org/501092
http://bugs.debian.org/132236
* New upstream release (Closes: #501092).
 - Includes patch from upstream BTS to fix focus handling after move-window-*
 (Closes: #132236).
 - Bump build dependency on GTK+ to 2.6.
* Loosen quilt dependency.
* Add README.source. Bump Standards-Version to 3.8.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
18
18
dnl  along with sawmill; see the file COPYING.  If not, write to
19
19
dnl  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
20
20
 
21
 
AC_REVISION($Revision: 1.140 $)
 
21
AC_REVISION($Revision: 1.141 $)
22
22
 
23
23
AC_INIT(src/sawmill.h)
24
24
AC_CONFIG_HEADER(config.h)
25
25
AC_CONFIG_AUX_DIR(etc)
26
26
 
27
27
dnl Release versioning info
28
 
version="1.3.3"
 
28
version="1.3.4"
29
29
subversion=""
30
30
 
31
31
output_files="src/Makefile lisp/Makefile scripts/Makefile themes/Makefile\
129
129
CPPFLAGS="${_cppflags}"
130
130
 
131
131
dnl Checks for pango
132
 
PKG_CHECK_MODULES(PANGO, pango >= 1.2.0,
 
132
PKG_CHECK_MODULES(PANGO, pango >= 1.16.0,
133
133
  [if $PKG_CONFIG --exists pangoxft; then
134
134
     AC_DEFINE(HAVE_PANGO_XFT, 1)
135
135
     PANGO_MODULES="pangoxft pangox"
182
182
 [with_gdk_pixbuf=yes])
183
183
if test "$with_gdk_pixbuf" != "no"; then
184
184
  AC_MSG_CHECKING([for gdk_pixbuf (xlib version)])
185
 
    PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-xlib-2.0 >= 1.3.12)
 
185
    PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-xlib-2.0 >= 2.6.0)
186
186
    GDK_PIXBUF_VERSION=`pkg-config --modversion gdk-pixbuf-xlib-2.0`
187
187
    AC_SUBST(GDK_PIXBUF_VERSION)
188
188
    AC_SUBST(GDK_PIXBUF_CFLAGS)
226
226
AC_SUBST(IMAGE_LIBS)
227
227
AC_SUBST(IMAGE_CFLAGS)
228
228
 
229
 
AM_PATH_GTK_2_0(1.3.12)
 
229
AM_PATH_GTK_2_0(2.6.0)
230
230
 
231
231
AC_ARG_WITH(audiofile,
232
232
 [  --with-audiofile      Use libaudiofile for sound manipulation
248
248
    AC_DEFINE(HAVE_ESD)
249
249
fi
250
250
 
251
 
AC_ARG_ENABLE(capplet,
252
 
 [  --enable-capplet      Build the sawfish GNOME capplet [default]
253
 
  --disable-capplet       Don't built the capplet], [],
254
 
 [enable_capplet=no])
255
 
 
256
 
if test "$enable_capplet" = "yes"; then
257
 
  add_subdir "capplet"
258
 
fi
259
 
 
260
 
AC_ARG_ENABLE(themer,
261
 
 [  --enable-themer       Build the sawfish-themer program [default]
262
 
  --disable-themer        Don't build the themer], [],
263
 
 [enable_themer=yes])
264
 
 
265
 
if test "$enable_themer" = yes; then
266
 
  dnl configure redirects &5 to config.log
267
 
  AC_MSG_CHECKING([for rep-gtk libglade wrapper])
268
 
  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk.libglade 2>&5; then 
269
 
    AC_MSG_RESULT([yes])
270
 
    add_subdir "themer"
271
 
  else 
272
 
    AC_MSG_RESULT([no])
273
 
    AC_MSG_WARN([Can't load rep's libglade wrapper, not building themer])
274
 
  fi
275
 
fi
276
 
 
277
251
AC_ARG_ENABLE(gnome-widgets,
278
252
 [  --enable-gnome-widgets  Use GNOME widgets in places [default]
279
253
  --disable-gnome-widgets Don't use GNOME widgets], [],