From 631b56e652342cf6b8955ed60a5ee3eacfd00ee4 Mon Sep 17 00:00:00 2001 From: hiro Date: Fri, 18 Apr 2014 06:35:32 +0000 Subject: configure.in: added -lgtkmacintegration check. git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3387 ee746299-78ed-0310-b773-934348b2243d --- ChangeLog | 4 ++++ configure.in | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 245b1be8..d62c89f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-04-18 + + * configure.in: added -lgtkmacintegration check. + 2014-04-18 * libsylph/utils.[ch] diff --git a/configure.in b/configure.in index 1b233e9b..18c73e70 100644 --- a/configure.in +++ b/configure.in @@ -74,9 +74,11 @@ AM_PROG_LIBTOOL SYLPHEED_ACLOCAL_INCLUDE(ac) native_win32=no +os_osx=no case "$target" in *-darwin*) + os_osx=yes CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" LIBSYLPH_CFLAGS="$LIBSYLPH_CFLAGS -xobjective-c" ;; @@ -92,7 +94,6 @@ esac AC_SUBST(LIBSYLPH_CFLAGS) AC_SUBST(LIBSYLPH_LIBS) -AC_SUBST(SYLPHEED_LIBS) AM_CONDITIONAL(NATIVE_WIN32, test "$native_win32" = "yes") @@ -110,6 +111,18 @@ AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK func AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) +if test "$os_osx" == yes; then + AC_CHECK_LIB(gtkmacintegration, gtkosx_application_ready, [ ac_have_gtkmacintegration=yes ], [ ac_have_gtkmacintegration=no ]) + AC_MSG_CHECKING([if gtkmacintegration is available]) + AC_MSG_RESULT($ac_have_gtkmacintegration) + if test "$ac_have_gtkmacintegration" = yes; then + SYLPHEED_LIBS="$SYLPHEED_LIBS -lgtkmacintegration" + AC_DEFINE(USE_GTKMACINTEGRATION, 1, Define if you use gtkmacintegration library.) + fi +fi + +AC_SUBST(SYLPHEED_LIBS) + dnl checks for iconv AM_ICONV -- cgit v1.2.3