From eb55a46ee0282d024b5764b39ad9f1f86a486a4a Mon Sep 17 00:00:00 2001 From: Daniel Carl Date: Thu, 18 Jul 2013 02:22:07 +0200 Subject: [PATCH] Moved feature config from config.mk to config.def.h. --- config.mk | 7 ------- src/config.def.h | 11 ++++++++++- src/main.h | 1 + 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/config.mk b/config.mk index 460e588..15cf376 100644 --- a/config.mk +++ b/config.mk @@ -8,13 +8,6 @@ MANDIR ?= $(PREFIX)/share/man #----------------compile options--------------------- -# features -CPPFLAGS += -DFEATURE_COOKIE -CPPFLAGS += -DFEATURE_SEARCH_HIGHLIGHT -CPPFLAGS += -DFEATURE_NO_SCROLLBARS -#CPPFLAGS += -DFEATURE_GTK_PROGRESSBAR -CPPFLAGS += -DFEATURE_TITLE_IN_COMPLETION - LIBS = libsoup-2.4 GTK3LIBS=gtk+-3.0 webkitgtk-3.0 diff --git a/src/config.def.h b/src/config.def.h index 2172851..6ff2b10 100644 --- a/src/config.def.h +++ b/src/config.def.h @@ -20,6 +20,15 @@ #ifndef _CONFIG_H #define _CONFIG_H + +/* features */ +#define FEATURE_COOKIE +#define FEATURE_SEARCH_HIGHLIGHT +#define FEATURE_NO_SCROLLBARS +#define FEATURE_GTK_PROGRESSBAR +#define FEATURE_TITLE_IN_COMPLETION + + /* time in seconds after that message will be removed from inputbox if the * message where only temporary */ #define MESSAGE_TIMEOUT 5 @@ -29,7 +38,7 @@ #define MAXIMUM_HINTS 500 - +/* remove this if the bookmark file fits to the new format "URLtitle of pagetag1 tag2" */ #define ANNOUNCEMENT "\ \ Bookmark file format changed \ diff --git a/src/main.h b/src/main.h index 196f7b5..3bdb210 100644 --- a/src/main.h +++ b/src/main.h @@ -32,6 +32,7 @@ #include #else #endif +#include "config.h" /* size of some I/O buffer */ #define BUF_SIZE 512 -- 2.20.1