diff options
-rw-r--r-- | configure.ac | 42 | ||||
-rw-r--r-- | doc/version.texi | 4 |
2 files changed, 41 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 5d8a134..026af0d 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -412,15 +412,51 @@ fi | |||
412 | 412 | ||
413 | # check for gtk >= 2.6.0 | 413 | # check for gtk >= 2.6.0 |
414 | AC_MSG_CHECKING(for gtk) | 414 | AC_MSG_CHECKING(for gtk) |
415 | AM_PATH_GTK_2_0(2.6.0,without_gtk=false,without_gtk=true) | 415 | check_for_3=3.0.0 |
416 | check_for_2=false | ||
417 | AC_ARG_WITH(gtk_version, | ||
418 | [ --with-gtk-version=VERSION version number of gtk to use (>=3.0.0 by default)], | ||
419 | [AC_MSG_RESULT([$with_gtk_version]) | ||
420 | case $with_gtk_version in | ||
421 | *) | ||
422 | if test "x${with_gtk_version:0:1}" == "x2" | ||
423 | then | ||
424 | check_for_3=false | ||
425 | check_for_2=$with_gtk_version | ||
426 | elif test "x${with_gtk_version:0:1}" == "x3" | ||
427 | then | ||
428 | check_for_3=$with_gtk_version | ||
429 | check_for_2=false | ||
430 | fi | ||
431 | ;; | ||
432 | esac | ||
433 | ], | ||
434 | [AC_MSG_RESULT([--with-gtk-version not specified])]) | ||
435 | |||
436 | without_gtk=false | ||
437 | if test "x$check_for_3" != "xfalse" | ||
438 | then | ||
439 | AM_PATH_GTK_3_0([$check_for_3],without_gtk=false,) | ||
440 | fi | ||
441 | |||
442 | if test "x$without_gtk" == "xfalse" -a "x$check_for_2" != "xfalse" | ||
443 | then | ||
444 | AM_PATH_GTK_2_0([$check_for_2],without_gtk=false,) | ||
445 | fi | ||
446 | |||
416 | AM_CONDITIONAL(HAVE_GTK, test x$without_gtk != xtrue) | 447 | AM_CONDITIONAL(HAVE_GTK, test x$without_gtk != xtrue) |
417 | if test $without_gtk != true | 448 | if test $without_gtk != true |
418 | then | 449 | then |
419 | AC_DEFINE_UNQUOTED([HAVE_GTK], 1, [We have GTK]) | 450 | AC_DEFINE_UNQUOTED([HAVE_GTK], 1, [We have GTK]) |
420 | else | 451 | else |
421 | AM_CONDITIONAL(HAVE_GTK,false) | 452 | AC_MSG_ERROR(Cannot find GTK: Is pkg-config in path?) |
422 | fi | 453 | fi |
423 | 454 | ||
455 | CFLAGS="$CFLAGS $GTK_CFLAGS" | ||
456 | CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" | ||
457 | LIBS="$LIBS $GTK_LIBS" | ||
458 | |||
459 | |||
424 | AC_ARG_WITH([gstreamer], AS_HELP_STRING([--with-gstreamer], [Build with the GStreamer plugin]), [], [with_gstreamer=yes]) | 460 | AC_ARG_WITH([gstreamer], AS_HELP_STRING([--with-gstreamer], [Build with the GStreamer plugin]), [], [with_gstreamer=yes]) |
425 | 461 | ||
426 | have_gstreamer=no | 462 | have_gstreamer=no |
diff --git a/doc/version.texi b/doc/version.texi index 2ccb1da..09ade0a 100644 --- a/doc/version.texi +++ b/doc/version.texi | |||
@@ -1,4 +1,4 @@ | |||
1 | @set UPDATED 7 August 2012 | 1 | @set UPDATED 7 August 2012 |
2 | @set UPDATED-MONTH August 2012 | 2 | @set UPDATED-MONTH August 2012 |
3 | @set EDITION 0.6.3 | 3 | @set EDITION 0.7.0 |
4 | @set VERSION 0.6.3 | 4 | @set VERSION 0.7.0 |