Ticket #13329: prereq-1.1-reviewer.diff

File prereq-1.1-reviewer.diff, 3.2 KB (added by jdemeyer, 9 years ago)

Incremental diff, based on Volker's version

  • configure.ac

    # HG changeset patch
    # User Jeroen Demeyer <jdemeyer@cage.ugent.be>
    # Date 1344073149 -7200
    # Node ID b13a8b8797f7dd9b0f66043fd23bd3dece8da08d
    # Parent  d5c76dab3b4d0ac8a20e5c6e14e56b0531393fc1
    Trac #13329: small reviewer fixes
    
    diff -r d5c76dab3b4d -r b13a8b8797f7 configure.ac
    a b  
    219219    AC_MSG_ERROR([Exiting, since AC_PACKAGE_NAME requires perl-5.8.0 or later])
    220220])
    221221
    222 # To build python you need dpkg-architecture on debian-based systems
     222# To build Python on multi-arch Debian-based systems, we need
     223# dpkg-architecture. Since we need dpkg-architecture to determine
     224# whether we're on a multi-arch system and require dpkg-architecture,
     225# we simply require it always on Debian-based systems.
    223226AC_CHECK_PROG(found_dpkg, dpkg,[yes],[no],[])
    224227AC_CHECK_PROG(found_dpkg_arch, dpkg-architecture,[yes],[no],[])
    225 if test x$found_dpkg  == xyes && test x$found_dpkg_arch == xno
     228if test x$found_dpkg = xyes && test x$found_dpkg_arch = xno
    226229then
    227     AC_MSG_WARN([You do not have 'dpkg-architecture', which is requred to build])
    228     AC_MSG_WARN([Python on multi-arch debian systems. This is definitely requried])
    229     AC_MSG_WARN([in recent Debian and Ubuntu versions.])
    230     AC_MSG_ERROR([Exiting, since AC_PACKAGE_NAME requires dpkg-architecture on debian])
     230    AC_MSG_NOTICE([You do not have 'dpkg-architecture', which is required to build])
     231    AC_MSG_NOTICE([Python on multi-arch Debian-based systems. This includes all recent])
     232    AC_MSG_NOTICE([Debian and Ubuntu systems. You can install this with:])
     233    AC_MSG_NOTICE([  sudo apt-get install dpkg-dev])
     234    AC_MSG_ERROR([Exiting, since AC_PACKAGE_NAME requires dpkg-architecture on Debian])
    231235fi
    232236
    233 # Next one should check for libraries
    234 # No unusual libraries are needed. Sage comes with everything it needs.
     237# Next one should check for libraries.
     238# OpenSSL is a prerequisite for the notebook.
     239AC_CHECK_LIB(ssl, SSL_library_init, [], [
     240    AC_MSG_NOTICE([The OpenSSL library is required to build the Sage Notebook.])
     241    AC_MSG_NOTICE([You might need to execute one of the following (or the equivalent for your])
     242    AC_MSG_NOTICE([operating system):])
     243    AC_MSG_NOTICE([  sudo apt-get install libssl-dev])
     244    AC_MSG_NOTICE([  sudo yum install openssl-devel])
     245    AC_MSG_ERROR([Exiting, since the OpenSSL library was not found.])
     246])
     247
    235248
    236249# Next one should check for header files.
    237250# complex.h is one that might not exist on older systems.
     
    470483    AC_MSG_ERROR([Exiting, since the library function 'sqrtl()' was not found.])
    471484])
    472485
    473 # OpenSSL is a prerequisite for the notebook.
    474 AC_CHECK_LIB(ssl, SSL_library_init, [], [
    475     AC_MSG_NOTICE([The OpenSSL library is required to build the Sage Notebook.])
    476     AC_MSG_NOTICE([You might need to execute one of the following (or the equivalent for your])
    477     AC_MSG_NOTICE([operating system):])
    478     AC_MSG_NOTICE([  sudo apt-get install libssl-dev])
    479     AC_MSG_NOTICE([  sudo yum install openssl-devel])
    480     AC_MSG_ERROR([Exiting, since the OpenSSL library was not found.])
    481 ])
    482 
    483486# Next check for system services
    484487
    485488# Test for old versions of Solaris, and issue a warning if too old.