6 # PKG_CHECK_MODULES(X11, [x11])
7 - PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no")
9 +PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no")
10 AM_CONDITIONAL(WITH_X, [test "x$use_xlib" = "xYes"])
11 AM_CONDITIONAL(WITH_XRENDER, [test "x$,HAVE_XRENDER" = "xyes"])
13 @@ -1924,6 +1924,10 @@
14 # so we set HAVE_LIBXPMFORLEFTY instead of the usual HAVE_LIBXPM
18 + [AS_HELP_STRING([--with-lefty=yes],[build lefty])],
21 AC_ARG_WITH(Xpmincludedir,
22 [AS_HELP_STRING([--with-Xpmincludedir=DIR],[use Xpm includes from DIR])],
23 [XPM_INCLUDES="-I$withval"])
24 @@ -1931,6 +1935,17 @@
25 [AS_HELP_STRING([--with-Xpmlibdir=DIR],[use Xpm libraries from DIR])],
26 [XPM_LIBS="-L$withval"])
28 +AC_ARG_WITH(Xawincludedir,
29 + [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
30 + [XAW_INCLUDES="-I$withval"])
31 +AC_ARG_WITH(Xawlibdir,
32 + [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
33 + [XAW_LIBS="-L$withval"])
35 +if test "x$with_xaw" != "xyes"; then
36 + use_lefty="No (disabled)"
39 save_CPPFLAGS=$CPPFLAGS
41 CPPFLAGS="$CPPFLAGS $XPM_INCLUDES $X_CFLAGS"
42 @@ -1941,18 +1956,10 @@
43 AC_MSG_WARN(Optional Xpm library not available), [-lXmu -lXt -lX11 -lXext $SOCKET_LIBS])
45 CPPFLAGS=$save_CPPFLAGS
46 -AC_SUBST([XPM_INCLUDES])
49 dnl -----------------------------------
50 dnl INCLUDES and LIBS for XAW
52 -AC_ARG_WITH(Xawincludedir,
53 - [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
54 - [XAW_INCLUDES="-I$withval"])
55 -AC_ARG_WITH(Xawlibdir,
56 - [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
57 - [XAW_LIBS="-L$withval"])
58 save_CPPFLAGS=$CPPFLAGS
60 CPPFLAGS="$CPPFLAGS $XAW_INCLUDES $X_CFLAGS"
61 @@ -1978,12 +1985,17 @@
64 CPPFLAGS=$save_CPPFLAGS
68 +AC_SUBST([XPM_INCLUDES])
70 AC_SUBST([XAW_INCLUDES])
72 -AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" != "xno"])
73 -if test "x$with_xaw" = "xno"; then
74 +AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" = "xyes"])
75 +if test "x$with_xaw" != "xyes"; then
76 if test "x$no_x" != "xyes"; then
77 - AC_MSG_WARN(Lefty cannot be built)
78 + AC_MSG_WARN(Lefty will not be built)