Commit 491f315f authored by Rom Walton's avatar Rom Walton

BUILD: Remove static references to GTK 2.x components, use package config...

BUILD: Remove static references to GTK 2.x components, use package config properly. (From Steffen Moeller)
parent 8a33ee67
......@@ -100,9 +100,9 @@ EXTRA_DIST = *.h \
../lib/error_numbers.h \
locale
boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) `pkg-config --cflags gtk+-2.0`
boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) `pkg-config --cflags gtk+-2.0`
boincmgr_LDFLAGS = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) `pkg-config --libs gtk+-2.0` -lnotify
boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK_CLFAGS)
boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK_CFLAGS)
boincmgr_LDADD = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) $(GTK_LIBS)
win_config.h: $(top_srcdir)/config.h
grep '#define.*BOINC.*VERSION' $^ > $@
......
......@@ -1008,16 +1008,14 @@ fi
dnl ---------- libNotify --------------------------------------------------
if test "${enable_manager}" = yes ; then
pkg_config_args=libnotify
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
LIBNOTIFY_CFLAGS=`$PKG_CONFIG libnotify --cflags`
LIBNOTIFY_LIBS=`$PKG_CONFIG libnotify --libs`
AC_SUBST(LIBNOTIFY_CFLAGS)
AC_SUBST(LIBNOTIFY_LIBS)
PKG_CHECK_MODULES(LIBNOTIFY, [libnotify])
fi
dnl ---------- GTK2 -------------------------------------------------------
if test "${enable_manager}" = yes ; then
PKG_CHECK_MODULES(GTK, [gtk+-2.0])
fi
dnl ---------- Sqlite3 ----------------------------------------------------
if test "${enable_manager}" = yes ; then
AM_PATH_SQLITE3
......@@ -1224,7 +1222,7 @@ AC_ARG_ENABLE(wx-debug,
],
[enable_wx_debug="no"])
CLIENTGUILIBS="${WX_LIBS} ${SQLITE3_LIBS} ${GTK_LIBS}"
CLIENTGUILIBS="${WX_LIBS} ${SQLITE3_LIBS}"
if test "${enable_client_release}" = "yes" ; then
if test "x${WX_LIBS_STATIC}" = "x" ; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment