media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch

   1 --- a/configure.ac
   2 +++ b/configure.ac
   3 @@ -560,8 +560,8 @@
   4    use_xlib="Yes"
   5  #no x11.pc on centos4
   6  #  PKG_CHECK_MODULES(X11, [x11])
   7 -  PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no")
   8  fi
   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"])
  12
  13 @@ -1924,6 +1924,10 @@
  14  # so we set HAVE_LIBXPMFORLEFTY instead of the usual HAVE_LIBXPM
  15  #
  16
  17 +AC_ARG_WITH(lefty,
  18 +  [AS_HELP_STRING([--with-lefty=yes],[build lefty])],
  19 +  [],[with_xaw=yes])
  20 +
  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"])
  27
  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"])
  34 +
  35 +if test "x$with_xaw" != "xyes"; then
  36 +  use_lefty="No (disabled)"
  37 +else
  38 +
  39  save_CPPFLAGS=$CPPFLAGS
  40  save_LDFLAGS=$LDFLAGS
  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])
  44  LDFLAGS=$save_LDFLAGS
  45  CPPFLAGS=$save_CPPFLAGS
  46 -AC_SUBST([XPM_INCLUDES])
  47 -AC_SUBST([XPM_LIBS])
  48
  49  dnl -----------------------------------
  50  dnl INCLUDES and LIBS for XAW
  51
  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
  59  save_LDFLAGS=$LDFLAGS
  60  CPPFLAGS="$CPPFLAGS $XAW_INCLUDES $X_CFLAGS"
  61 @@ -1978,12 +1985,17 @@
  62  fi
  63  LDFLAGS=$save_LDFLAGS
  64  CPPFLAGS=$save_CPPFLAGS
  65 +
  66 +fi
  67 +
  68 +AC_SUBST([XPM_INCLUDES])
  69 +AC_SUBST([XPM_LIBS])
  70  AC_SUBST([XAW_INCLUDES])
  71  AC_SUBST([XAW_LIBS])
  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)
  79      fi
  80  fi
  81