[prev in list] [next in list] [prev in thread] [next in thread] 

List:       elinks-cvs
Subject:    [ELinks] elinks - pasky: Introduced feature.h, which should hold m...
From:       cvs () pasky ! ji ! cz
Date:       2003-12-31 19:13:26
Message-ID: 20031231191326.1864.qmail () machine ! sinus ! cz
[Download RAW message or body]

This is an automated notification of a change to the ELinks CVS tree.

Author: pasky
Module: elinks
   Tag: <TRUNK>
  Date: Wed Dec 31 19:13:26 2003 GMT

---- Log message:

Introduced feature.h, which should hold most of the fine-tuned compile-time features \
configuration. As an example case, leds and bookmarks were already moved there. Idea \
stolen from vim.


---- Files affected:

elinks:
   feature.h (NONE -> 1.1)  (new)
   INSTALL (1.24 -> 1.25) 
    http://cvsweb.elinks.or.cz/cvsweb.cgi/elinks/INSTALL.diff?r1=1.24&r2=1.25&f=u
   acconfig.h (1.63 -> 1.64) 
    http://cvsweb.elinks.or.cz/cvsweb.cgi/elinks/acconfig.h.diff?r1=1.63&r2=1.64&f=u
   configure.in (1.321 -> 1.322) 
    http://cvsweb.elinks.or.cz/cvsweb.cgi/elinks/configure.in.diff?r1=1.321&r2=1.322&f=u



---- Diffs:

Index: elinks/feature.h
diff -u /dev/null elinks/feature.h:1.1
--- /dev/null	Wed Dec 31 20:13:26 2003
+++ elinks/feature.h	Wed Dec 31 20:13:20 2003
@@ -0,0 +1,58 @@
+/* $Id$ */
+
+#ifndef ELINKS__DOTDOT_FEATURE_H
+#define ELINKS__DOTDOT_FEATURE_H
+
+/* This file contains various compile-time configuration settings, which you
+ * can adjust below. You can fine-tune the ELinks binary to include really only
+ * what you want it to. There are still some things which are to be adjusted
+ * only directly through the ./configure script arguments though, so check
+ * ./configure --help out as well! */
+
+/* For users:
+ *
+ * The "/" "*" and "*" "/" sequences start/end comments in this file. The
+ * features are controlled by using the "#define FEATURE" command. If it is
+ * commented out, it means the feature is disabled, otherwise it is enabled.
+ * Therefore, if the default doesn't suit you, you can either comment it out
+ * or remove the comment marks. */
+
+
+
+/*** LEDs
+ *
+ * These are the tiny LED-like indicators, shown at the bottom-right of the
+ * screen as [-----]. They are used for indication of various states, ie.
+ * whether you are currently talking through a SSL-secured connection.
+ *
+ * Default: disabled */
+
+/* #define USE_LEDS */
+
+
+/*** Bookmarks
+ *
+ * ELinks has built-in hiearchic bookmarks support. Open the bookmarks manager
+ * by pressing 's'. When bookmarks are enabled, also support for the internal
+ * ELinks bookmarks format is always compiled in.
+ *
+ * Default: enabled */
+
+#define BOOKMARKS
+
+
+/*** XBEL Bookmarks
+ *
+ * ELinks also supports universal XML bookmarks format called XBEL, also
+ * supported by ie. Galeon, various "always-have-my-bookmarks" websites and
+ * number of universal bookmark convertors.
+ *
+ * Default: enabled if libexpat (required library) found */
+
+#ifdef HAVE_LIBEXPAT
+/* Comment out the following line if you want to always have this disabled: */
+#undef HAVE_LIBEXPAT
+#endif
+
+
+#endif
Index: elinks/INSTALL
diff -u elinks/INSTALL:1.24 elinks/INSTALL:1.25
--- elinks/INSTALL:1.24	Wed Dec 31 19:47:48 2003
+++ elinks/INSTALL	Wed Dec 31 20:13:20 2003
@@ -58,7 +58,8 @@
 you about any memory leaks, incorrect memory manipulation etc, which may be
 helpful to us if you report it.  Next, disable any optional features you are not
 going to use, they can make the resulting binary smaller (altough it'll probably
-have no non-marginal performance imapact).  Also, you may try to override the
+have no non-marginal performance imapact) - especially go through the feature.h
+file in the project root directory.  Also, you may try to override the
 build system to build a dynamically linked binary, which can be a lot smaller as
 well.  Lastly, you can go to the Unicode/ and intl/ directories, then edit
 index.txt and remove any codepages or translations you don't like; especially
@@ -91,7 +92,10 @@
 	 should be enough.  However, in some FreeBSD 3 distributions you have to
 	 set CFLAGS=-aout before running ./configure.  Also, you may want to
 	 adjust some compile-time options through ./configure - do
-	 ./configure --help and it'll print out a list of them.
+	 ./configure --help and it'll print out a list of them. You can more
+	 finely control what's going to be included in the binary in the
+	 feature.h file, and some really detailed tuning can be performed in
+	 the src/setup.h.
 
 	 Also, a nice idea is to compile ELinks outside of the source tree.
 	 Make another directory and run path_to_source_tree/configure from it.
Index: elinks/acconfig.h
diff -u elinks/acconfig.h:1.63 elinks/acconfig.h:1.64
--- elinks/acconfig.h:1.63	Sun Dec  7 17:45:15 2003
+++ elinks/acconfig.h	Wed Dec 31 20:13:20 2003
@@ -69,12 +69,6 @@
 /* Define to 1 if we should include leak debugger and internal error checking \
facilites */  #undef DEBUG
 
-/* Define to 1 if we should support the tiny LEDs-like indicators */
-#undef USE_LEDS
-
-/* Define to 1 if we should include internal bookmark manager */
-#undef BOOKMARKS
-
 /* Define to 1 if we should include support for cookies */
 #undef COOKIES
 
@@ -126,3 +120,5 @@
 
 /* Define to 1 to enable support for SMB protocol (requires smbclient). */
 #undef ELINKS_SMB
+
+#include "../feature.h"
Index: elinks/configure.in
diff -u elinks/configure.in:1.321 elinks/configure.in:1.322
--- elinks/configure.in:1.321	Wed Dec 24 19:14:34 2003
+++ elinks/configure.in	Wed Dec 31 20:13:20 2003
@@ -861,15 +861,6 @@
 	      [  --enable-debug          enable leak debug and internal error checking],
 	      [if test "$enableval" = yes; then hm_enabled_debug="yes"; AC_DEFINE(DEBUG) \
fi])  
-AC_ARG_ENABLE(leds,
-              [  --enable-leds           enable the LED-like indicators support],
-	      [if test "$enableval" = yes; then AC_DEFINE(USE_LEDS) fi])
-
-AC_ARG_ENABLE(bookmarks,
-              [  --disable-bookmarks     disable internal bookmarks manager],
-	      [if test "$enableval" = yes; then AC_DEFINE(BOOKMARKS) fi],
-	      AC_DEFINE(BOOKMARKS))
-
 AC_ARG_ENABLE(cookies,
               [  --disable-cookies       disable internal cookies support],
 	      [if test "$enableval" = yes; then AC_DEFINE(COOKIES) fi],
@@ -929,6 +920,13 @@
               [  --disable-uri-rewrite   disable support for configurable URI \
rewriting],  [if test "$enableval" = yes; then AC_DEFINE(URI_REWRITE) fi],
 	      AC_DEFINE(URI_REWRITE))
+
+
+AC_ARG_ENABLE(weehoofooboomookerchoo,
+              [
+    Also check out the feature.h file for enabling/disabling more available
+    features!],
+	      [AC_MSG_ERROR(Are you strange, or what?)])
 
 
 dnl == EMX hack


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic