diff options
| author | Ted Zlatanov <tzz@lifelogs.com> | 2011-04-24 20:28:55 -0500 |
|---|---|---|
| committer | Ted Zlatanov <tzz@lifelogs.com> | 2011-04-24 20:28:55 -0500 |
| commit | 418401a53fd8a638a7a44d05b5fea4b4211251f4 (patch) | |
| tree | 5301fc6b5238d55fbbf85fd5858184c679b7bf90 /lib-src | |
| parent | 05842630f9a2b95a35003ee41aeb10b6df39b1e4 (diff) | |
| download | emacs-418401a53fd8a638a7a44d05b5fea4b4211251f4.tar.gz emacs-418401a53fd8a638a7a44d05b5fea4b4211251f4.tar.bz2 emacs-418401a53fd8a638a7a44d05b5fea4b4211251f4.zip | |
Add GnuTLS support for W32.
* lib-src/makefile.w32-in (obj): Added gnutls.o.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c45da107a8c..cd6c8d2b955 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2011-04-24 Teodor Zlatanov <tzz@lifelogs.com> + + * makefile.w32-in (obj): Added gnutls.o. + 2011-04-16 Paul Eggert <eggert@cs.ucla.edu> Static checks with GCC 4.6.0 and non-default toolkits. diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index f09ede06900..38d453d5259 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -142,7 +142,8 @@ obj = dosfns.o msdos.o \ syntax.o bytecode.o \ process.o callproc.o unexw32.o \ region-cache.o sound.o atimer.o \ - doprnt.o intervals.o textprop.o composite.o + doprnt.o intervals.o textprop.o composite.o \ + gnutls.o # # These are the lisp files that are loaded up in loadup.el |