Re: [Freeciv-Dev] CVS: dwp: Configure options `--disable-client' and `--dis...

[Sverker Wiberg <sverkerw@xxxxxxxxxxxx>]

David Pfitzner wrote:
> Hi Sverker,
> 
> But isn't it still the case that configure will stop if it can't
> find any X libs?  Or will it just note that fact and keep going?
> I don't have any system without X on which to check :-)

Configure does stop with the error "Need X11" if it cannot find X (it
still does --- Linnala's contribution to configure.in rev 1.20 only
fixed the link step: Configure will still probe for X with
`--disable-client').

The enclosed context diff to `configure.in' will suppress the X probes
if the client is disabled. I would have preferred separate
`configure.in' in each sub-directory, but this is good enough for now.

By the way: You can fake X-lessnes with flags like
`--x-includes=/frotz/include' and `--x-libraries=/frotz/lib' to
configure.

/Sverker

====cut====cut====cut====cut====cut====cut====cut====cut====cut====
Index: configure.in
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.in,v
retrieving revision 1.21
diff -c -r1.21 configure.in
*** configure.in        1998/11/15 01:49:43     1.21
--- configure.in        1998/11/18 03:34:53
***************
*** 67,72 ****
--- 67,73 ----
  AC_PROG_AWK
  AC_PROG_CC
  AC_PROG_CPP
+ AC_PROG_INSTALL
  AC_PROG_LN_S
  AC_PROG_RANLIB
  
***************
*** 75,100 ****
  dnl Programs already checked by AM_INIT_AUTOMAKE:
  dnl  AC_PROG_MAKE_SET
  
! dnl Checks for libraries.
! AC_PATH_XTRA
  dnl CFLAGS="$CFLAGS $X_CFLAGS"
! X_LIBS="$X_LIBS $X_PRE_LIBS"
  
! FC_CHECK_X_LIB(X11, XOpenDisplay, , AC_MSG_ERROR("Need X11"))
! FC_CHECK_X_LIB(Xext, XShapeCombineMask)
! FC_CHECK_X_LIB(Xt, main)
! FC_CHECK_X_LIB(Xmu, main)
! FC_CHECK_X_LIB(Xpm, XpmReadFileToPixmap, , AC_MSG_ERROR("Need Xpm library"))
! FC_CHECK_X_LIB(Xaw, main)
! dnl LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS"
  
  AC_CHECK_LIB(socket,main)
  AC_CHECK_LIB(nsl,main)
  AC_CHECK_LIB(nls,main)
  
  dnl Checks for header files.
  AC_HEADER_STDC
! AC_CHECK_HEADERS(sys/ioctl.h sys/time.h unistd.h X11/xpm.h)
  
  dnl Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
  dnl Programs already checked by AM_INIT_AUTOMAKE:
  dnl  AC_PROG_MAKE_SET
  
! if test x$client = xtrue; then
! dnl Checks for X
!    AC_PATH_XTRA
  dnl CFLAGS="$CFLAGS $X_CFLAGS"
!    X_LIBS="$X_LIBS $X_PRE_LIBS"
  
! dnl Checks for X libs
!    FC_CHECK_X_LIB(X11, XOpenDisplay, , AC_MSG_ERROR("Need X11"))
!    FC_CHECK_X_LIB(Xext, XShapeCombineMask)
!    FC_CHECK_X_LIB(Xt, main)
!    FC_CHECK_X_LIB(Xmu, main)
!    FC_CHECK_X_LIB(Xpm, XpmReadFileToPixmap, , AC_MSG_ERROR("Need Xpm 
library"))
!    FC_CHECK_X_LIB(Xaw, main)
!    LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS"
! fi
  
+ dnl Checks for libraries.
  AC_CHECK_LIB(nsl,main)
  AC_CHECK_LIB(nls,main)
  
  dnl Checks for header files.
  AC_HEADER_STDC
! AC_CHECK_HEADERS(sys/ioctl.h sys/time.h unistd.h)
! if test x$client = xtrue; then
!    AC_CHECK_HEADERS(X11/xpm.h)
! fi
  
  dnl Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
***************
*** 112,116 ****
  
  dnl export where the datadir is going to be installed
  CPPFLAGS="$CPPFLAGS -DFREECIV_DATADIR=\\\"\$(pkgdatadir)\\\""
  
- AC_OUTPUT(Makefile data/Makefile common/Makefile ai/Makefile client/Makefile 
server/Makefile)
--- 120,126 ----
  
  dnl export where the datadir is going to be installed
  CPPFLAGS="$CPPFLAGS -DFREECIV_DATADIR=\\\"\$(pkgdatadir)\\\""
+ 
+ AC_OUTPUT(Makefile data/Makefile common/Makefile client/Makefile 
server/Makefile ai/Makefile)
+ 
  
====cut====cut====cut====cut====cut====cut====cut====cut====cut====