summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2009-09-17 12:04:35 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2009-09-17 12:04:35 +0000
commitbf4e52869bc0987dd93d49cea062987c472c3e11 (patch)
tree6e4506b7d4e839b74f55e529e7a169eaacb0491e /legacy
parent1573ce03ca9cab7f97c51990c7d8c09a5abdc519 (diff)
configure summary, maximum log level and other improvements.
Have all source to include config.h conditionally (HAVE_CONFIG_H), define EINA_LOG_LEVEL_MAXIMUM, minor changes to configure.ac to make it conform with the rest of efl. SVN revision: 42544
Diffstat (limited to '')
-rw-r--r--legacy/ethumb/configure.ac74
-rw-r--r--legacy/ethumb/src/bin/ethumb.c4
-rw-r--r--legacy/ethumb/src/bin/ethumbd.c4
-rw-r--r--legacy/ethumb/src/bin/ethumbd_child.c3
-rw-r--r--legacy/ethumb/src/bin/ethumbd_client.c4
-rw-r--r--legacy/ethumb/src/lib/md5.c4
-rw-r--r--legacy/ethumb/src/plugins/emotion/emotion.c3
-rw-r--r--legacy/ethumb/src/plugins/epdf/epdf.c3
-rw-r--r--legacy/ethumb/src/tests/ethumb_dbus.c4
9 files changed, 95 insertions, 8 deletions
diff --git a/legacy/ethumb/configure.ac b/legacy/ethumb/configure.ac
index 6d97e66171..81d4a7f002 100644
--- a/legacy/ethumb/configure.ac
+++ b/legacy/ethumb/configure.ac
@@ -1,13 +1,13 @@
1AC_INIT(ethumb, 0.1, antognolli@profusion.mobi) 1AC_INIT([ethumb], [0.1], [enlightenment-devel@lists.sourceforge.net])
2AC_PREREQ(2.52) 2AC_PREREQ([2.52])
3AC_CONFIG_SRCDIR(configure.ac) 3AC_CONFIG_SRCDIR([configure.ac])
4AC_CONFIG_MACRO_DIR([m4])
4AC_CANONICAL_BUILD 5AC_CANONICAL_BUILD
5AC_CANONICAL_HOST 6AC_CANONICAL_HOST
6AC_ISC_POSIX 7AC_ISC_POSIX
7 8
8AM_INIT_AUTOMAKE(1.6 dist-bzip2) 9AM_INIT_AUTOMAKE(1.6 dist-bzip2)
9AM_CONFIG_HEADER(config.h) 10AM_CONFIG_HEADER(config.h)
10AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
11_XTERM_COLORS 11_XTERM_COLORS
12 12
13AC_PROG_CC 13AC_PROG_CC
@@ -42,6 +42,22 @@ AC_DEFINE_UNQUOTED(PLUGINSDIR, ["$PLUGINSDIR"], [Where plugins are installed.])
42 42
43EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) 43EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
44 44
45with_max_log_level="<unset>"
46AC_ARG_WITH(internal-maximum-log-level,
47 [AC_HELP_STRING([--with-internal-maximum-log-level=NUMBER],
48 [limit eina internal log level to the given number, any call to EINA_LOG() with values greater than this will be compiled out, ignoring runtime settings, but saving function calls.])],
49 [
50 if test "x${withval}" != "xno"; then
51 if echo "${withval}" | grep '^[[0-9]]\+$' >/dev/null 2>/dev/null; then
52 AC_MSG_NOTICE([ignoring any EINA_LOG() with level greater than ${withval}])
53 AC_DEFINE_UNQUOTED(EINA_LOG_LEVEL_MAXIMUM, ${withval}, [if set, logging is limited to this amount.])
54 with_max_log_level="${withval}"
55 else
56 AC_MSG_ERROR([--with-internal-maximum-log-level takes a decimal number, got "${withval}" instead.])
57 fi
58 fi
59 ], [:])
60
45PKG_CHECK_MODULES(EINA, [eina-0]) 61PKG_CHECK_MODULES(EINA, [eina-0])
46PKG_CHECK_MODULES(EVAS, [evas]) 62PKG_CHECK_MODULES(EVAS, [evas])
47PKG_CHECK_MODULES(ECORE, [ecore]) 63PKG_CHECK_MODULES(ECORE, [ecore])
@@ -114,3 +130,53 @@ data/frames/Makefile
114m4/Makefile 130m4/Makefile
115doc/Makefile 131doc/Makefile
116]) 132])
133
134txt_strip() {
135 echo "[$]@" | sed -e 's/^[[ \t]]*\([[^ \t]]*\)[[ \t]]*$/\1/g'
136}
137
138MODS=""
139for mod in $OPTIONAL_MODULES; do
140 MODS="$MODS ${COLOR_HGREEN}+$mod${COLOR_END}"
141done
142MODS=$(txt_strip $MODS)
143
144UNUSED_MODS=""
145for mod in $UNUSED_OPTIONAL_MODULES; do
146 UNUSED_MODS="$UNUSED_MODS ${COLOR_HRED}-$mod${COLOR_END}"
147done
148UNUSED_MODS=$(txt_strip $UNUSED_MODS)
149
150cat <<SUMMARY_EOF
151
152Summary:
153 * project..........: $PACKAGE $VERSION
154 * prefix...........: $(txt_strip $prefix)
155 * DBus services dir: $(txt_strip $dbusservicedir)
156 * CFLAGS...........: $(txt_strip $CFLAGS)
157 * LDFLAGS..........: $(txt_strip $LDFLAGS)
158
159Configuration Options Summary:
160
161 * maximum log level: ${with_max_log_level}
162 * documentation....: ${build_doc}
163
164SUMMARY_EOF
165
166if test "x$MODS" != "x"; then
167 echo -e " * enabled modules..: $MODS"
168fi
169
170if test "x$UNUSED_MODS" != "x"; then
171 echo -e " * disabled modules.: $UNUSED_MODS"
172fi
173
174cat << HINT_EOF
175
176now type:
177
178Now type 'make' ('gmake' on some systems) to compile $PACKAGE, and
179then afterwards as root (or the user who will install this), type
180'make install'. Change users with 'su' or 'sudo' appropriately.
181
182HINT_EOF
diff --git a/legacy/ethumb/src/bin/ethumb.c b/legacy/ethumb/src/bin/ethumb.c
index 0e31942ae0..35f1844efb 100644
--- a/legacy/ethumb/src/bin/ethumb.c
+++ b/legacy/ethumb/src/bin/ethumb.c
@@ -21,7 +21,9 @@
21 * @author Rafael Antognolli <antognolli@profusion.mobi> 21 * @author Rafael Antognolli <antognolli@profusion.mobi>
22 * @author Gustavo Sverzut Barbieri <barbieri@profusion.mobi> 22 * @author Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
23 */ 23 */
24#include <config.h> 24#ifdef HAVE_CONFIG_H
25#include "config.h"
26#endif
25#include <stdio.h> 27#include <stdio.h>
26#include <stdlib.h> 28#include <stdlib.h>
27#include <string.h> 29#include <string.h>
diff --git a/legacy/ethumb/src/bin/ethumbd.c b/legacy/ethumb/src/bin/ethumbd.c
index 0cce3ece73..c49204a016 100644
--- a/legacy/ethumb/src/bin/ethumbd.c
+++ b/legacy/ethumb/src/bin/ethumbd.c
@@ -20,7 +20,9 @@
20 * 20 *
21 * @author Rafael Antognolli <antognolli@profusion.mobi> 21 * @author Rafael Antognolli <antognolli@profusion.mobi>
22 */ 22 */
23#include <config.h> 23#ifdef HAVE_CONFIG_H
24#include "config.h"
25#endif
24#include <stdio.h> 26#include <stdio.h>
25#include <stdlib.h> 27#include <stdlib.h>
26#include <string.h> 28#include <string.h>
diff --git a/legacy/ethumb/src/bin/ethumbd_child.c b/legacy/ethumb/src/bin/ethumbd_child.c
index 48516056b5..c45c06b60b 100644
--- a/legacy/ethumb/src/bin/ethumbd_child.c
+++ b/legacy/ethumb/src/bin/ethumbd_child.c
@@ -21,6 +21,9 @@
21 * @author Rafael Antognolli <antognolli@profusion.mobi> 21 * @author Rafael Antognolli <antognolli@profusion.mobi>
22 */ 22 */
23 23
24#ifdef HAVE_CONFIG_H
25#include "config.h"
26#endif
24#include <stdlib.h> 27#include <stdlib.h>
25#include <unistd.h> 28#include <unistd.h>
26#include <limits.h> 29#include <limits.h>
diff --git a/legacy/ethumb/src/bin/ethumbd_client.c b/legacy/ethumb/src/bin/ethumbd_client.c
index 685cb9b0ac..edf2d131a0 100644
--- a/legacy/ethumb/src/bin/ethumbd_client.c
+++ b/legacy/ethumb/src/bin/ethumbd_client.c
@@ -21,7 +21,9 @@
21 * @author Rafael Antognolli <antognolli@profusion.mobi> 21 * @author Rafael Antognolli <antognolli@profusion.mobi>
22 * @author Gustavo Sverzut Barbieri <barbieri@profusion.mobi> 22 * @author Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
23 */ 23 */
24#include <config.h> 24#ifdef HAVE_CONFIG_H
25#include "config.h"
26#endif
25#include <stdio.h> 27#include <stdio.h>
26#include <stdlib.h> 28#include <stdlib.h>
27#include <string.h> 29#include <string.h>
diff --git a/legacy/ethumb/src/lib/md5.c b/legacy/ethumb/src/lib/md5.c
index 4603efd14e..b62a9ffe7d 100644
--- a/legacy/ethumb/src/lib/md5.c
+++ b/legacy/ethumb/src/lib/md5.c
@@ -15,6 +15,10 @@
15 * will fill a supplied 16-byte array with the digest. 15 * will fill a supplied 16-byte array with the digest.
16 */ 16 */
17 17
18#ifdef HAVE_CONFIG_H
19#include "config.h"
20#endif
21
18#include <string.h> /* for memcpy() */ 22#include <string.h> /* for memcpy() */
19#include "md5.h" 23#include "md5.h"
20 24
diff --git a/legacy/ethumb/src/plugins/emotion/emotion.c b/legacy/ethumb/src/plugins/emotion/emotion.c
index 227d2cac0e..51776d3fd2 100644
--- a/legacy/ethumb/src/plugins/emotion/emotion.c
+++ b/legacy/ethumb/src/plugins/emotion/emotion.c
@@ -1,6 +1,9 @@
1#include "Ethumb.h" 1#include "Ethumb.h"
2#include "Ethumb_Plugin.h" 2#include "Ethumb_Plugin.h"
3
4#ifdef HAVE_CONFIG_H
3#include "config.h" 5#include "config.h"
6#endif
4 7
5#include <stdio.h> 8#include <stdio.h>
6#include <stdlib.h> 9#include <stdlib.h>
diff --git a/legacy/ethumb/src/plugins/epdf/epdf.c b/legacy/ethumb/src/plugins/epdf/epdf.c
index 217f98d360..3c74398645 100644
--- a/legacy/ethumb/src/plugins/epdf/epdf.c
+++ b/legacy/ethumb/src/plugins/epdf/epdf.c
@@ -1,6 +1,9 @@
1#include "Ethumb.h" 1#include "Ethumb.h"
2#include "Ethumb_Plugin.h" 2#include "Ethumb_Plugin.h"
3
4#ifdef HAVE_CONFIG_H
3#include "config.h" 5#include "config.h"
6#endif
4 7
5#include <stdio.h> 8#include <stdio.h>
6#include <stdlib.h> 9#include <stdlib.h>
diff --git a/legacy/ethumb/src/tests/ethumb_dbus.c b/legacy/ethumb/src/tests/ethumb_dbus.c
index 3357c6f92f..5e9a6c46ee 100644
--- a/legacy/ethumb/src/tests/ethumb_dbus.c
+++ b/legacy/ethumb/src/tests/ethumb_dbus.c
@@ -20,7 +20,9 @@
20 * 20 *
21 * @author Rafael Antognolli <antognolli@profusion.mobi> 21 * @author Rafael Antognolli <antognolli@profusion.mobi>
22 */ 22 */
23#include <config.h> 23#ifdef HAVE_CONFIG_H
24#include "config.h"
25#endif
24#include <stdio.h> 26#include <stdio.h>
25#include <stdlib.h> 27#include <stdlib.h>
26#include <string.h> 28#include <string.h>