Changeset 5395


Ignore:
Timestamp:
Feb 10, 2004, 6:53:24 PM (17 years ago)
Author:
ssen
Message:

Implement and use OD_CHECK_X11. If the user has an X11 runtime
(as defined by libX11), require corresponding headers. If they don't
have a runtime, print a warning. Eventually, this should say
"You don't have X11. You won't be able to build any X11-dependent
ports without building all of XFree86, which probably isn't what you want"
Bug: Lots of mailing list newbies

Location:
trunk/base
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/aclocal.m4

    r4510 r5395  
    141141        fi
    142142        AC_SUBST([MD5_LIBS])
     143])
     144
     145dnl This macro checks for X11 presence. If the libraries are
     146dnl present, so must the headers be. If nothing is present,
     147dnl print a warning
     148
     149# OD_CHECK_X11
     150# ---------------------
     151AC_DEFUN([OD_CHECK_X11], [
     152
     153        # Check for libX11
     154        AC_CHECK_LIB([X11], [XOpenDisplay],[
     155                        # found the library. check for header
     156                        INCLUDES="-I/usr/X11R6/include $INCLUDES"
     157                        AC_CHECK_HEADERS([X11/X.h], ,[
     158                                AC_MSG_ERROR([libX11 was found, but X.h is missing.])
     159                                ])],
     160                        [ AC_MSG_WARN([libX11 was not found])
     161                ], [-L/usr/X11R6/lib]
     162        )
    143163])
    144164
     
    262282        AC_SUBST(TCLSH)
    263283])
    264 
  • trunk/base/configure.ac

    r4590 r5395  
    1414
    1515AC_SUBST(REPLACEMENT_PROGS)
    16 
    17 # Check for md5 implementation
    18 OD_LIB_MD5
    1916
    2017# set default dports-directory
     
    4441AC_FUNC_STRERROR_R
    4542AC_CHECK_FUNCS([bzero memset dup2 regcomp strdup strerror strtol fgetln lockf flock setmode])
     43
     44# Check for md5 implementation
     45OD_LIB_MD5
     46# Check for X11 and paraphernalia
     47OD_CHECK_X11
    4648
    4749# Load tclConfig.sh
Note: See TracChangeset for help on using the changeset viewer.