Removed #AX_PREFIX_CONFIG_H

13 files changed, 58 insertions, 58 deletions

diff --git a/src/ui/buffer.c b/src/ui/buffer.c
index 49b701b3..29eddd89 100644
--- a/src/ui/buffer.c
+++ b/src/ui/buffer.c
@@ -32,7 +32,7 @@
  *
  */
 
-#include "prof_config.h"
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -40,9 +40,9 @@
 #include <stdlib.h>
 
 #include <glib.h>
-#ifdef PROF_HAVE_NCURSESW_NCURSES_H
+#ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
-#elif PROF_HAVE_NCURSES_H
+#elif HAVE_NCURSES_H
 #include <ncurses.h>
 #endif
 
diff --git a/src/ui/buffer.h b/src/ui/buffer.h
index ef55e17e..ce9763ed 100644
--- a/src/ui/buffer.h
+++ b/src/ui/buffer.h
@@ -35,7 +35,7 @@
 #ifndef UI_BUFFER_H
 #define UI_BUFFER_H
 
-#include "prof_config.h"
+#include "config.h"
 #include "config/theme.h"
 
 #include <glib.h>
diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c
index 179e8a06..f7e5eebb 100644
--- a/src/ui/chatwin.c
+++ b/src/ui/chatwin.c
@@ -32,7 +32,7 @@
  *
  */
 
-#include "prof_config.h"
+#include "config.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -47,7 +47,7 @@
 #include "ui/window.h"
 #include "ui/titlebar.h"
 #include "plugins/plugins.h"
-#ifdef PROF_HAVE_LIBOTR
+#ifdef HAVE_LIBOTR
 #include "otr/otr.h"
 #endif
 
@@ -85,7 +85,7 @@ chatwin_receipt_received(ProfChatWin *chatwin, const char *const id)
     win_mark_received(win, id);
 }
 
-#ifdef PROF_HAVE_LIBOTR
+#ifdef HAVE_LIBOTR
 void
 chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted)
 {
diff --git a/src/ui/console.c b/src/ui/console.c
index dd1dc065..69984333 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -37,9 +37,9 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#ifdef PROF_HAVE_NCURSESW_NCURSES_H
+#ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
-#elif PROF_HAVE_NCURSES_H
+#elif HAVE_NCURSES_H
 #include <ncurses.h>
 #endif
 
@@ -57,7 +57,7 @@
 #include "xmpp/xmpp.h"
 #include "xmpp/bookmark.h"
 
-#ifdef PROF_HAVE_GIT_VERSION
+#ifdef HAVE_GIT_VERSION
 #include "gitversion.h"
 #endif
 
@@ -82,7 +82,7 @@ void
 cons_debug(const char *const msg, ...)
 {
     ProfWin *console = wins_get_console();
-    if (strcmp(PROF_PACKAGE_STATUS, "development") == 0) {
+    if (strcmp(PACKAGE_STATUS, "development") == 0) {
         va_list arg;
         va_start(arg, msg);
         GString *fmt_msg = g_string_new(NULL);
@@ -416,18 +416,18 @@ cons_about(void)
         _cons_splash_logo();
     } else {
 
-        if (strcmp(PROF_PACKAGE_STATUS, "development") == 0) {
-#ifdef PROF_HAVE_GIT_VERSION
-            win_vprint(console, '-', 0, NULL, 0, 0, "", "Welcome to Profanity, version %sdev.%s.%s", PROF_PACKAGE_VERSION, PROF_GIT_BRANCH, PROF_GIT_REVISION);
+        if (strcmp(PACKAGE_STATUS, "development") == 0) {
+#ifdef HAVE_GIT_VERSION
+            win_vprint(console, '-', 0, NULL, 0, 0, "", "Welcome to Profanity, version %sdev.%s.%s", PACKAGE_VERSION, PROF_GIT_BRANCH, PROF_GIT_REVISION);
 #else
-            win_vprint(console, '-', 0, NULL, 0, 0, "", "Welcome to Profanity, version %sdev", PROF_PACKAGE_VERSION);
+            win_vprint(console, '-', 0, NULL, 0, 0, "", "Welcome to Profanity, version %sdev", PACKAGE_VERSION);
 #endif
         } else {
-            win_vprint(console, '-', 0, NULL, 0, 0, "", "Welcome to Profanity, version %s", PROF_PACKAGE_VERSION);
+            win_vprint(console, '-', 0, NULL, 0, 0, "", "Welcome to Profanity, version %s", PACKAGE_VERSION);
         }
     }
 
-    win_vprint(console, '-', 0, NULL, 0, 0, "", "Copyright (C) 2012 - 2016 James Booth <%s>.", PROF_PACKAGE_BUGREPORT);
+    win_vprint(console, '-', 0, NULL, 0, 0, "", "Copyright (C) 2012 - 2016 James Booth <%s>.", PACKAGE_BUGREPORT);
     win_println(console, 0, "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>");
     win_println(console, 0, "");
     win_println(console, 0, "This is free software; you are free to change and redistribute it.");
@@ -2305,14 +2305,14 @@ _cons_splash_logo(void)
     win_print(console, '-', 0, NULL, 0, THEME_SPLASH, "", "|_|                                    (____/ ");
     win_print(console, '-', 0, NULL, 0, THEME_SPLASH, "", "");
 
-    if (strcmp(PROF_PACKAGE_STATUS, "development") == 0) {
-#ifdef PROF_HAVE_GIT_VERSION
-        win_vprint(console, '-', 0, NULL, 0, 0, "", "Version %sdev.%s.%s", PROF_PACKAGE_VERSION, PROF_GIT_BRANCH, PROF_GIT_REVISION);
+    if (strcmp(PACKAGE_STATUS, "development") == 0) {
+#ifdef HAVE_GIT_VERSION
+        win_vprint(console, '-', 0, NULL, 0, 0, "", "Version %sdev.%s.%s", PACKAGE_VERSION, PROF_GIT_BRANCH, PROF_GIT_REVISION);
 #else
-        win_vprint(console, '-', 0, NULL, 0, 0, "", "Version %sdev", PROF_PACKAGE_VERSION);
+        win_vprint(console, '-', 0, NULL, 0, 0, "", "Version %sdev", PACKAGE_VERSION);
 #endif
     } else {
-        win_vprint(console, '-', 0, NULL, 0, 0, "", "Version %s", PROF_PACKAGE_VERSION);
+        win_vprint(console, '-', 0, NULL, 0, 0, "", "Version %s", PACKAGE_VERSION);
     }
 }
 
diff --git a/src/ui/core.c b/src/ui/core.c
index e57b1f6a..4d9b4445 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -32,9 +32,9 @@
  *
  */
 
-#include "prof_config.h"
+#include "config.h"
 
-#ifdef PROF_HAVE_GIT_VERSION
+#ifdef HAVE_GIT_VERSION
 #include "gitversion.h"
 #endif
 
@@ -44,13 +44,13 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#ifdef PROF_HAVE_LIBXSS
+#ifdef HAVE_LIBXSS
 #include <X11/extensions/scrnsaver.h>
 #endif
 #include <glib.h>
-#ifdef PROF_HAVE_NCURSESW_NCURSES_H
+#ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
-#elif PROF_HAVE_NCURSES_H
+#elif HAVE_NCURSES_H
 #include <ncurses.h>
 #endif
 
@@ -64,7 +64,7 @@
 #include "jid.h"
 #include "log.h"
 #include "muc.h"
-#ifdef PROF_HAVE_LIBOTR
+#ifdef HAVE_LIBOTR
 #include "otr/otr.h"
 #endif
 #include "ui/ui.h"
@@ -81,7 +81,7 @@ static int inp_size;
 static gboolean perform_resize = FALSE;
 static GTimer *ui_idle_time;
 
-#ifdef PROF_HAVE_LIBXSS
+#ifdef HAVE_LIBXSS
 static Display *display;
 #endif
 
@@ -105,7 +105,7 @@ ui_init(void)
     wins_init();
     notifier_initialise();
     cons_about();
-#ifdef PROF_HAVE_LIBXSS
+#ifdef HAVE_LIBXSS
     display = XOpenDisplay(0);
 #endif
     ui_idle_time = g_timer_new();
@@ -150,7 +150,7 @@ unsigned long
 ui_get_idle_time(void)
 {
 // if compiled with libxss, get the x sessions idle time
-#ifdef PROF_HAVE_LIBXSS
+#ifdef HAVE_LIBXSS
     XScreenSaverInfo *info = XScreenSaverAllocInfo();
     if (info && display) {
         XScreenSaverQueryInfo(display, DefaultRootWindow(display), info);
@@ -497,7 +497,7 @@ ui_close_connected_win(int index)
         } else if (window->type == WIN_CHAT) {
             ProfChatWin *chatwin = (ProfChatWin*) window;
             assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
-#ifdef PROF_HAVE_LIBOTR
+#ifdef HAVE_LIBOTR
             if (chatwin->is_otr) {
                 otr_end_session(chatwin->barejid);
             }
diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c
index a56d4c05..fc1c204d 100644
--- a/src/ui/inputwin.c
+++ b/src/ui/inputwin.c
@@ -33,7 +33,7 @@
  */
 
 #define _XOPEN_SOURCE_EXTENDED
-#include "prof_config.h"
+#include "config.h"
 
 #include <sys/select.h>
 #include <stdlib.h>
@@ -46,9 +46,9 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#ifdef PROF_HAVE_NCURSESW_NCURSES_H
+#ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
-#elif PROF_HAVE_NCURSES_H
+#elif HAVE_NCURSES_H
 #include <ncurses.h>
 #endif
 
diff --git a/src/ui/notifier.c b/src/ui/notifier.c
index ddcac0aa..80ede2dc 100644
--- a/src/ui/notifier.c
+++ b/src/ui/notifier.c
@@ -31,17 +31,17 @@
  * source files in the program, then also delete it here.
  *
  */
-#include "prof_config.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
 #include <glib.h>
-#ifdef PROF_HAVE_LIBNOTIFY
+#ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
 #endif
-#ifdef PROF_PLATFORM_CYGWIN
+#ifdef PLATFORM_CYGWIN
 #include <windows.h>
 #endif
 
@@ -62,7 +62,7 @@ notifier_initialise(void)
 void
 notifier_uninit(void)
 {
-#ifdef PROF_HAVE_LIBNOTIFY
+#ifdef HAVE_LIBNOTIFY
     if (notify_is_initted()) {
         notify_uninit();
     }
@@ -196,7 +196,7 @@ notify_remind(void)
 void
 notify(const char *const message, int timeout, const char *const category)
 {
-#ifdef PROF_HAVE_LIBNOTIFY
+#ifdef HAVE_LIBNOTIFY
     log_debug("Attempting notification: %s", message);
     if (notify_is_initted()) {
         log_debug("Reinitialising libnotify");
@@ -227,7 +227,7 @@ notify(const char *const message, int timeout, const char *const category)
         log_error("Libnotify not initialised.");
     }
 #endif
-#ifdef PROF_PLATFORM_CYGWIN
+#ifdef PLATFORM_CYGWIN
     NOTIFYICONDATA nid;
     nid.cbSize = sizeof(NOTIFYICONDATA);
     //nid.hWnd = hWnd;
@@ -248,7 +248,7 @@ notify(const char *const message, int timeout, const char *const category)
 
     Shell_NotifyIcon(NIM_MODIFY, &nid);
 #endif
-#ifdef PROF_HAVE_OSXNOTIFY
+#ifdef HAVE_OSXNOTIFY
     GString *notify_command = g_string_new("terminal-notifier -title \"Profanity\" -message '");
 
     char *escaped_single = str_replace(message, "'", "'\\''");
diff --git a/src/ui/statusbar.c b/src/ui/statusbar.c
index 2176e844..45997e28 100644
--- a/src/ui/statusbar.c
+++ b/src/ui/statusbar.c
@@ -32,15 +32,15 @@
  *
  */
 
-#include "prof_config.h"
+#include "config.h"
 
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef PROF_HAVE_NCURSESW_NCURSES_H
+#ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
-#elif PROF_HAVE_NCURSES_H
+#elif HAVE_NCURSES_H
 #include <ncurses.h>
 #endif
 
diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c
index 6a00eeb9..2b50dbd7 100644
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "prof_config.h"
+#include "config.h"
 
 #include "common.h"
 #include "config/theme.h"
diff --git a/src/ui/ui.h b/src/ui/ui.h
index d5d741d6..ab42f4d1 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -35,12 +35,12 @@
 #ifndef UI_UI_H
 #define UI_UI_H
 
-#include "prof_config.h"
+#include "config.h"
 
 #include "command/commands.h"
 #include "ui/win_types.h"
 #include "muc.h"
-#ifdef PROF_HAVE_LIBOTR
+#ifdef HAVE_LIBOTR
 #include "otr/otr.h"
 #endif
 
@@ -135,7 +135,7 @@ void chatwin_outgoing_carbon(ProfChatWin *chatwin, const char *const message, pr
 void chatwin_contact_online(ProfChatWin *chatwin, Resource *resource, GDateTime *last_activity);
 void chatwin_contact_offline(ProfChatWin *chatwin, char *resource, char *status);
 char* chatwin_get_string(ProfChatWin *chatwin);
-#ifdef PROF_HAVE_LIBOTR
+#ifdef HAVE_LIBOTR
 void chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted);
 void chatwin_otr_unsecured(ProfChatWin *chatwin);
 void chatwin_otr_trust(ProfChatWin *chatwin);
diff --git a/src/ui/win_types.h b/src/ui/win_types.h
index 783324b0..e241a852 100644
--- a/src/ui/win_types.h
+++ b/src/ui/win_types.h
@@ -35,13 +35,13 @@
 #ifndef UI_WIN_TYPES_H
 #define UI_WIN_TYPES_H
 
-#include "prof_config.h"
+#include "config.h"
 
 #include <wchar.h>
 #include <glib.h>
-#ifdef PROF_HAVE_NCURSESW_NCURSES_H
+#ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
-#elif PROF_HAVE_NCURSES_H
+#elif HAVE_NCURSES_H
 #include <ncurses.h>
 #endif
 
diff --git a/src/ui/window.c b/src/ui/window.c
index f52ebc41..1d95d4cb 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -32,7 +32,7 @@
  *
  */
 
-#include "prof_config.h"
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -41,9 +41,9 @@
 #include <wchar.h>
 
 #include <glib.h>
-#ifdef PROF_HAVE_NCURSESW_NCURSES_H
+#ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
-#elif PROF_HAVE_NCURSES_H
+#elif HAVE_NCURSES_H
 #include <ncurses.h>
 #endif
 
diff --git a/src/ui/window.h b/src/ui/window.h
index 3ce2244a..4923f4ec 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -35,7 +35,7 @@
 #ifndef UI_WINDOW_H
 #define UI_WINDOW_H
 
-#include "prof_config.h"
+#include "config.h"
 
 #include <wchar.h>
 
@@ -46,9 +46,9 @@
 #include "xmpp/xmpp.h"
 #include "chat_state.h"
 
-#ifdef PROF_HAVE_NCURSESW_NCURSES_H
+#ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
-#elif PROF_HAVE_NCURSES_H
+#elif HAVE_NCURSES_H
 #include <ncurses.h>
 #endif