--- jabberd-1.4.4/mu-conference-0.6.0/src/Makefile.fixbuild	2003-11-14 23:19:44.000000000 -0500
+++ jabberd-1.4.4/mu-conference-0.6.0/src/Makefile	2005-08-22 03:05:33.000000000 -0400
@@ -1,6 +1,6 @@
 include ../../platform-settings
 
-CFLAGS:=$(CFLAGS) -I../../jabberd -I../include `pkg-config --cflags glib-2.0`
+CFLAGS:=$(CFLAGS) -I../../jabberd -I../../jabberd/lib -I../include `pkg-config --cflags glib-2.0`
 LIBS:=$(LIBS) `pkg-config --libs glib-2.0`
 
 # Debug/Experimental
@@ -17,7 +17,7 @@ conference: $(conference_OBJECTS)
 ifeq ($(__CYGWIN__),1)
 	$(CC) $(CFLAGS) $(MCFLAGS) -o mu-conference.dll $(conference_OBJECTS) ../../jabberd/jabberd.a $(LDFLAGS) $(LIBS)
 else        
-	$(CC) $(CFLAGS) $(MCFLAGS) -o mu-conference.so $(conference_OBJECTS) $(LDFLAGS) $(LIBS)
+	$(CC) $(CFLAGS) $(MCFLAGS) -o mu-conference.so $(conference_OBJECTS) $(LDFLAGS) $(LIBS) -shared
 endif
 
 static: $(conference_OBJECTS)
--- jabberd-1.4.4/jud-ansi-c/Makefile.fixbuild	2003-11-12 04:12:20.000000000 -0500
+++ jabberd-1.4.4/jud-ansi-c/Makefile	2005-08-22 03:05:33.000000000 -0400
@@ -1,6 +1,6 @@
 include ../platform-settings
 
-CFLAGS=$(CCFLAGS) -I../jabberd
+CFLAGS=$(CCFLAGS) -I../jabberd -I../jabberd/lib
 
 jud_OBJECTS=jud.o jud_reg.o jud_search.o
 
@@ -10,7 +10,7 @@ jud: $(jud_OBJECTS)
 ifeq ($(__CYGWIN__),1)
 	$(CC) $(CFLAGS) $(MCFLAGS) -o jud.dll $(jud_OBJECTS) ../jabberd/jabberd.a $(LDFLAGS) $(LIBS)
 else
-	$(CC) $(CFLAGS) $(MCFLAGS) -o jud.so $(jud_OBJECTS) $(LDFLAGS) $(LIBS)
+	$(CC) $(CFLAGS) $(MCFLAGS) -o jud.so $(jud_OBJECTS) -shared $(LDFLAGS) $(LIBS) 
 endif
 
 static: $(jud_OBJECTS)
--- jabberd-1.4.4/aim-transport-stable-20040131/src/Makefile.am.fixbuild	2002-11-16 19:02:50.000000000 -0500
+++ jabberd-1.4.4/aim-transport-stable-20040131/src/Makefile.am	2005-08-22 03:06:26.000000000 -0400
@@ -60,4 +60,4 @@ aimtrans_so_SOURCES = \
 
 aimtrans_so_LDFLAGS = -fPIC -shared 
 
-CFLAGS += -DAIM_BUILDDATE=\"`date +%Y%m%d`\" -DAIM_BUILDTIME=\"`date +%H%M%S`\" -g
+CFLAGS += -DAIM_BUILDDATE=\"`date +%Y%m%d`\" -DAIM_BUILDTIME=\"`date +%H%M%S`\" -g -DINCLUDE_LEGACY
--- jabberd-1.4.4/aim-transport-stable-20040131/configure.in.fixbuild	2004-01-31 11:56:49.000000000 -0500
+++ jabberd-1.4.4/aim-transport-stable-20040131/configure.in	2005-08-22 03:05:33.000000000 -0400
@@ -17,7 +17,7 @@ AC_ARG_WITH(jabberd,[  --with-jabberd=PA
     AC_MSG_CHECKING(for jabberd)
     if test -f "../jabberd/jabberd.h"; then
         AC_MSG_RESULT(Found);
-        JABBERD_INC="-I../../jabberd";
+        JABBERD_INC="-DINCLUDE_LEGACY -I../../jabberd -I../../jabberd/lib";
     else
         AC_MSG_RESULT(Error);
         AC_MSG_ERROR([
--- jabberd-1.4.4/msn-transport-1.3.0/src/Makefile.am.fixbuild	2003-12-08 16:28:11.000000000 -0500
+++ jabberd-1.4.4/msn-transport-1.3.0/src/Makefile.am	2005-08-22 03:07:21.000000000 -0400
@@ -1,4 +1,4 @@
-INCLUDES = -I$(includedir) -I$(top_builddir)/include -I. $(PTH_INC) $(JABBERD_INC) $(CURL_INC) -fPIC -shared
+INCLUDES = -I$(includedir) -I$(top_builddir)/include -I. $(PTH_INC) $(JABBERD_INC) -I../../jabberd/lib $(CURL_INC) -fPIC -shared
 
 noinst_PROGRAMS = msntrans.so
 
@@ -24,4 +24,4 @@ msntrans_so_SOURCES = \
 	xhtml.c
 
 msntrans_so_LDFLAGS = -fPIC -shared
-CFLAGS = -Wall -g -O2 -Wno-unused
+CFLAGS = -Wall -g -O2 -Wno-unused -DINCLUDE_LEGACY
--- jabberd-1.4.4/yahoo-transport-2.3.2/Makefile.fixbuild	2004-06-25 14:33:56.000000000 -0400
+++ jabberd-1.4.4/yahoo-transport-2.3.2/Makefile	2005-08-22 03:05:33.000000000 -0400
@@ -3,7 +3,7 @@
 
 include ../platform-settings
 
-CFLAGS:=$(CFLAGS) -I../jabberd  `glib-config --cflags`
+CFLAGS:=$(CFLAGS) -I../jabberd  -I../jabberd/lib `glib-config --cflags`
 LIBS:=$(LIBS) `glib-config --libs glib`
 
 YAHOO_OBJECTS=yahoo-transport.o yahoo-session.o yahoo-phandler.o yahoo.o \
@@ -13,7 +13,7 @@ YAHOO_OBJECTS=yahoo-transport.o yahoo-se
 all: yahoo-transport
 
 yahoo-transport: $(YAHOO_OBJECTS)
-	$(CC) $(CFLAGS) $(MCFLAGS) -o yahoo-transport.so $(YAHOO_OBJECTS) $(LDFLAGS) $(LIBS)
+	$(CC) $(CFLAGS) $(MCFLAGS) -o yahoo-transport.so $(YAHOO_OBJECTS) $(LDFLAGS) $(LIBS) -shared
 
 static: $(YAHOO_OBJECTS)
 
--- jabberd-1.4.4/acinclude.m4.fixbuild	2005-08-22 03:05:33.000000000 -0400
+++ jabberd-1.4.4/acinclude.m4	2005-08-22 03:05:33.000000000 -0400
@@ -0,0 +1,14 @@
+AC_DEFUN([AC_DEFINE_DIR], [
+  prefix_NONE=
+  exec_prefix_NONE=
+  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
+dnl refers to ${prefix}.  Thus we have to use `eval' twice.
+  eval ac_define_dir="\"[$]$2\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  AC_SUBST($1, "$ac_define_dir")
+  AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
+  test "$prefix_NONE" && prefix=NONE
+  test "$exec_prefix_NONE" && exec_prefix=NONE
+])
--- jabberd-1.4.4/configure.in.fixbuild	2005-04-15 18:10:24.000000000 -0400
+++ jabberd-1.4.4/configure.in	2005-08-22 03:05:33.000000000 -0400
@@ -8,10 +8,6 @@ AC_INIT(jabberd/jabberd.h)
 AM_INIT_AUTOMAKE(jabberd,1.4.4)
 AM_CONFIG_HEADER(config.h)
 
-dnl helper macros
-sinclude(ac-helpers/ac_define_dir.m4)
-
-dnl for developers
 AC_MSG_CHECKING(if developer mode enabled)
 AC_ARG_ENABLE(developer, AC_HELP_STRING([--enable-developer],
                     [Developer mode]),