Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 372939 | Differences between
and this patch

Collapse All | Expand All

(-)configure.ac.old (-11 / +23 lines)
Lines 1924-1929 Link Here
1924
# so we set HAVE_LIBXPMFORLEFTY instead of the usual HAVE_LIBXPM
1924
# so we set HAVE_LIBXPMFORLEFTY instead of the usual HAVE_LIBXPM
1925
#
1925
#
1926
1926
1927
AC_ARG_WITH(lefty,
1928
  [AS_HELP_STRING([--with-lefty=yes],[build lefty])],
1929
  [],[with_xaw=yes])
1930
1927
AC_ARG_WITH(Xpmincludedir,
1931
AC_ARG_WITH(Xpmincludedir,
1928
  [AS_HELP_STRING([--with-Xpmincludedir=DIR],[use Xpm includes from DIR])],
1932
  [AS_HELP_STRING([--with-Xpmincludedir=DIR],[use Xpm includes from DIR])],
1929
  [XPM_INCLUDES="-I$withval"])
1933
  [XPM_INCLUDES="-I$withval"])
Lines 1931-1936 Link Here
1931
  [AS_HELP_STRING([--with-Xpmlibdir=DIR],[use Xpm libraries from DIR])],
1935
  [AS_HELP_STRING([--with-Xpmlibdir=DIR],[use Xpm libraries from DIR])],
1932
  [XPM_LIBS="-L$withval"])
1936
  [XPM_LIBS="-L$withval"])
1933
1937
1938
AC_ARG_WITH(Xawincludedir,
1939
  [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
1940
  [XAW_INCLUDES="-I$withval"])
1941
AC_ARG_WITH(Xawlibdir,
1942
  [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
1943
  [XAW_LIBS="-L$withval"])
1944
1945
if test "x$with_xaw" != "xyes"; then
1946
  use_lefty="No (disabled)"
1947
else
1948
1934
save_CPPFLAGS=$CPPFLAGS
1949
save_CPPFLAGS=$CPPFLAGS
1935
save_LDFLAGS=$LDFLAGS
1950
save_LDFLAGS=$LDFLAGS
1936
CPPFLAGS="$CPPFLAGS $XPM_INCLUDES $X_CFLAGS"
1951
CPPFLAGS="$CPPFLAGS $XPM_INCLUDES $X_CFLAGS"
Lines 1941-1958 Link Here
1941
   AC_MSG_WARN(Optional Xpm library not available), [-lXmu -lXt -lX11 -lXext $SOCKET_LIBS])
1956
   AC_MSG_WARN(Optional Xpm library not available), [-lXmu -lXt -lX11 -lXext $SOCKET_LIBS])
1942
LDFLAGS=$save_LDFLAGS
1957
LDFLAGS=$save_LDFLAGS
1943
CPPFLAGS=$save_CPPFLAGS
1958
CPPFLAGS=$save_CPPFLAGS
1944
AC_SUBST(XPM_INCLUDES)
1945
AC_SUBST(XPM_LIBS)
1946
1959
1947
dnl -----------------------------------
1960
dnl -----------------------------------
1948
dnl INCLUDES and LIBS for XAW
1961
dnl INCLUDES and LIBS for XAW
1949
1962
1950
AC_ARG_WITH(Xawincludedir,
1951
  [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
1952
  [XAW_INCLUDES="-I$withval"])
1953
AC_ARG_WITH(Xawlibdir,
1954
  [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
1955
  [XAW_LIBS="-L$withval"])
1956
save_CPPFLAGS=$CPPFLAGS
1963
save_CPPFLAGS=$CPPFLAGS
1957
save_LDFLAGS=$LDFLAGS
1964
save_LDFLAGS=$LDFLAGS
1958
CPPFLAGS="$CPPFLAGS $XAW_INCLUDES $X_CFLAGS"
1965
CPPFLAGS="$CPPFLAGS $XAW_INCLUDES $X_CFLAGS"
Lines 1978-1989 Link Here
1978
fi
1985
fi
1979
LDFLAGS=$save_LDFLAGS
1986
LDFLAGS=$save_LDFLAGS
1980
CPPFLAGS=$save_CPPFLAGS
1987
CPPFLAGS=$save_CPPFLAGS
1988
1989
fi
1990
1991
AC_SUBST(XPM_INCLUDES)
1992
AC_SUBST(XPM_LIBS)
1981
AC_SUBST(XAW_INCLUDES)
1993
AC_SUBST(XAW_INCLUDES)
1982
AC_SUBST(XAW_LIBS)
1994
AC_SUBST(XAW_LIBS)
1983
AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" != "xno"])
1995
AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" = "xyes"])
1984
if test "x$with_xaw" = "xno"; then
1996
if test "x$with_xaw" != "xyes"; then
1985
    if test "x$no_x" != "xyes"; then
1997
    if test "x$no_x" != "xyes"; then
1986
	AC_MSG_WARN(Lefty cannot be built)
1998
	AC_MSG_WARN(Lefty will not be built)
1987
    fi
1999
    fi
1988
fi
2000
fi
1989
2001

Return to bug 372939