comparison configure.ac @ 21031:afb4704781ed

merge of '74f5f273ea24887c8df0384ce8795613dfbbd7ee' and 'df5eddde2a5d7ede22d8136c865b525bf6c0c677'
author Will Thompson <will.thompson@collabora.co.uk>
date Sat, 27 Oct 2007 17:47:48 +0000
parents 3cc856ca2338
children 9347a942b7cd
comparison
equal deleted inserted replaced
21023:42ecde230f91 21031:afb4704781ed
280 280
281 You must have the GLib 2.0 development headers installed to build. 281 You must have the GLib 2.0 development headers installed to build.
282 ])]) 282 ])])
283 AC_SUBST(GLIB_CFLAGS) 283 AC_SUBST(GLIB_CFLAGS)
284 AC_SUBST(GLIB_LIBS) 284 AC_SUBST(GLIB_LIBS)
285
286 AC_ARG_WITH([extraversion],
287 AC_HELP_STRING([--with-extraversion=STRING],
288 [extra version number to be displayed in Help->About and --help (for packagers)]),
289 EXTRA_VERSION=$withval)
290
291 if test x"$EXTRA_VERSION" != "x" ; then
292 AC_DEFINE_UNQUOTED(DISPLAY_VERSION, "$VERSION-$EXTRA_VERSION", [display version info])
293 else
294 AC_DEFINE_UNQUOTED(DISPLAY_VERSION, "$VERSION", [display version info])
295 fi
285 296
286 AC_ARG_WITH(x, [], 297 AC_ARG_WITH(x, [],
287 with_x="$withval", with_x="yes") 298 with_x="$withval", with_x="yes")
288 AC_ARG_ENABLE(gtkui, [AC_HELP_STRING([--disable-gtkui], 299 AC_ARG_ENABLE(gtkui, [AC_HELP_STRING([--disable-gtkui],
289 [compile without GTK+ user interface])], 300 [compile without GTK+ user interface])],