diff options
| author | Simon Tatham <anakin@pobox.com> | 2015-10-03 12:28:28 +0100 |
|---|---|---|
| committer | Simon Tatham <anakin@pobox.com> | 2015-10-03 16:07:20 +0100 |
| commit | 9df80d7587f9d0060ab74d3cb862e438a9f79291 (patch) | |
| tree | 6e4a61899e8fc4977b2fb044444c450523da62e2 | |
| parent | 41cc7c868f72e3131a3d45e38994e9d473824bd1 (diff) | |
| download | puzzles-9df80d7587f9d0060ab74d3cb862e438a9f79291.zip puzzles-9df80d7587f9d0060ab74d3cb862e438a9f79291.tar.gz puzzles-9df80d7587f9d0060ab74d3cb862e438a9f79291.tar.bz2 puzzles-9df80d7587f9d0060ab74d3cb862e438a9f79291.tar.xz | |
GTK 3 port: arrange configure.ac support for GTK 2/3 detection.
GTK 3 is the default, falling back to GTK 2 if 3 isn't available; you
can also say --with-gtk=2 to force GTK 2.
| -rw-r--r-- | configure.ac | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c5bb6f9..3a38c95 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,40 @@ AC_INIT([puzzles], [6.66], [anakin@pobox.com]) AC_CONFIG_SRCDIR([midend.c]) AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC -AM_PATH_GTK_2_0([2.0.0]) + +AC_ARG_WITH([gtk], + [AS_HELP_STRING([--with-gtk=VER], + [specify GTK version to use (`2' or `3')])], + [gtk_version_desired="$withval"], + [gtk_version_desired="any"]) + +case "$gtk_version_desired" in + 2 | 3 | any) ;; + yes) gtk_version_desired="any" ;; + *) AC_ERROR([Invalid GTK version specified]) +esac + +gtk=none + +case "$gtk_version_desired:$gtk" in + 3:none | any:none) + ifdef([AM_PATH_GTK_3_0],[ + AM_PATH_GTK_3_0([3.0.0], [gtk=3], []) + ],[AC_WARNING([generating configure script without GTK 3 autodetection])]) + ;; +esac + +case "$gtk_version_desired:$gtk" in + 2:none | any:none) + ifdef([AM_PATH_GTK_2_0],[ + AM_PATH_GTK_2_0([2.0.0], [gtk=2], []) + ],[AC_WARNING([generating configure script without GTK 2 autodetection])]) + ;; +esac + +if test "$gtk" = "none"; then + AC_MSG_ERROR([cannot build without GTK 2 or GTK 3]) +fi if test "x$GCC" = "xyes"; then AC_MSG_CHECKING([for usable gcc warning flags]) |