1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
--- libkdegames/Makefile.am~ 2005-09-10 10:18:23.000000000 +0200
+++ libkdegames/Makefile.am 2007-10-28 11:43:41.000000000 +0100
@@ -2,7 +2,7 @@
lib_LTLIBRARIES = libkdegames.la
libkdegames_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 3:0:2
libkdegames_la_LIBADD = highscore/libkhighscore.la kgame/libkgame.la kgame/dialogs/libkgamedialogs.la \
- $(LIB_KSYCOCA) $(LIB_KDNSSD)
+ $(LIB_KSYCOCA) $(LIB_KDNSSD) $(AVAHI_LIBS)
libkdegames_la_SOURCES = kcarddialog.cpp kstdgameaction.cpp \
kgamemisc.cpp kchatbase.cpp kchat.cpp \
--- atlantik/client/Makefile.am~ 2005-09-10 10:18:18.000000000 +0200
+++ atlantik/client/Makefile.am 2007-10-28 11:45:33.000000000 +0100
@@ -1,7 +1,7 @@
bin_PROGRAMS = atlantik
INCLUDES = -I$(top_srcdir)/libkdegames -I$(srcdir)/../libatlantic -I$(srcdir)/../libatlantikclient -I$(srcdir)/../libatlantikui $(all_includes)
atlantik_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-atlantik_LDADD = ../libatlantikui/libatlantikui.la ../libatlantikclient/libatlantikclient.la $(LIB_KDEGAMES) $(LIB_KIO)
+atlantik_LDADD = ../libatlantikui/libatlantikui.la $(LIB_KIO) ../libatlantikclient/libatlantikclient.la $(LIB_KDEGAMES) $(AVAHI_LIBS)
atlantik_DEPENDENCIES = $(LIB_KDEGAMES_DEP)
atlantik_SOURCES = atlantik.cpp configdlg.cpp event.cpp eventlogwidget.cpp \
--- kbattleship/kbattleship/Makefile.am~ 2007-10-08 11:48:28.000000000 +0200
+++ kbattleship/kbattleship/Makefile.am 2007-10-28 11:46:37.000000000 +0100
@@ -13,7 +13,7 @@
kstatdialog.cpp kbdiagonalshotstrategy.cpp \
konnectionhandling.cpp kship.cpp kshiplist.cpp \
kbchooserstrategy.cpp kbattleship.cpp main.cpp
-kbattleship_LDADD = $(LIB_KDEGAMES) ./dialogs/libkbattleshipdialogs.la $(LIB_KFILE) $(LIB_KDNSSD)
+kbattleship_LDADD = $(LIB_KDEGAMES) ./dialogs/libkbattleshipdialogs.la $(LIB_KFILE) $(LIB_KDNSSD) $(AVAHI_LIBS) -lavahi-client
kbattleship_COMPILE_FIRST = dialogs/infoDlg.h dialogs/chatDlg.h dialogs/connectDlg.h dialogs/serverDlg.h dialogs/statDlg.h
kbattleship_LDFLAGS = $(all_libraries) $(KDE_RPATH)
kbattleship_DEPENDENCIES = $(LIB_KDEGAMES_DEP)
--- lskat/lskat/Makefile.am~ 2005-09-10 10:18:27.000000000 +0200
+++ lskat/lskat/Makefile.am 2007-10-28 11:47:35.000000000 +0100
@@ -3,7 +3,7 @@
bin_PROGRAMS = lskat
lskat_SOURCES = msgdlg.cpp networkdlg.cpp namedlg.cpp KRemoteConnect.cpp KRSocket.cpp KProcessConnect.cpp KMessageEntry.cpp KInteractiveConnect.cpp KInputChildProcess.cpp KEMessage.cpp KEInput.cpp KConnectEntry.cpp KChildConnect.cpp lskatview.cpp lskatdoc.cpp lskat.cpp main.cpp networkdlgbase.ui
-lskat_LDADD = $(LIB_KFILE) $(LIB_KDEGAMES) $(LIB_KDNSSD)
+lskat_LDADD = $(LIB_KFILE) $(LIB_KDEGAMES) $(LIB_KDNSSD) $(AVAHI_LIBS) -lavahi-client
lskat_DEPENDENCIES = $(LIB_KDEGAMES_DEP)
INCLUDES = -I$(top_srcdir)/libkdegames $(all_includes)
--- libkdegames/configure.in.in~ 2005-09-10 10:18:23.000000000 +0200
+++ libkdegames/configure.in.in 2007-10-28 11:52:04.000000000 +0100
@@ -47,3 +47,13 @@
highscore_user="$withval",highscore_user="games")
AC_SUBST(highscore_user)
AC_MSG_RESULT($highscore_user)
+
+m4_pattern_allow(PKG_CONFIG_MIN_VERSION)
+PKG_PROG_PKG_CONFIG
+
+avahi_found=no
+KDE_PKG_CHECK_MODULES(AVAHI, [avahi-qt3 >= 0.4 ],
+ [avahi_found=yes],[:])
+AC_MSG_RESULT($avahi_found)
+AC_SUBST(AVAHI_CFLAGS)
+AC_SUBST(AVAHI_LIBS)
|
