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
80
81
|
--- a/configure.ac
+++ b/configure.ac
@@ -560,8 +560,8 @@
use_xlib="Yes"
#no x11.pc on centos4
# PKG_CHECK_MODULES(X11, [x11])
- PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no")
fi
+PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no")
AM_CONDITIONAL(WITH_X, [test "x$use_xlib" = "xYes"])
AM_CONDITIONAL(WITH_XRENDER, [test "x$,HAVE_XRENDER" = "xyes"])
@@ -1924,6 +1924,10 @@
# so we set HAVE_LIBXPMFORLEFTY instead of the usual HAVE_LIBXPM
#
+AC_ARG_WITH(lefty,
+ [AS_HELP_STRING([--with-lefty=yes],[build lefty])],
+ [],[with_xaw=yes])
+
AC_ARG_WITH(Xpmincludedir,
[AS_HELP_STRING([--with-Xpmincludedir=DIR],[use Xpm includes from DIR])],
[XPM_INCLUDES="-I$withval"])
@@ -1931,6 +1935,17 @@
[AS_HELP_STRING([--with-Xpmlibdir=DIR],[use Xpm libraries from DIR])],
[XPM_LIBS="-L$withval"])
+AC_ARG_WITH(Xawincludedir,
+ [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
+ [XAW_INCLUDES="-I$withval"])
+AC_ARG_WITH(Xawlibdir,
+ [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
+ [XAW_LIBS="-L$withval"])
+
+if test "x$with_xaw" != "xyes"; then
+ use_lefty="No (disabled)"
+else
+
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
CPPFLAGS="$CPPFLAGS $XPM_INCLUDES $X_CFLAGS"
@@ -1941,18 +1956,10 @@
AC_MSG_WARN(Optional Xpm library not available), [-lXmu -lXt -lX11 -lXext $SOCKET_LIBS])
LDFLAGS=$save_LDFLAGS
CPPFLAGS=$save_CPPFLAGS
-AC_SUBST([XPM_INCLUDES])
-AC_SUBST([XPM_LIBS])
dnl -----------------------------------
dnl INCLUDES and LIBS for XAW
-AC_ARG_WITH(Xawincludedir,
- [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
- [XAW_INCLUDES="-I$withval"])
-AC_ARG_WITH(Xawlibdir,
- [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
- [XAW_LIBS="-L$withval"])
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
CPPFLAGS="$CPPFLAGS $XAW_INCLUDES $X_CFLAGS"
@@ -1978,12 +1985,17 @@
fi
LDFLAGS=$save_LDFLAGS
CPPFLAGS=$save_CPPFLAGS
+
+fi
+
+AC_SUBST([XPM_INCLUDES])
+AC_SUBST([XPM_LIBS])
AC_SUBST([XAW_INCLUDES])
AC_SUBST([XAW_LIBS])
-AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" != "xno"])
-if test "x$with_xaw" = "xno"; then
+AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" = "xyes"])
+if test "x$with_xaw" != "xyes"; then
if test "x$no_x" != "xyes"; then
- AC_MSG_WARN(Lefty cannot be built)
+ AC_MSG_WARN(Lefty will not be built)
fi
fi
|
GitWeb