alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* configure.ac: fix gtk2/3 test

Browse Source
This commit is contained in:
djcb
2013-03-17 14:08:47 +02:00
parent 22a30bf30b
commit 84477bc88a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -181,7 +181,7 @@ AS_IF([test "x$gui" != "xgtk2" -a "x$gui" != "xgtk3" -a "x$gui" != "xnone" \
gtk2|gtk3|auto|no ($gui)])) gtk2|gtk3|auto|no ($gui)]))
AS_IF([test "x$gui" != "xnone"],[ AS_IF([test "x$gui" != "xnone"],[
# check for gtk3 # check for gtk3
AS_IF([test "x$gui" = "xgtk3"],[ AS_IF([test "x$gui" != "xgtk2"],[
PKG_CHECK_MODULES(GTK,gtk+-3.0,[have_gtk3=yes],[have_gtk3=no]) PKG_CHECK_MODULES(GTK,gtk+-3.0,[have_gtk3=yes],[have_gtk3=no])
AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS) AC_SUBST(GTK_LIBS)
@ -192,7 +192,7 @@ AS_IF([test "x$gui" != "xnone"],[
# check for gtk2 if we did not find gtk3 already # check for gtk2 if we did not find gtk3 already
# (gtk3 is only sought if asked for it explicitly) # (gtk3 is only sought if asked for it explicitly)
AS_IF([test "x$gui" != "xno" -a "x$have_gtk3" != "xyes"],[ AS_IF([test "x$gui" != "xnone" -a "x$have_gtk3" != "xyes"],[
PKG_CHECK_MODULES(GTK,gtk+-2.0,[have_gtk2=yes],[have_gtk2=no]) PKG_CHECK_MODULES(GTK,gtk+-2.0,[have_gtk2=yes],[have_gtk2=no])
AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS) AC_SUBST(GTK_LIBS)
@ -203,7 +203,7 @@ AS_IF([test "x$gui" != "xnone"],[
AC_MSG_ERROR([GTK+ 2.x not found])) AC_MSG_ERROR([GTK+ 2.x not found]))
]) ])
AM_CONDITIONAL(HAVE_GTK,[test "x$have_gtk2" = "xyes" -o "x$have_gtk3" = "xyes" ]) AM_CONDITIONAL(HAVE_GTK,[test "x$have_gtk2" = "xyes" -o "x$have_gtk3" = "xyes"])
AS_IF([test "x$have_gtk2" = "xyes" -o "x$have_gtk3" = "xyes"],[buildgui=yes], AS_IF([test "x$have_gtk2" = "xyes" -o "x$have_gtk3" = "xyes"],[buildgui=yes],
[buildgui=no]) [buildgui=no])
AS_IF([test "x$have_gtk3" = "xyes"], AS_IF([test "x$have_gtk3" = "xyes"],