1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
Makefile.am | 3 +--
configure.in | 15 ++++++++-------
src/Makefile.am | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index f90cc9d..36495a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,10 +5,9 @@
SUBDIRS = src pixmaps po
-owwdocdir = ${prefix}/doc/oww
+owwdocdir = ${docdir}
owwdoc_DATA = \
README\
- COPYING\
AUTHORS\
ChangeLog\
INSTALL\
diff --git a/configure.in b/configure.in
index dbc694e..a9c779f 100644
--- a/configure.in
+++ b/configure.in
@@ -6,6 +6,8 @@ AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([.])
+
AC_ISC_POSIX
dnl CFLAGS=""
AC_SUBST(CFLAGS)
@@ -134,17 +136,16 @@ else
AC_MSG_WARN(interactive CLI will not be build)
fi
-AC_ARG_ENABLE(gui, , build_gui=no, build_gui=yes)
-AM_CONDITIONAL(DISABLEGUI, test "x$build_gui" = "xno")
+AC_ARG_ENABLE([gui],AS_HELP_STRING([--disable-gui], [Do not build gtk gui]))
-if test "$build_gui" = yes ; then
+AM_CONDITIONAL([DISABLEGUI], [test "x$enable_gui" != "xyes"])
+
+AS_IF([test "x$enable_gui" != "xno"], [
AC_MSG_WARN(building gui)
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4.0 gdk-2.0 gdk-pixbuf-2.0 gmodule-export-2.0,,exit)
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS)
-else
- AC_MSG_WARN(skipping GTK gui)
-fi
+])
dnl How many times do we retry T on failure?
AC_ARG_ENABLE(temptries,
@@ -319,7 +320,7 @@ cat<<EOF
------------------------------
Oww version $VERSION by Simon Melhuish (simon@melhuish.info)
- build_gui = $build_gui
+ build_gui = $xgui
interactive = $interactive
seriallock = $seriallock
USB support = $usb_msg
diff --git a/src/Makefile.am b/src/Makefile.am
index e0f6746..c02aab5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
# Needs USB_CFLAGS here else things like musbllnk compile will fail if usb.h
# isn't in the compilers standard include path.
-INCLUDES = \
+AM_CPPFLAGS = \
$(USB_CFLAGS)\
$(GTK_CFLAGS)
|
GitWeb