Changeset 858ea01

Timestamp:

2010-09-30T05:50:43Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6ce2240

Parents:

2dcaf9a

Message:

Allow building OTR support as a plugin. Fairly simple, let's hope I can get
away with doing this without libtool (eep).

Files:

• Makefile (modified) (5 diffs)
• configure (modified) (2 diffs)
• otr.c (modified) (3 diffs)
• unix.c (modified) (1 diff)

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o otr.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS)
+objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o $(OTR_BI) query.o root_commands.o set.o storage.o $(STORAGE_OBJS)
 headers = bitlbee.h commands.h conf.h config.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h lib/events.h lib/ftutil.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/account.h protocols/bee.h protocols/ft.h protocols/nogaim.h
 subdirs = lib protocols
@@ -27 +27 @@
 subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o)
 
-all: $(OUTFILE)
+all: $(OUTFILE) $(OTR_PI)
         $(MAKE) -C doc
 
@@ -33 +33 @@
         @echo -e '\nmake uninstall does not remove files in '$(DESTDIR)$(ETCDIR)', you can use make uninstall-etc to do that.\n'
 
-install: install-bin install-doc
+install: install-bin install-doc install-plugins
         @if ! [ -d $(DESTDIR)$(CONFIG) ]; then echo -e '\nThe configuration directory $(DESTDIR)$(CONFIG) does not exist yet, don'\''t forget to create it!'; fi
         @if ! [ -e $(DESTDIR)$(ETCDIR)/bitlbee.conf ]; then echo -e '\nNo files are installed in '$(DESTDIR)$(ETCDIR)' by make install. Run make install-etc to do that.'; fi
         @echo
 
-.PHONY:   install   install-bin   install-etc   install-doc \
+.PHONY:   install   install-bin   install-etc   install-doc install-plugins \
         uninstall uninstall-bin uninstall-etc uninstall-doc \
         all clean distclean tar $(subdirs)
@@ -104 +104 @@
         -rmdir $(DESTDIR)$(ETCDIR)
 
+install-plugins:
+ifdef OTR_PI
+        mkdir -p $(DESTDIR)$(PLUGINDIR)
+        install -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
+endif
+
 tar:
         fakeroot debian/rules clean || make distclean
@@ -112 +118 @@
 $(subdirs):
         @$(MAKE) -C $@ $(MAKECMDGOALS)
+
+$(OTR_PI): %.so: $(SRCDIR)%.c
+        @echo '*' Building plugin $@
+        @$(CC) $(CFLAGS) $(OTRFLAGS) -fPIC -shared $< -o $@
 
 $(objects): %.o: $(SRCDIR)%.c

configure

@@ -500 +500 @@
 fi
 if [ "$otr" = 1 ]; then
-        echo '#define WITH_OTR' >> config.h
+        # BI == built-in
+        echo '#define OTR_BI' >> config.h
         echo "EFLAGS+=-L${otrprefix}/lib -lotr" >> Makefile.settings
         echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings
-else
-        echo '#undef WITH_OTR' >> config.h
+        echo 'OTR_BI=otr.o' >> Makefile.settings
+elif [ "$otr" = "plugin" ]; then
+        echo '#define OTR_PI' >> config.h
+        echo "OTRFLAGS=-L${otrprefix}/lib -lotr" >> Makefile.settings
+        echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings
+        echo 'OTR_PI=otr.so' >> Makefile.settings
 fi
 
@@ -703 +708 @@
 if [ "$otr" = "1" ]; then
         echo '  Off-the-Record (OTR) Messaging enabled.'
+elif [ "$otr" = "plugin" ]; then
+        echo '  Off-the-Record (OTR) Messaging enabled (as a plugin).'
 else
         echo '  Off-the-Record (OTR) Messaging disabled.'

otr.c

@@ -39 +39 @@
 
 #include "bitlbee.h"
-#ifdef WITH_OTR
 #include "irc.h"
 #include "otr.h"
@@ -182 +181 @@
 /*** routines declared in otr.h: ***/
 
-void otr_init(void)
+#ifdef OTR_BI
+#define init_plugin otr_init
+#endif
+
+void init_plugin(void)
 {
         OTRL_INIT;
@@ -1716 +1719 @@
         }
 }
-
-
-#else /* WITH_OTR undefined */
-
-void cmd_otr(irc_t *irc, char **args)
-{
-        irc_usermsg(irc, "otr: n/a, compiled without OTR support");
-}
-
-#endif

unix.c

@@ -77 +77 @@
            uses the defaults. Therefore we initialize OTR after SSL. *sigh* */
         ssl_init();
+#ifdef OTR_BI
         otr_init();
+#endif
+        /* And in case OTR is loaded as a plugin, it'll also get loaded after
+           this point. */
         
         srand( time( NULL ) ^ getpid() );