Changeset 244

Show
Ignore:
Timestamp:
05/28/05 03:56:53 (3 years ago)
Author:
athomas
Message:
  • Added xauth support back in with --enable-xauth=<xauth-binary>.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • op/branches/autoconf/autogen.sh

    r240 r244  
    1 #!/bin/sh 
     1#!/bin/sh -x 
    22 
    3 echo aclocal 
    43aclocal 
    5 echo automake 
     4autoheader 
    65automake --add-missing 
    7 echo autoconf 
    86autoconf 
    9 echo autoheader 
    10 autoheader 
    117 
     8set +x 
    129echo "Now you are ready to run ./configure" 

  • op/branches/autoconf/configure.in

    r243 r244  
    1616# Feature checks 
    1717with_pam=${with_pam:-yes} 
    18 AC_ARG_WITH(pam, [  --with-pam         use PAM for authentication]) 
     18AC_ARG_WITH(pam, [  --with-pam              use PAM for authentication]) 
    1919if test "${with_pam}" = yes; then 
    2020    AC_DEFINE(USE_PAM, [], [Use PAM for authentication]) 
    …… 
    2323else 
    2424        with_shadow=${with_shadow:-yes} 
    25         AC_ARG_WITH(shadow, [  --with-shadow      use shadow file for authentication]) 
     25        AC_ARG_WITH(shadow, [  --with-shadow           use shadow file for authentication]) 
    2626        if test "${with_shadow}" = yes; then 
    2727                AC_DEFINE(USE_SHADOW, [], [Use shadow file for authentication]) 
    …… 
    3131                AC_MSG_ERROR([Can't use PAM or shadow file for authentication]) 
    3232        fi 
     33fi 
     34 
     35enable_xauth=${enable_xauth:-no} 
     36AC_ARG_ENABLE(xauth, [  --enable-xauth=<xauth>  enable xauth support and specify xauth binary]) 
     37if test "${enable_xauth}" != no; then 
     38        CPPFLAGS="$CPPFLAGS -DXAUTH=\\\"$enable_xauth\\\"" 
    3339fi 
    3440 
    …… 
    5561AC_FUNC_STRFTIME 
    5662AC_FUNC_VPRINTF 
    57 AC_CHECK_FUNCS([gethostname getpass getspnam memset regcomp strchr strcspn vsnprintf]) 
     63AC_CHECK_FUNCS([gethostname getpass getspnam memset regcomp strchr strcspn snprintf vsnprintf]) 
    5864 
    5965AC_CONFIG_FILES([Makefile]) 

  • op/branches/autoconf/util.c

    r232 r244  
    55#include "defs.h" 
    66 
    7 #ifndef HAVE_VSNPRINTF 
    8 #warning You have not compiled op with vsnprintf 
    9 #warning support, presumably because your system 
    10 #warning does not have it. This leaves op open 
    11 #warning to potential buffer overflows. 
    12 #endif 
    13  
    14 #ifdef HAVE_SNPRINTF 
    15 #error "Now using 'vsnprintf' instead of snprintf. Adjust your build to define HAVE_VSNPRINTF." 
     7#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_SNPRINTF) 
     8#warning Your system does not support vsnprintf or snprintf. 
     9#warning This leaves op open to potential buffer overflows. 
    1610#endif 
    1711