Changeset ac70242


Ignore:
Timestamp:
Apr 20, 2003, 12:05:15 PM (18 years ago)
Author:
James M. Kretchmar <kretch@mit.edu>
Branches:
master, barnowl_perlaim, debian, owl, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
Children:
69894d2
Parents:
801c7cb
Message:
Makefile.in: define DATADIR, for default owlconf.
Makefile.in: provide "all" and "install" rules.
configure.in: try also libdes and libkrb4, for people using heimdal
configure.in: see if des_ecb_encrypt is already prototyped.
configure.in: minor changes to work with new autoconf without needing acconfig.h.
configure.in: find the install program.
configure.in: test for use_default_colors since some versions of
  solaris don't have it, so we can at least compile something
  vaguely working there.
keypress.c: ifdefs for keys not defined on at least some solarises.
owl.c: don't call use_default_colors if we don't have it
readconfig.c: added *commented out* code to try to find a
  system-default owlconf if the user doesn't have one.  Have to
  ponder if I want this
zcrypt.c: don't prototype des_ecb_encrypt if there is a prototype in
  des.h.
zcrypt.c: include owl.h so we get the configure-generated config.h
Change to codelist.pl to deal with new code style
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rd54838d rac70242  
    4545        fixes to owl_function_do_newmsgproc from Stephen
    4646        converted functions.c to new code style, which I'm giving a shot
     47        Makefile.in: define DATADIR, for default owlconf.
     48        Makefile.in: provide "all" and "install" rules.
     49        configure.in: try also libdes and libkrb4, for people using heimdal
     50        configure.in: see if des_ecb_encrypt is already prototyped.
     51        configure.in: minor changes to work with new autoconf without needing acconfig.h.
     52        configure.in: find the install program.
     53        configure.in: test for use_default_colors since some versions of
     54          solaris don't have it, so we can at least compile something
     55          vaguely working there.
     56        keypress.c: ifdefs for keys not defined on at least some solarises.
     57        owl.c: don't call use_default_colors if we don't have it
     58        readconfig.c: added *commented out* code to try to find a
     59          system-default owlconf if the user doesn't have one.  Have to
     60          ponder if I want this
     61        zcrypt.c: don't prototype des_ecb_encrypt if there is a prototype in
     62          des.h.
     63        zcrypt.c: include owl.h so we get the configure-generated config.h
     64        Change to codelist.pl to deal with new code style
    4765       
    48661.2.8
  • Makefile.in

    re9b1f60 rac70242  
    11
    22# $Id$
     3
     4srcdir = @srcdir@
     5VPATH = @srcdir@
     6
     7prefix = @prefix@
     8exec_prefix = @exec_prefix@
     9
     10datadir = @datadir@
     11bindir = @bindir@
     12mandir = @mandir@
    313
    414CC=@CC@
    515LIBS=@LIBS@
    616#CFLAGS=@CFLAGS@ @DEFS@
    7 CFLAGS=@CFLAGS@
     17CFLAGS=@CFLAGS@ -DDATADIR=\"${datadir}\"
    818LDFLAGS=@LDFLAGS@
    919XSUBPPDIR=@XSUBPPDIR@
     20INSTALL = @INSTALL@
     21INSTALL_PROGRAM = @INSTALL_PROGRAM@
     22INSTALL_DATA = @INSTALL_DATA@
    1023
    1124OBJS=list.o message.o mainwin.o popwin.o zephyr.o messagelist.o commands.o \
     
    4053        perl stubgen.pl > varstubs.c
    4154
     55all: owl
     56
     57install: all installdirs
     58        ${INSTALL_PROGRAM} owl ${bindir}/owl
     59        ${INSTALL_DATA} doc/owl.1 ${mandir}/man1/owl.1
     60
     61installdirs: mkinstalldirs
     62        ${srcdir}/mkinstalldirs ${bindir} ${mandir}/man1 ${datadir}/owl
     63
    4264# Only move owl_prototypes.h into place if the new one is different
    4365owl_prototypes.h: codelist.pl varstubs.c $(OBJS:.o=.c)
  • codelist.pl

    r1aee7d9 rac70242  
    1313    while (<FILE>) {
    1414        if (/^\S/
    15             && /\{\s*$/
     15            && (/\{\s*$/ || /\)\s*$/)
    1616            && !/\}/
    1717            && !/^\{/
    18             && !/^#include/
     18            && !/^#/
    1919            && !/^static/
    20             && !/^#define/
    2120            && !/\/\*/)
    22         {s/\s+\{/\;/; print "extern "; print;}
     21        {s/\s+\{/\;/; s/\)[ \t]*$/\)\;/; print "extern "; print;}
    2322           
    2423    }
  • configure.in

    r316962a rac70242  
    3535AC_CHECK_LIB(k5crypto, krb5_derive_key)
    3636AC_CHECK_LIB(des425, des425_req_act_vno)
     37AC_CHECK_LIB(des, des_quad_cksum)
    3738AC_CHECK_LIB(krb5, krb5_get_credentials)
    3839AC_CHECK_LIB(krb4, krb_sendauth)
     40AC_CHECK_LIB(krb, krb_sendauth)
    3941AC_CHECK_LIB(zephyr, ZGetSender,, AC_MSG_ERROR(No zephyr library found.))
    40 AC_CHECK_LIB(zephyr, ZInitLocationInfo, AC_DEFINE(HAVE_LIBZEPHYR_ZINITLOCATIONINFO),)
     42AC_CHECK_LIB(zephyr, ZInitLocationInfo, AC_DEFINE([HAVE_LIBZEPHYR_ZINITLOCATIONINFO], [], [Have ZInitLocationInfo]),)
     43
     44AC_MSG_CHECKING(for des_ecb_encrypt prototype)
     45AC_TRY_COMPILE([#include <des.h>
     46int des_ecb_encrypt(char foo[], char bar[], des_key_schedule baz, int qux);],
     47[int foo = des_ecb_encrypt(0,0,0,0);],
     48ac_cv_des_ecb_encrypt_proto=no,
     49ac_cv_des_ecb_encrypt_proto=yes)
     50AC_MSG_RESULT($ac_cv_des_ecb_encrypt_proto)
     51if test "$ac_cv_des_ecb_encrypt_proto" = yes; then
     52        AC_DEFINE([HAVE_DES_ECB_ENCRYPT_PROTO], [], [have proto for des_ecb_encrypt])
     53fi
    4154
    4255dnl Checks for header files.
     
    6578
    6679dnl Checks for typedefs, structures, and compiler characteristics.
    67 AC_CHECK_FILE(/usr/share/terminfo, AC_DEFINE(TERMINFO, "/usr/share/terminfo"),
    68   AC_CHECK_FILE(/usr/share/lib/terminfo, AC_DEFINE(TERMINFO, "/usr/share/lib/terminfo"),
     80AC_CHECK_FILE(/usr/share/terminfo, AC_DEFINE(TERMINFO, "/usr/share/terminfo", [Have terminfo]),
     81  AC_CHECK_FILE(/usr/share/lib/terminfo, AC_DEFINE(TERMINFO, "/usr/share/lib/terminfo", [Have terminfo]),
    6982  AC_MSG_ERROR(No terminfo found for this system)))
    7083
    7184dnl Checks for library functions.
    7285dnl AC_PROG_GCC_TRADITIONAL
    73 dnl AC_CHECK_FUNCS(gethostname strdup)
     86dnl AC_CHECK_FUNCS(gethostname strdup use_default_colors)
    7487
    7588AC_SUBST(XSUBPPDIR)
    7689
     90AC_PROG_INSTALL
     91
    7792AC_OUTPUT(Makefile)
  • keypress.c

    r1aee7d9 rac70242  
    99  char *ks;
    1010} specialmap[] = {
     11#ifdef KEY_CODE_YES
    1112   { KEY_CODE_YES,      "CODE_YES" },
     13#endif
    1214   { KEY_MIN,           "MIN" },
    1315   { KEY_BREAK,         "BREAK" },
     
    113115   { KEY_UNDO,          "UNDO" },
    114116   { KEY_MOUSE,         "MOUSE" },
     117#ifdef KEY_RESIZE
    115118   { KEY_RESIZE,        "RESIZE" },
     119#endif
    116120   { KEY_MAX,           "MAX" },
    117121   { ' ',               "SPACE" },
  • owl.c

    recd5dc5 rac70242  
    106106  initscr();
    107107  start_color();
     108#ifdef HAVE_USE_DEFAULT_COLORS
    108109  use_default_colors();
     110#endif
    109111  raw();
    110112  noecho();
  • readconfig.c

    rb45293f rac70242  
    1111static const char fileIdent[] = "$Id$";
    1212
    13 
    14 
    1513extern XS(boot_owl);
    1614
     
    4543  perl_construct(p);
    4644
     45  /* start by assuming no config */
    4746  owl_global_set_no_have_config(&g);
    4847
     
    5251  }
    5352
     53  /* This is the CMU code for reading a site owlconf.  Not sure if I
     54     want it yet */
     55  /*
     56  ret=stat(filename, &statbuff);
     57  if (ret) {
     58    sprintf(filename, "%s/%s", DATADIR, "owl/owlconf");
     59    ret=stat(filename, &statbuff);
     60    if (ret) {
     61      return(0);
     62    }
     63  }
     64  */
     65
    5466  ret=perl_parse(p, owl_perl_xs_init, 2, embedding, NULL);
    5567  if (ret) return(-1);
    56 
    5768  ret=perl_run(p);
    5869  if (ret) return(-1);
    5970
     71  /* if we get this far, we have a good config file */
    6072  owl_global_set_have_config(&g);
    6173
  • zcrypt.c

    r0ba59d2 rac70242  
    1616#include <sys/types.h>
    1717#include <sys/wait.h>
     18#include "owl.h"
    1819
    1920#define BASE_CODE 70
     
    6566int do_decrypt(char *keystring);
    6667
     68#ifndef HAVE_DES_ECB_ENCRYPT_PROTO
    6769int des_ecb_encrypt(char [], char [], des_key_schedule, int);
     70#endif
    6871
    6972#define M_NONE            0
Note: See TracChangeset for help on using the changeset viewer.