diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..2d9ee5ea
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "SmartIrc4net"]
+ path = SmartIrc4net
+ url = git://git.qnetp.net/smartirc4net.git
diff --git a/Makefile.am b/Makefile.am
index 53981ba0..14044b90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = \
help \
NotifySharp \
FriendFace \
+ SmartIrc4net \
SparkleLib \
SparkleShare \
SparkleDiff \
diff --git a/SmartIrc4net b/SmartIrc4net
new file mode 160000
index 00000000..036e2233
--- /dev/null
+++ b/SmartIrc4net
@@ -0,0 +1 @@
+Subproject commit 036e2233aea9bd3b4a30f8c5136daff0187eb5ec
diff --git a/SparkleLib/SparkleLib.csproj b/SparkleLib/SparkleLib.csproj
index c02a281f..3602926a 100644
--- a/SparkleLib/SparkleLib.csproj
+++ b/SparkleLib/SparkleLib.csproj
@@ -31,9 +31,6 @@
-
- smartirc4net
-
diff --git a/autogen.sh b/autogen.sh
index 3af42db6..41a48155 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -73,6 +73,10 @@ else
touch gnome-doc-utils.make
fi
+if git --help &>/dev/null; then
+ git submodule update --init
+fi
+
run intltoolize --force --copy
run $LIBTOOLIZE --force --copy --automake
run aclocal -I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS
@@ -81,6 +85,12 @@ run autoconf
run automake --gnu --add-missing --force --copy \
-Wno-portability -Wno-portability
+if test -d $srcdir/SmartIrc4net; then
+ echo Running SmartIrc4net/autogen.sh ...
+ (cd $srcdir/SmartIrc4net; NOCONFIGURE=1 ./autogen.sh "$@")
+ echo Done running SmartIrc4net/autogen.sh ...
+fi
+
if [ ! -z "$NOCONFIGURE" ]; then
echo "Done. ./configure skipped."
exit $?
diff --git a/build/build.environment.mk b/build/build.environment.mk
index a8d45ca3..a2ccc4a4 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -15,7 +15,7 @@ LINK_GTK = $(GTKSHARP_LIBS)
LINK_GNOME = $(GNOME_SHARP_LIBS)
LINK_DBUS = $(NDESK_DBUS_LIBS) $(NDESK_DBUS_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(NDESK_DBUS_LIBS)
-LINK_SMARTIRC4NET = $(SMARTIRC4NET_LIBS)
+LINK_SMARTIRC4NET = -r:$(top_builddir)/$(SMARTIRC4NET_ASSEMBLY)
REF_NOTIFY_SHARP = $(LINK_SYSTEM) $(LINK_DBUS) $(GTKSHARP_LIBS) $(GLIBSHARP_LIBS)
diff --git a/build/m4/sparkleshare/smartirc4net.m4 b/build/m4/sparkleshare/smartirc4net.m4
index e581531f..fedc36ea 100644
--- a/build/m4/sparkleshare/smartirc4net.m4
+++ b/build/m4/sparkleshare/smartirc4net.m4
@@ -1,6 +1,9 @@
-AC_DEFUN([SPARKLESHARE_CHECK_SMARTIRC4NET],
+AC_DEFUN([SPARKLESHARE_SMARTIRC4NET],
[
- PKG_CHECK_MODULES(SMARTIRC4NET, smartirc4net)
- AC_SUBST(SMARTIRC4NET_LIBS)
+ if test ! -d "$srcdir/SmartIrc4net"; then
+ AC_MSG_ERROR([SmartIrc4net folder not found])
+ fi
+ AC_CONFIG_SUBDIRS([SmartIrc4net])
+ AC_SUBST([SMARTIRC4NET_ASSEMBLY], "SmartIrc4net/bin/Meebey.SmartIrc4net.dll")
])
diff --git a/configure.ac b/configure.ac
index 6f741288..fbe116a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ m4_define([sparkleshare_asm_version],
AC_PREREQ([2.54])
AC_INIT([SparkleShare], sparkleshare_version)
-AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-zip foreign])
+AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-zip foreign tar-ustar])
AM_MAINTAINER_MODE
dnl Export Version Info
@@ -73,7 +73,7 @@ AC_SUBST(NDESK_DBUS_GLIB_LIBS)
SPARKLESHARE_CHECK_GTK_SHARP
#SPARKLESHARE_CHECK_NOTIFY_SHARP
-SPARKLESHARE_CHECK_SMARTIRC4NET
+SPARKLESHARE_SMARTIRC4NET
SHAMROCK_CHECK_NUNIT