port to gtk+-3.0

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
This commit is contained in:
Marc-Antoine Perennou 2012-06-01 11:17:16 +02:00 committed by Tanu Kaskinen
parent 7e1ebf9455
commit 874bceb84d
2 changed files with 18 additions and 18 deletions

View file

@ -842,22 +842,22 @@ AC_SUBST(HAVE_GLIB20)
AM_CONDITIONAL([HAVE_GLIB20], [test "x$HAVE_GLIB20" = x1])
AS_IF([test "x$HAVE_GLIB20" = "x1"], AC_DEFINE([HAVE_GLIB], 1, [Have GLIB?]))
#### GTK2 support (optional) ####
#### GTK3 support (optional) ####
AC_ARG_ENABLE([gtk2],
AS_HELP_STRING([--disable-gtk2],[Disable optional Gtk+ 2 support]))
AC_ARG_ENABLE([gtk3],
AS_HELP_STRING([--disable-gtk3],[Disable optional Gtk+ 3 support]))
AS_IF([test "x$enable_gtk2" != "xno"],
[PKG_CHECK_MODULES(GTK20, [ gtk+-2.0 >= 2.4.0 ], HAVE_GTK20=1, HAVE_GTK20=0)],
HAVE_GTK20=0)
AS_IF([test "x$enable_gtk3" != "xno"],
[PKG_CHECK_MODULES(GTK30, [ gtk+-3.0 ], HAVE_GTK30=1, HAVE_GTK30=0)],
HAVE_GTK30=0)
AS_IF([test "x$enable_gtk2" = "xyes" && test "x$HAVE_GTK20" = "x0"],
[AC_MSG_ERROR([*** Gtk+ 2 support not found])])
AS_IF([test "x$enable_gtk3" = "xyes" && test "x$HAVE_GTK30" = "x0"],
[AC_MSG_ERROR([*** Gtk+ 3 support not found])])
AC_SUBST(GTK20_CFLAGS)
AC_SUBST(GTK20_LIBS)
AM_CONDITIONAL([HAVE_GTK20], [test "x$HAVE_GTK20" = x1])
AS_IF([test "x$HAVE_GTK20" = "x1"], AC_DEFINE([HAVE_GTK], 1, [Have GTK?]))
AC_SUBST(GTK30_CFLAGS)
AC_SUBST(GTK30_LIBS)
AM_CONDITIONAL([HAVE_GTK30], [test "x$HAVE_GTK30" = x1])
AS_IF([test "x$HAVE_GTK30" = "x1"], AC_DEFINE([HAVE_GTK], 1, [Have GTK?]))
#### GConf support (optional) ####
@ -1411,7 +1411,7 @@ AS_IF([test "x$HAVE_COREAUDIO" = "x1"], ENABLE_COREAUDIO=yes, ENABLE_COREAUDIO=n
AS_IF([test "x$HAVE_SOLARIS" = "x1"], ENABLE_SOLARIS=yes, ENABLE_SOLARIS=no)
AS_IF([test "x$HAVE_WAVEOUT" = "x1"], ENABLE_WAVEOUT=yes, ENABLE_WAVEOUT=no)
AS_IF([test "x$HAVE_GLIB20" = "x1"], ENABLE_GLIB20=yes, ENABLE_GLIB20=no)
AS_IF([test "x$HAVE_GTK20" = "x1"], ENABLE_GTK20=yes, ENABLE_GTK20=no)
AS_IF([test "x$HAVE_GTK30" = "x1"], ENABLE_GTK30=yes, ENABLE_GTK30=no)
AS_IF([test "x$HAVE_GCONF" = "x1"], ENABLE_GCONF=yes, ENABLE_GCONF=no)
AS_IF([test "x$HAVE_AVAHI" = "x1"], ENABLE_AVAHI=yes, ENABLE_AVAHI=no)
AS_IF([test "x$HAVE_JACK" = "x1"], ENABLE_JACK=yes, ENABLE_JACK=no)
@ -1464,7 +1464,7 @@ echo "
Enable Solaris: ${ENABLE_SOLARIS}
Enable WaveOut: ${ENABLE_WAVEOUT}
Enable GLib 2.0: ${ENABLE_GLIB20}
Enable Gtk+ 2.0: ${ENABLE_GTK20}
Enable Gtk+ 3.0: ${ENABLE_GTK30}
Enable GConf: ${ENABLE_GCONF}
Enable Avahi: ${ENABLE_AVAHI}
Enable Jack: ${ENABLE_JACK}