diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | libtopmenu-client/Makefile.am | 8 | ||||
| -rw-r--r-- | libtopmenu-server/Makefile.am | 8 |
3 files changed, 9 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 4603095..6c8c43e 100644 --- a/configure.ac +++ b/configure.ac @@ -58,6 +58,7 @@ AC_PROG_LIBTOOL # Checks for libraries. PKG_CHECK_MODULES([GTK], [gtk+-x11-$with_gtk.0]) +PKG_CHECK_MODULES([X11], [x11]) AS_IF([test "x$with_gtk" = x3], [AS_IF([test "x$with_wnck" = xwnck3 -o "x$with_wnck" = xcheck], diff --git a/libtopmenu-client/Makefile.am b/libtopmenu-client/Makefile.am index f4f8b6f..af6dda8 100644 --- a/libtopmenu-client/Makefile.am +++ b/libtopmenu-client/Makefile.am @@ -4,8 +4,8 @@ lib_LTLIBRARIES = libtopmenu-client-gtk3.la libtopmenu_client_gtk3_la_SOURCES = topmenu-client.c topmenu-client.h \ topmenu-monitor.c topmenu-monitor.h \ topmenu-appmenubar.c topmenu-appmenubar.h -libtopmenu_client_gtk3_la_CPPFLAGS = $(GTK_CFLAGS) -DG_LOG_DOMAIN=\"topmenu-client\" -libtopmenu_client_gtk3_la_LIBADD = $(GTK_LIBS) +libtopmenu_client_gtk3_la_CPPFLAGS = $(X11_CFLAGS) $(GTK_CFLAGS) -DG_LOG_DOMAIN=\"topmenu-client\" +libtopmenu_client_gtk3_la_LIBADD = $(X11_LIBS) $(GTK_LIBS) else @@ -13,8 +13,8 @@ lib_LTLIBRARIES = libtopmenu-client-gtk2.la libtopmenu_client_gtk2_la_SOURCES = topmenu-client.c topmenu-client.h \ topmenu-monitor.c topmenu-monitor.h \ topmenu-appmenubar.c topmenu-appmenubar.h -libtopmenu_client_gtk2_la_CPPFLAGS = $(GTK_CFLAGS) -DG_LOG_DOMAIN=\"topmenu-client\" -libtopmenu_client_gtk2_la_LIBADD = $(GTK_LIBS) +libtopmenu_client_gtk2_la_CPPFLAGS = $(X11_CFLAGS) $(GTK_CFLAGS) -DG_LOG_DOMAIN=\"topmenu-client\" +libtopmenu_client_gtk2_la_LIBADD = $(X11_LIBS) $(GTK_LIBS) endif diff --git a/libtopmenu-server/Makefile.am b/libtopmenu-server/Makefile.am index b910248..c5a3a7f 100644 --- a/libtopmenu-server/Makefile.am +++ b/libtopmenu-server/Makefile.am @@ -2,15 +2,15 @@ if GTK3 lib_LTLIBRARIES = libtopmenu-server-gtk3.la libtopmenu_server_gtk3_la_SOURCES = topmenu-server.c topmenu-server.h topmenu-widget.c topmenu-widget.h -libtopmenu_server_gtk3_la_CPPFLAGS = $(GTK_CFLAGS) $(WNCK3_CFLAGS) -DG_LOG_DOMAIN=\"topmenu-server\" -libtopmenu_server_gtk3_la_LIBADD = $(GTK_LIBS) $(WNCK3_LIBS) +libtopmenu_server_gtk3_la_CPPFLAGS = $(X11_CFLAGS) $(GTK_CFLAGS) $(WNCK3_CFLAGS) -DG_LOG_DOMAIN=\"topmenu-server\" +libtopmenu_server_gtk3_la_LIBADD = $(X11_LIBS) $(GTK_LIBS) $(WNCK3_LIBS) else lib_LTLIBRARIES = libtopmenu-server-gtk2.la libtopmenu_server_gtk2_la_SOURCES = topmenu-server.c topmenu-server.h topmenu-widget.c topmenu-widget.h -libtopmenu_server_gtk2_la_CPPFLAGS = $(GTK_CFLAGS) $(WNCK1_CFLAGS) $(MATEWNCK_CFLAGS) -DG_LOG_DOMAIN=\"topmenu-server\" -libtopmenu_server_gtk2_la_LIBADD = $(GTK_LIBS) $(WNCK1_LIBS) $(MATEWNCK_LIBS) +libtopmenu_server_gtk2_la_CPPFLAGS = $(X11_CFLAGS) $(GTK_CFLAGS) $(WNCK1_CFLAGS) $(MATEWNCK_CFLAGS) -DG_LOG_DOMAIN=\"topmenu-server\" +libtopmenu_server_gtk2_la_LIBADD = $(X11_LIBS) $(GTK_LIBS) $(WNCK1_LIBS) $(MATEWNCK_LIBS) endif |