Include SmartIrc4net library as a git submodule

This follows the recommendation from SmartIrc4net's author, and avoids
any dependency issues.
This commit is contained in:
Bertrand Lorentz 2010-09-11 17:30:59 +02:00
parent 5b677c9eba
commit 0da399295a
8 changed files with 24 additions and 9 deletions

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "SmartIrc4net"]
path = SmartIrc4net
url = git://git.qnetp.net/smartirc4net.git

View file

@ -3,6 +3,7 @@ SUBDIRS = \
help \
NotifySharp \
FriendFace \
SmartIrc4net \
SparkleLib \
SparkleShare \
SparkleDiff \

1
SmartIrc4net Submodule

@ -0,0 +1 @@
Subproject commit 036e2233aea9bd3b4a30f8c5136daff0187eb5ec

View file

@ -31,9 +31,6 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="Mono.Posix" />
<Reference Include="Meebey.SmartIrc4net, Version=0.4.5.0, Culture=neutral, PublicKeyToken=7868485fbf407e0f">
<Package>smartirc4net</Package>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="SparkleRepo.cs" />

View file

@ -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 $?

View file

@ -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)

View file

@ -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")
])

View file

@ -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