--- a/activity.c	Fri Nov 14 01:48:04 2014 +0200
+++ b/activity.c	Fri Nov 14 01:51:58 2014 +0200
@@ -261,7 +261,7 @@
 
 void activity_init (void)
 {
-#ifdef MCABBER_API_HAVE_COMPL_FLAGS
+#ifdef HAVE_MCABBER_COMPLETION_FLAGS
 	activity_cid1 = compl_new_category (COMPL_FLAGS_SORT);
 	activity_cid2 = compl_new_category (COMPL_FLAGS_SORT);
 #else

--- a/config.h.in	Fri Nov 14 01:48:04 2014 +0200
+++ b/config.h.in	Fri Nov 14 01:51:58 2014 +0200
@@ -2,7 +2,9 @@
 #ifndef LOCAL_CONFIG_H
 #define LOCAL_CONFIG_H
 
-#cmakedefine HAVE_LM_CONNECTION_UNREGISTER_REPLY_HANDLER
+#cmakedefine HAVE_LM_CONNECTION_UNREGISTER_REPLY_HANDLER @HAVE_LM_CONNECTION_UNREGISTER_REPLY_HANDLER@
+
+#cmakedefine HAVE_MCABBER_COMPLETION_FLAGS @HAVE_MCABBER_COMPLETION_FLAGS@
 
 #define PROJECT_VERSION ( "${PROJECT_VERSION}" )
 
@@ -16,6 +18,5 @@
 #define GEOLOC_DESCRIPTION       ( "${GEOLOC_DESCRIPTION}" )
 #define ACTIVITY_DESCRIPTION     ( "${ACTIVITY_DESCRIPTION}" )
 
-
 #endif
 

--- a/geoloc.c	Fri Nov 14 01:48:04 2014 +0200
+++ b/geoloc.c	Fri Nov 14 01:51:58 2014 +0200
@@ -254,7 +254,7 @@
 
 void geoloc_init ( void )
 {
-#ifdef MCABBER_API_HAVE_COMPL_FLAGS
+#ifdef HAVE_MCABBER_COMPLETION_FLAGS
 	geoloc_cid = compl_new_category (COMPL_FLAGS_SORT);
 #else
 	geoloc_cid = compl_new_category ();

--- a/mood.c	Fri Nov 14 01:48:04 2014 +0200
+++ b/mood.c	Fri Nov 14 01:51:58 2014 +0200
@@ -245,7 +245,7 @@
 
 void mood_init (void)
 {
-#ifdef MCABBER_API_HAVE_COMPL_FLAGS
+#ifdef HAVE_MCABBER_COMPLETION_FLAGS
 	mood_cid = compl_new_category (COMPL_FLAGS_SORT);
 #else
 	mood_cid = compl_new_category ();

--- a/tune.c	Fri Nov 14 01:48:04 2014 +0200
+++ b/tune.c	Fri Nov 14 01:51:58 2014 +0200
@@ -236,7 +236,7 @@
 
 void tune_init(void)
 {
-#ifdef MCABBER_API_HAVE_COMPL_FLAGS
+#ifdef HAVE_MCABBER_COMPLETION_FLAGS
 	tune_cid = compl_new_category (COMPL_FLAGS_SORT);
 #else
 	tune_cid = compl_new_category ();