--- a/mcabber/configure.ac Fri Mar 21 19:49:27 2008 +0100
+++ b/mcabber/configure.ac Thu Mar 27 23:27:19 2008 +0100
@@ -227,14 +227,6 @@
CFLAGS="-O2 $CFLAGS"
fi
-AC_ARG_ENABLE(fifo,
- [AC_HELP_STRING(--enable-fifo, Enable FIFO named pipe)],
- fifo=$enableval, fifo="")
-AM_CONDITIONAL([FIFO], [test x$fifo = xyes])
-if test x"${fifo}" = x"yes"; then
- AC_DEFINE_UNQUOTED([ENABLE_FIFO],[1],[Named pipe support])
-fi
-
AC_ARG_ENABLE(hgcset,
[AC_HELP_STRING(--disable-hgcset, Do not use Mercurial changeset value)],
hgcset=$enableval, hgcset="yes")
--- a/mcabber/src/Makefile.am Fri Mar 21 19:49:27 2008 +0100
+++ b/mcabber/src/Makefile.am Thu Mar 27 23:27:19 2008 +0100
@@ -5,11 +5,7 @@
hbuf.c hbuf.h screen.c screen.h logprint.h \
settings.c settings.h hooks.c hooks.h utf8.c utf8.h \
histolog.c histolog.h utils.c utils.h pgp.c pgp.h \
- help.c help.h
-
-if FIFO
-mcabber_SOURCES += fifo.c fifo.h
-endif
+ fifo.c fifo.h help.c help.h
if OTR
mcabber_SOURCES += otr.c otr.h
--- a/mcabber/src/hooks.c Fri Mar 21 19:49:27 2008 +0100
+++ b/mcabber/src/hooks.c Thu Mar 27 23:27:19 2008 +0100
@@ -32,10 +32,7 @@
#include "utils.h"
#include "utf8.h"
#include "commands.h"
-
-#ifdef ENABLE_FIFO
-# include "fifo.h"
-#endif
+#include "fifo.h"
static char *extcmd;
@@ -54,9 +51,7 @@
last = now;
}
*/
-#ifdef ENABLE_FIFO
fifo_read();
-#endif
}
void hk_message_in(const char *bjid, const char *resname,
--- a/mcabber/src/jabglue.c Fri Mar 21 19:49:27 2008 +0100
+++ b/mcabber/src/jabglue.c Thu Mar 27 23:27:19 2008 +0100
@@ -34,10 +34,7 @@
#include "commands.h"
#include "pgp.h"
#include "otr.h"
-
-#ifdef ENABLE_FIFO
-# include "fifo.h"
-#endif
+#include "fifo.h"
#define JABBERPORT 5222
#define JABBERSSLPORT 5223
@@ -236,9 +233,7 @@
struct timeval tv;
static time_t last_eviqs_check = 0L;
int maxfd = 0;
-#ifdef ENABLE_FIFO
int fifofd;
-#endif
FD_ZERO(&fds);
FD_SET(0, &fds);
@@ -247,13 +242,11 @@
maxfd = jc->fd;
}
-#ifdef ENABLE_FIFO
fifofd = fifo_get_fd();
if (fifofd > 0) {
FD_SET(fifofd, &fds);
maxfd = MAX(maxfd, fifofd);
}
-#endif
tv.tv_sec = 60;
tv.tv_usec = 0;
--- a/mcabber/src/main.c Fri Mar 21 19:49:27 2008 +0100
+++ b/mcabber/src/main.c Thu Mar 27 23:27:19 2008 +0100
@@ -42,10 +42,7 @@
#include "utils.h"
#include "pgp.h"
#include "otr.h"
-
-#ifdef ENABLE_FIFO
-# include "fifo.h"
-#endif
+#include "fifo.h"
#ifdef ENABLE_HGCSET
# include "hgcset.h"
@@ -295,9 +292,6 @@
#ifdef WITH_ASPELL
puts("Compiled with Aspell support.");
#endif
-#ifdef ENABLE_FIFO
- puts("Compiled with FIFO support.");
-#endif
#ifdef ENABLE_DEBUG
puts("Compiled with debugging support.");
#endif
@@ -494,10 +488,8 @@
chatstates_disabled = settings_opt_get_int("disable_chatstates");
-#ifdef ENABLE_FIFO
/* Initialize FIFO named pipe */
fifo_init(settings_opt_get("fifo_name"));
-#endif
/* Load previous roster state */
hlog_load_state();
@@ -530,9 +522,7 @@
}
scr_TerminateCurses();
-#ifdef ENABLE_FIFO
fifo_deinit();
-#endif
#ifdef HAVE_LIBOTR
otr_terminate();
#endif