|
47 | 47 | AC_MSG_ERROR(Gpredict requires libglib-dev 2.40 or later) |
48 | 48 | fi |
49 | 49 |
|
50 | | -# check for goocanvas 2 or 3 (depends on gtk and glib) |
51 | | -if $PKG_CONFIG --atleast-version=2.0 goocanvas-2.0; then |
52 | | - CFLAGS="$CFLAGS `$PKG_CONFIG --cflags goocanvas-2.0`" |
53 | | - LIBS="$LIBS `$PKG_CONFIG --libs goocanvas-2.0`" |
54 | | - havegoocanvas2=true |
| 50 | +# check for gtk+ 3.0 or later |
| 51 | +if $PKG_CONFIG --atleast-version=3.0 gtk+-3.0; then |
| 52 | + CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gtk+-3.0`" |
| 53 | + LIBS="$LIBS `$PKG_CONFIG --libs gtk+-3.0`" |
55 | 54 | else |
56 | | - if $PKG_CONFIG --atleast-version=3.0 goocanvas-3.0; then |
57 | | - CFLAGS="$CFLAGS `$PKG_CONFIG --cflags goocanvas-3.0`" |
58 | | - LIBS="$LIBS `$PKG_CONFIG --libs goocanvas-3.0`" |
59 | | - havegoocanvas3=true |
60 | | - else |
61 | | - AC_MSG_ERROR(Gpredict requires libgoocanvas-2.0-dev) |
62 | | - fi |
| 55 | + AC_MSG_ERROR(Gpredict requires libgtk-3-dev) |
63 | 56 | fi |
64 | 57 |
|
65 | 58 | # check for libgps (optional) |
@@ -103,12 +96,6 @@ GTHR_V=`$PKG_CONFIG --modversion gthread-2.0` |
103 | 96 | GDK_V=`$PKG_CONFIG --modversion gdk-3.0` |
104 | 97 | GTK_V=`$PKG_CONFIG --modversion gtk+-3.0` |
105 | 98 | CURL_V=`$PKG_CONFIG --modversion libcurl` |
106 | | -if test "$havegoocanvas2" = true ; then |
107 | | - GOOC_V=`$PKG_CONFIG --modversion goocanvas-2.0` |
108 | | -fi |
109 | | -if test "$havegoocanvas3" = true ; then |
110 | | - GOOC_V=`$PKG_CONFIG --modversion goocanvas-3.0` |
111 | | -fi |
112 | 99 | if test "$havelibgps" = true ; then |
113 | 100 | GPS_V=`$PKG_CONFIG --modversion libgps` |
114 | 101 | fi |
@@ -148,7 +135,6 @@ echo Gio version........ : $GIO_V |
148 | 135 | echo Gthread version.... : $GTHR_V |
149 | 136 | echo Gdk version........ : $GDK_V |
150 | 137 | echo Gtk+ version....... : $GTK_V |
151 | | -echo GooCanvas version.. : $GOOC_V |
152 | 138 | echo Libcurl version.... : $CURL_V |
153 | 139 | if test "$havelibgps" = true ; then |
154 | 140 | echo Libgps version..... : $GPS_V |
|
0 commit comments