configure.ac angepasst, damit nicht alle Binaries mit allen Libs gelinkt werden

15 files changed, 40 insertions, 18 deletions

diff --git a/src/Client/Makefile.in b/src/Client/Makefile.in
index 3d9d14c..9985b71 100644
--- a/src/Client/Makefile.in
+++ b/src/Client/Makefile.in
@@ -104,6 +104,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GREP = @GREP@
+GSSAPI_LIBS = @GSSAPI_LIBS@
 GnuTLS_CFLAGS = @GnuTLS_CFLAGS@
 GnuTLS_LIBS = @GnuTLS_LIBS@
 INSTALL = @INSTALL@
@@ -133,6 +134,7 @@ PCRECPP_CFLAGS = @PCRECPP_CFLAGS@
 PCRECPP_LIBS = @PCRECPP_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
diff --git a/src/Client/Requests/Makefile.in b/src/Client/Requests/Makefile.in
index b257084..174e64f 100644
--- a/src/Client/Requests/Makefile.in
+++ b/src/Client/Requests/Makefile.in
@@ -94,6 +94,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GREP = @GREP@
+GSSAPI_LIBS = @GSSAPI_LIBS@
 GnuTLS_CFLAGS = @GnuTLS_CFLAGS@
 GnuTLS_LIBS = @GnuTLS_LIBS@
 INSTALL = @INSTALL@
@@ -123,6 +124,7 @@ PCRECPP_CFLAGS = @PCRECPP_CFLAGS@
 PCRECPP_LIBS = @PCRECPP_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
diff --git a/src/Common/Backends/Makefile.in b/src/Common/Backends/Makefile.in
index 3538513..aef54c6 100644
--- a/src/Common/Backends/Makefile.in
+++ b/src/Common/Backends/Makefile.in
@@ -94,6 +94,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GREP = @GREP@
+GSSAPI_LIBS = @GSSAPI_LIBS@
 GnuTLS_CFLAGS = @GnuTLS_CFLAGS@
 GnuTLS_LIBS = @GnuTLS_LIBS@
 INSTALL = @INSTALL@
@@ -123,6 +124,7 @@ PCRECPP_CFLAGS = @PCRECPP_CFLAGS@
 PCRECPP_LIBS = @PCRECPP_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
diff --git a/src/Common/Makefile.in b/src/Common/Makefile.in
index af266fe..66992ea 100644
--- a/src/Common/Makefile.in
+++ b/src/Common/Makefile.in
@@ -106,6 +106,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GREP = @GREP@
+GSSAPI_LIBS = @GSSAPI_LIBS@
 GnuTLS_CFLAGS = @GnuTLS_CFLAGS@
 GnuTLS_LIBS = @GnuTLS_LIBS@
 INSTALL = @INSTALL@
@@ -135,6 +136,7 @@ PCRECPP_CFLAGS = @PCRECPP_CFLAGS@
 PCRECPP_LIBS = @PCRECPP_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
diff --git a/src/Common/RequestHandlers/Makefile.in b/src/Common/RequestHandlers/Makefile.in
index 79edc8d..f149d99 100644
--- a/src/Common/RequestHandlers/Makefile.in
+++ b/src/Common/RequestHandlers/Makefile.in
@@ -95,6 +95,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GREP = @GREP@
+GSSAPI_LIBS = @GSSAPI_LIBS@
 GnuTLS_CFLAGS = @GnuTLS_CFLAGS@
 GnuTLS_LIBS = @GnuTLS_LIBS@
 INSTALL = @INSTALL@
@@ -124,6 +125,7 @@ PCRECPP_CFLAGS = @PCRECPP_CFLAGS@
 PCRECPP_LIBS = @PCRECPP_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
diff --git a/src/Common/Requests/Makefile.in b/src/Common/Requests/Makefile.in
index fc9d079..d3c4783 100644
--- a/src/Common/Requests/Makefile.in
+++ b/src/Common/Requests/Makefile.in
@@ -95,6 +95,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GREP = @GREP@
+GSSAPI_LIBS = @GSSAPI_LIBS@
 GnuTLS_CFLAGS = @GnuTLS_CFLAGS@
 GnuTLS_LIBS = @GnuTLS_LIBS@
 INSTALL = @INSTALL@
@@ -124,6 +125,7 @@ PCRECPP_CFLAGS = @PCRECPP_CFLAGS@
 PCRECPP_LIBS = @PCRECPP_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
diff --git a/src/Core/Makefile.in b/src/Core/Makefile.in
index 9531b06..be0493b 100644
--- a/src/Core/Makefile.in
+++ b/src/Core/Makefile.in
@@ -104,6 +104,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GREP = @GREP@
+GSSAPI_LIBS = @GSSAPI_LIBS@
 GnuTLS_CFLAGS = @GnuTLS_CFLAGS@
 GnuTLS_LIBS = @GnuTLS_LIBS@
 INSTALL = @INSTALL@
@@ -133,6 +134,7 @@ PCRECPP_CFLAGS = @PCRECPP_CFLAGS@
 PCRECPP_LIBS = @PCRECPP_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
diff --git a/src/Core/RequestHandlers/Makefile.in b/src/Core/RequestHandlers/Makefile.in
index c6a8848..9147203 100644
--- a/src/Core/RequestHandlers/Makefile.in
+++ b/src/Core/RequestHandlers/Makefile.in
@@ -95,6 +95,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GREP = @GREP@
+GSSAPI_LIBS = @GSSAPI_LIBS@
 GnuTLS_CFLAGS = @GnuTLS_CFLAGS@
 GnuTLS_LIBS = @GnuTLS_LIBS@
 INSTALL = @INSTALL@
@@ -124,6 +125,7 @@ PCRECPP_CFLAGS = @PCRECPP_CFLAGS@
 PCRECPP_LIBS = @PCRECPP_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
diff --git a/src/Daemon/Makefile.in b/src/Daemon/Makefile.in
index a299a0a..2dad88e 100644
--- a/src/Daemon/Makefile.in
+++ b/src/Daemon/Makefile.in
@@ -102,6 +102,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GREP = @GREP@
+GSSAPI_LIBS = @GSSAPI_LIBS@
 GnuTLS_CFLAGS = @GnuTLS_CFLAGS@
 GnuTLS_LIBS = @GnuTLS_LIBS@
 INSTALL = @INSTALL@
@@ -131,6 +132,7 @@ PCRECPP_CFLAGS = @PCRECPP_CFLAGS@
 PCRECPP_LIBS = @PCRECPP_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
diff --git a/src/Daemon/RequestHandlers/Makefile.in b/src/Daemon/RequestHandlers/Makefile.in
index 5c64103..ebd6a19 100644
--- a/src/Daemon/RequestHandlers/Makefile.in
+++ b/src/Daemon/RequestHandlers/Makefile.in
@@ -90,6 +90,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GREP = @GREP@
+GSSAPI_LIBS = @GSSAPI_LIBS@
 GnuTLS_CFLAGS = @GnuTLS_CFLAGS@
 GnuTLS_LIBS = @GnuTLS_LIBS@
 INSTALL = @INSTALL@
@@ -119,6 +120,7 @@ PCRECPP_CFLAGS = @PCRECPP_CFLAGS@
 PCRECPP_LIBS = @PCRECPP_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
diff --git a/src/Makefile.am b/src/Makefile.am
index 95e8d37..85cf9fe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,10 +3,10 @@ SUBDIRS = Common Client Core Daemon Net
 bin_PROGRAMS     = mad madc mad-core
 
 mad_SOURCES      = mad.cpp
-mad_LDADD        = Daemon/libdaemon.la Net/libnet.la Common/libcommon.la
+mad_LDADD        = Daemon/libdaemon.la Net/libnet.la Common/libcommon.la $(sigc_LIBS) $(GnuTLS_LIBS)
 
 madc_SOURCES     = madc.cpp
-madc_LDADD       = Client/libclient.la Net/libnet.la Common/libcommon.la
+madc_LDADD       = Client/libclient.la Net/libnet.la Common/libcommon.la $(sigc_LIBS) $(GnuTLS_LIBS) $(READLINE_LIBS)
 
 mad_core_SOURCES = mad-core.cpp
-mad_core_LDADD   = Core/libcore.la Net/libnet.la Common/libcommon.la
+mad_core_LDADD   = Core/libcore.la Net/libnet.la Common/libcommon.la $(sigc_LIBS) $(GnuTLS_LIBS) $(PCRECPP_LIBS) $(GSSAPI_LIBS)
diff --git a/src/Makefile.in b/src/Makefile.in
index 80eb776..687b889 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -48,16 +48,21 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_mad_OBJECTS = mad.$(OBJEXT)
 mad_OBJECTS = $(am_mad_OBJECTS)
+am__DEPENDENCIES_1 =
 mad_DEPENDENCIES = Daemon/libdaemon.la Net/libnet.la \
-	Common/libcommon.la
+	Common/libcommon.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_mad_core_OBJECTS = mad-core.$(OBJEXT)
 mad_core_OBJECTS = $(am_mad_core_OBJECTS)
 mad_core_DEPENDENCIES = Core/libcore.la Net/libnet.la \
-	Common/libcommon.la
+	Common/libcommon.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_madc_OBJECTS = madc.$(OBJEXT)
 madc_OBJECTS = $(am_madc_OBJECTS)
 madc_DEPENDENCIES = Client/libclient.la Net/libnet.la \
-	Common/libcommon.la
+	Common/libcommon.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -114,6 +119,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GREP = @GREP@
+GSSAPI_LIBS = @GSSAPI_LIBS@
 GnuTLS_CFLAGS = @GnuTLS_CFLAGS@
 GnuTLS_LIBS = @GnuTLS_LIBS@
 INSTALL = @INSTALL@
@@ -143,6 +149,7 @@ PCRECPP_CFLAGS = @PCRECPP_CFLAGS@
 PCRECPP_LIBS = @PCRECPP_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -203,11 +210,11 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = Common Client Core Daemon Net
 mad_SOURCES = mad.cpp
-mad_LDADD = Daemon/libdaemon.la Net/libnet.la Common/libcommon.la
+mad_LDADD = Daemon/libdaemon.la Net/libnet.la Common/libcommon.la $(sigc_LIBS) $(GnuTLS_LIBS)
 madc_SOURCES = madc.cpp
-madc_LDADD = Client/libclient.la Net/libnet.la Common/libcommon.la
+madc_LDADD = Client/libclient.la Net/libnet.la Common/libcommon.la $(sigc_LIBS) $(GnuTLS_LIBS) $(READLINE_LIBS)
 mad_core_SOURCES = mad-core.cpp
-mad_core_LDADD = Core/libcore.la Net/libnet.la Common/libcommon.la
+mad_core_LDADD = Core/libcore.la Net/libnet.la Common/libcommon.la $(sigc_LIBS) $(GnuTLS_LIBS) $(PCRECPP_LIBS) $(GSSAPI_LIBS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
diff --git a/src/Net/Makefile.in b/src/Net/Makefile.in
index 163ca89..ffb7583 100644
--- a/src/Net/Makefile.in
+++ b/src/Net/Makefile.in
@@ -105,6 +105,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GREP = @GREP@
+GSSAPI_LIBS = @GSSAPI_LIBS@
 GnuTLS_CFLAGS = @GnuTLS_CFLAGS@
 GnuTLS_LIBS = @GnuTLS_LIBS@
 INSTALL = @INSTALL@
@@ -134,6 +135,7 @@ PCRECPP_CFLAGS = @PCRECPP_CFLAGS@
 PCRECPP_LIBS = @PCRECPP_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
diff --git a/src/Net/Packets/Makefile.in b/src/Net/Packets/Makefile.in
index 702ec45..b6a7338 100644
--- a/src/Net/Packets/Makefile.in
+++ b/src/Net/Packets/Makefile.in
@@ -94,6 +94,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GREP = @GREP@
+GSSAPI_LIBS = @GSSAPI_LIBS@
 GnuTLS_CFLAGS = @GnuTLS_CFLAGS@
 GnuTLS_LIBS = @GnuTLS_LIBS@
 INSTALL = @INSTALL@
@@ -123,6 +124,7 @@ PCRECPP_CFLAGS = @PCRECPP_CFLAGS@
 PCRECPP_LIBS = @PCRECPP_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
diff --git a/src/config.h.in b/src/config.h.in
index 9af3010..c2b6b56 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -12,15 +12,6 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the `gssapi' library (-lgssapi). */
-#undef HAVE_LIBGSSAPI
-
-/* Define to 1 if you have the `gssapi_krb5' library (-lgssapi_krb5). */
-#undef HAVE_LIBGSSAPI_KRB5
-
-/* Define to 1 if you have the `readline' library (-lreadline). */
-#undef HAVE_LIBREADLINE
-
 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
    to 0 otherwise. */
 #undef HAVE_MALLOC