diff -Naur ekg-1.7/Makefile.in ekg-1.7.tpg/Makefile.in
--- ekg-1.7/Makefile.in 2006-08-05 15:46:21.000000000 +0000
+++ ekg-1.7.tpg/Makefile.in 2007-06-13 11:38:08.000000000 +0000
@@ -15,12 +15,12 @@
#
-all: configure libgadu @ekg@ @make_ekgwap@
+all: configure @libgadu@ @ekg@ @make_ekgwap@
libgadu:
cd lib && $(MAKE) all
-ekg:
+ekg: libgadu
cd src && $(MAKE) all
make-ekgwap:
@@ -31,7 +31,7 @@
#
-dep: dep-libgadu @dep_ekg@
+dep: @dep-libgadu@ @dep_ekg@
dep-libgadu:
cd lib && $(MAKE) dep
@@ -46,7 +46,7 @@
#
-install: all install-libgadu @install_ekg@ @install_ekgwap@
+install: all @install_libgadu@ @install_ekg@ @install_ekgwap@
install-libgadu:
cd lib && $(MAKE) install
@@ -80,7 +80,9 @@
#
-uninstall: @uninstall_ekg@
+uninstall: @uninnstall_libgadu@ @uninstall_ekg@
+
+uninstal-libgadu:
rm -f $(DESTDIR)$(libdir)/libgadu.{a,so*}
rm -f $(DESTDIR)$(includedir)/libgadu{,-config,-stdint}.h
rm -f $(DESTDIR)$(libdir)/pkgconfig/libgadu.pc
@@ -93,7 +95,7 @@
#
-clean: clean-libgadu @clean_ekg@ clean-examples clean-compat
+clean: @clean-libgadu@ @clean_ekg@ clean-examples clean-compat
clean-libgadu:
cd lib && $(MAKE) clean
@@ -109,7 +111,7 @@
#
-distclean: distclean-libgadu @distclean_ekg@ distclean-examples distclean-compat
+distclean: @distclean-libgadu@ @distclean_ekg@ distclean-examples distclean-compat
rm -f *~ config.log config.cache config.status config.h Makefile
rm -f config.h.in configure aclocal.m4
diff -Naur ekg-1.7/configure.in ekg-1.7.tpg/configure.in
--- ekg-1.7/configure.in 2007-03-11 12:27:04.000000000 +0000
+++ ekg-1.7.tpg/configure.in 2007-06-13 11:14:59.000000000 +0000
@@ -313,6 +313,40 @@
dnl I zaczynamy wykrywaæ ¶mieci dla ekg...
dnl
+
+AC_ARG_WITH(libgadu,
+ [ --without-libgadu Do not compile libgadu, use external])
+
+if test "x$with_libgadu" = "xno"; then
+ enable_dynamic=yes
+ LIBGADU_INCLUDE=""
+ LIBGADU_LIBPATH=""
+ libgadu=""
+ dep_libgadu=""
+ clean_libgadu=""
+ distclean_libgadu=""
+ install_libgadu=""
+ uninstall_libgadu=""
+else
+ LIBGADU_INCLUDE="-I../lib"
+ LIBGADU_LIBPATH="-L../lib"
+ libgadu="libgadu"
+ dep_libgadu="dep-libgadu"
+ clean_libgadu="clean-libgadu"
+ distclean_libgadu="distclean-libgadu"
+ install_libgadu="install-libgadu"
+ uninstall_libgadu="uninstall-libgadu"
+fi
+
+AC_SUBST(LIBGADU_INCLUDE)
+AC_SUBST(LIBGADU_LIBPATH)
+AC_SUBST(libgadu)
+AC_SUBST(dep_libgadu)
+AC_SUBST(clean_libgadu)
+AC_SUBST(distclean_libgadu)
+AC_SUBST(install_libgadu)
+AC_SUBST(uninstall_libgadu)
+
dnl dirname - get rid of libgen
AC_CHECK_HEADERS(libgen.h)
AC_CHECK_FUNC(dirname, , [OBJS="$OBJS ../compat/dirname.o"])
diff -Naur ekg-1.7/lib/Makefile.in ekg-1.7.tpg/lib/Makefile.in
--- ekg-1.7/lib/Makefile.in 2006-04-18 19:05:11.000000000 +0000
+++ ekg-1.7.tpg/lib/Makefile.in 2007-06-13 11:04:06.000000000 +0000
@@ -11,7 +11,7 @@
VERSION_MINOR=5
CC = @CC@
-CFLAGS = @CFLAGS_LIBGADU@ -I. -I..
+CFLAGS = @CFLAGS@ @CFLAGS_LIBGADU@ -I. -I..
LIBS = @LIBS_LIBGADU@
MAKE = @MAKE@
diff -Naur ekg-1.7/src/Makefile.in ekg-1.7.tpg/src/Makefile.in
--- ekg-1.7/src/Makefile.in 2007-04-28 20:02:22.000000000 +0000
+++ ekg-1.7.tpg/src/Makefile.in 2007-06-13 11:06:32.000000000 +0000
@@ -10,7 +10,7 @@
sysconfdir = @sysconfdir@
CC = @CC@
-CFLAGS = -I.. -I../lib @CFLAGS@ -DDATADIR=\"${datadir}/ekg\" -DSYSCONFDIR=\"${sysconfdir}\"
+CFLAGS = -I.. @LIBGADU_INCLUDE@ @CFLAGS@ -DDATADIR=\"${datadir}/ekg\" -DSYSCONFDIR=\"${sysconfdir}\"
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@@ -28,7 +28,7 @@
ekg: $(OBJS) comptime.c @libgadu_a@
$(CC) $(CFLAGS) -c -o comptime.o comptime.c
- $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o -L../lib @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
+ $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o @LIBGADU_LIBPATH@ @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
ioctld: ioctld.c
$(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
diff -Naur ekg-1.7/src/stuff.c ekg-1.7.tpg/src/stuff.c
--- ekg-1.7/src/stuff.c 2007-04-28 20:02:24.000000000 +0000
+++ ekg-1.7.tpg/src/stuff.c 2007-06-13 11:07:23.000000000 +0000
@@ -53,7 +53,6 @@
#include <unistd.h>
#include "commands.h"
-#include "compat.h"
#include "dynstuff.h"
#include "libgadu.h"
#ifdef HAVE_OPENSSL
