[foo-cvs] fooelk configure.ac,1.12,1.13

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/fooelk
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3238

Modified Files:
	configure.ac 
Log Message:
equiv to revision level r267 of original elk

Index: configure.ac
===================================================================
RCS file: /cvsroot/foo/fooelk/configure.ac,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** configure.ac	26 Apr 2010 15:06:49 -0000	1.12
--- configure.ac	26 Apr 2010 15:10:11 -0000	1.13
***************
*** 582,592 ****
  
  AC_PATH_X
  
  AC_CHECK_LIB(X11, XOpenDisplay,
   [ac_cv_my_have_x11=yes
!   X_CFLAGS="-I${x_includes}"
!   X_LIBS="-lX11 -L${x_libraries}"],
   [ac_cv_my_have_x11=no],
!  [[-L${x_libraries}]])
  AM_CONDITIONAL(HAVE_X11, test "${ac_cv_my_have_x11}" = "yes")
  AC_SUBST(X_CFLAGS)
--- 582,594 ----
  
  AC_PATH_X
+ if test -n "${x_includes}"; then x_cflags="-I${x_includes}"; fi
+ if test -n "${x_libraries}"; then x_libs="-I${x_libraries}"; fi
  
  AC_CHECK_LIB(X11, XOpenDisplay,
   [ac_cv_my_have_x11=yes
!   X_CFLAGS="${x_cflags}"
!   X_LIBS="${x_libs} -lX11"],
   [ac_cv_my_have_x11=no],
!  [[${x_libs}]])
  AM_CONDITIONAL(HAVE_X11, test "${ac_cv_my_have_x11}" = "yes")
  AC_SUBST(X_CFLAGS)
***************
*** 597,607 ****
     [ac_cv_my_have_xt=yes
      AC_CHECK_LIB(Xmu, XmuDrawLogo,
!      [XT_CFLAGS="-I${x_includes}"
!       XT_LIBS="-L${x_libraries} -lXmu -lXt -lSM -lICE -lXext -lX11"],
!      [XT_CFLAGS="-I${x_includes}"
!       XT_LIBS="-L${x_libraries} -lXt -lSM -lICE -lXext -lX11"],
!      [[-lXt -lSM -lICE -lXext -lX11 -L${x_libraries}]])],
     [ac_cv_my_have_xt=no],
!    [[-lSM -lICE -lXext -lX11 -L${x_libraries}]])
  else
    ac_cv_my_have_xt=no
--- 599,609 ----
     [ac_cv_my_have_xt=yes
      AC_CHECK_LIB(Xmu, XmuDrawLogo,
!      [XT_CFLAGS="${x_cflags}"
!       XT_LIBS="${x_libs} -lXmu -lXt -lSM -lICE -lXext -lX11"],
!      [XT_CFLAGS="${x_cflags}"
!       XT_LIBS="${x_libs} -lXt -lSM -lICE -lXext -lX11"],
!      [[-lXt -lSM -lICE -lXext -lX11 ${x_libs}]])],
     [ac_cv_my_have_xt=no],
!    [[-lSM -lICE -lXext -lX11 ${x_libs}]])
  else
    ac_cv_my_have_xt=no
***************
*** 614,619 ****
    AC_CHECK_LIB(Xaw, XawTextSearch,
     [ac_cv_my_have_xaw=yes
!     XAW_CFLAGS="-I${x_includes}"
!     XAW_LIBS="-L${x_libraries} -lXaw ${XT_LIBS}"],
     [ac_cv_my_have_xaw=no],
     [[${XT_LIBS}]])
--- 616,621 ----
    AC_CHECK_LIB(Xaw, XawTextSearch,
     [ac_cv_my_have_xaw=yes
!     XAW_CFLAGS="${x_cflags}"
!     XAW_LIBS="${x_libs} -lXaw ${XT_LIBS}"],
     [ac_cv_my_have_xaw=no],
     [[${XT_LIBS}]])
***************
*** 635,640 ****
      AC_CHECK_LIB(Xm, XmStringConcat,
       [ac_cv_my_have_motif=yes
!       MOTIF_CFLAGS="-I${x_includes} -I/usr/include/Xm"
!       MOTIF_LIBS="-L${x_libraries} -lXm ${XT_LIBS}"],
       [ac_cv_my_have_motif=no],
       [[${XT_LIBS}]])
--- 637,642 ----
      AC_CHECK_LIB(Xm, XmStringConcat,
       [ac_cv_my_have_motif=yes
!       MOTIF_CFLAGS="${x_cflags} -I/usr/include/Xm"
!       MOTIF_LIBS="${x_libs} -lXm ${XT_LIBS}"],
       [ac_cv_my_have_motif=no],
       [[${XT_LIBS}]])
***************
*** 677,681 ****
  AC_OUTPUT([
    Makefile
-   debian/Makefile
    doc/Makefile
    doc/bitstring/Makefile
--- 679,682 ----