anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-06 01:15:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make build work on cygwin

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@6662 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2003-03-31 16:23:03 +00:00
parent 2b1cd5386d
commit d3addc6c37
8 changed files with 48 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -21,6 +21,10 @@
* INSTALL: small english fix * INSTALL: small english fix
2003-03-12 Kayvan Sylvan <kayvan@sylvan.com>
* autogen.sh (ACINCLUDE_FILES): Added cygwin.m4
2003-02-27 Angus Leeming <leeming@lyx.org> 2003-02-27 Angus Leeming <leeming@lyx.org>
* INSTALL: better instructions for the Qt frontend * INSTALL: better instructions for the Qt frontend

2
autogen.sh
View File

@ -4,7 +4,7 @@ ACLOCAL="aclocal"
AUTOHEADER="autoheader" AUTOHEADER="autoheader"
AUTOMAKE="automake -a -c --foreign" AUTOMAKE="automake -a -c --foreign"
AUTOCONF="autoconf" AUTOCONF="autoconf"
ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4 pkg.m4" ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4 cygwin.m4 pkg.m4"
# Discover what version of autoconf we are using. # Discover what version of autoconf we are using.
autoversion=`$AUTOCONF --version | head -n 1` autoversion=`$AUTOCONF --version | head -n 1`

13
config/ChangeLog
View File

@ -1,3 +1,16 @@
2003-03-12 Kayvan Sylvan <kayvan@sylvan.com>
* configure.ac:
* configure.in: Add the CHECK_WITH_CYGWIN macro call.
* Makefile.am: add cygwin.m4 to EXTRA_DIST
* cygwin.m4: Add CHECK_WITH_CYGWIN function to encapuslate
some checks for Win32 GCC based on info from the following URL:
http://bugzilla.gnome.org/showattachment.cgi?attach_id=12253
* libtool.m4: TAB to SPACE fixes. Now impgen.c compiles on Cygwin.
2003-03-26 Jean-Marc Lasgouttes <lasgouttes@lyx.org> 2003-03-26 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.in: * configure.in:

2
config/Makefile.am
View File

@ -4,4 +4,4 @@ EXTRA_DIST = common.am codeset.m4 libtool.m4 gettext.m4 \
lyxinclude.m4 lyxinclude25x.m4 lyxinclude213.m4 \ lyxinclude.m4 lyxinclude25x.m4 lyxinclude213.m4 \
glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 \ glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 \
qt.m4 gtk--.m4 gnome--.m4 gnome.m4 pkg.m4 xforms.m4 pspell.m4 \ qt.m4 gtk--.m4 gnome--.m4 gnome.m4 pkg.m4 xforms.m4 pspell.m4 \
relyx_configure.ac relyx_configure.in relyx_configure.ac relyx_configure.in cygwin.m4

3
config/configure.ac
View File

@ -132,6 +132,9 @@ LYX_PROG_LIBTOOL
### Check if we want pspell libraries ### Check if we want pspell libraries
CHECK_WITH_PSPELL CHECK_WITH_PSPELL
### Check for some Cygwin-specific details.
CHECK_WITH_CYGWIN
### Check for X libraries ### Check for X libraries
# The real thing. # The real thing.
AC_PATH_XTRA AC_PATH_XTRA

3
config/configure.in
View File

@ -135,6 +135,9 @@ LYX_PROG_LIBTOOL
### Check if we want pspell libraries ### Check if we want pspell libraries
CHECK_WITH_PSPELL CHECK_WITH_PSPELL
### Check for some Cygwin-specific details.
CHECK_WITH_CYGWIN
### Check for X libraries ### Check for X libraries
# The real thing. # The real thing.
AC_PATH_XTRA AC_PATH_XTRA

42
config/libtool.m4 vendored
View File

@ -2737,44 +2737,44 @@ EOF
# #
# dll = open(filename, O_RDONLY|O_BINARY); # dll = open(filename, O_RDONLY|O_BINARY);
# if (dll < 1) # if (dll < 1)
# return 1; # return 1;
# #
# dll_name = filename; # dll_name = filename;
# #
# for (i=0; filename[i]; i++) # for (i=0; filename[i]; i++)
# if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':') # if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':')
# dll_name = filename + i +1; # dll_name = filename + i +1;
# #
# pe_header_offset = pe_get32 (dll, 0x3c); # pe_header_offset = pe_get32 (dll, 0x3c);
# opthdr_ofs = pe_header_offset + 4 + 20; # opthdr_ofs = pe_header_offset + 4 + 20;
# num_entries = pe_get32 (dll, opthdr_ofs + 92); # num_entries = pe_get32 (dll, opthdr_ofs + 92);
# #
# if (num_entries < 1) /* no exports */ # if (num_entries < 1) /* no exports */
# return 1; # return 1;
# #
# export_rva = pe_get32 (dll, opthdr_ofs + 96); # export_rva = pe_get32 (dll, opthdr_ofs + 96);
# export_size = pe_get32 (dll, opthdr_ofs + 100); # export_size = pe_get32 (dll, opthdr_ofs + 100);
# nsections = pe_get16 (dll, pe_header_offset + 4 +2); # nsections = pe_get16 (dll, pe_header_offset + 4 +2);
# secptr = (pe_header_offset + 4 + 20 + # secptr = (pe_header_offset + 4 + 20 +
# pe_get16 (dll, pe_header_offset + 4 + 16)); # pe_get16 (dll, pe_header_offset + 4 + 16));
# #
# expptr = 0; # expptr = 0;
# for (i = 0; i < nsections; i++) # for (i = 0; i < nsections; i++)
# { # {
# char sname[8]; # char sname[8];
# unsigned long secptr1 = secptr + 40 * i; # unsigned long secptr1 = secptr + 40 * i;
# unsigned long vaddr = pe_get32 (dll, secptr1 + 12); # unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
# unsigned long vsize = pe_get32 (dll, secptr1 + 16); # unsigned long vsize = pe_get32 (dll, secptr1 + 16);
# unsigned long fptr = pe_get32 (dll, secptr1 + 20); # unsigned long fptr = pe_get32 (dll, secptr1 + 20);
# lseek(dll, secptr1, SEEK_SET); # lseek(dll, secptr1, SEEK_SET);
# read(dll, sname, 8); # read(dll, sname, 8);
# if (vaddr <= export_rva && vaddr+vsize > export_rva) # if (vaddr <= export_rva && vaddr+vsize > export_rva)
# { # {
# expptr = fptr + (export_rva - vaddr); # expptr = fptr + (export_rva - vaddr);
# if (export_rva + export_size > vaddr + vsize) # if (export_rva + export_size > vaddr + vsize)
# export_size = vsize - (export_rva - vaddr); # export_size = vsize - (export_rva - vaddr);
# break; # break;
# } # }
# } # }
# #
# expdata = (unsigned char*)malloc(export_size); # expdata = (unsigned char*)malloc(export_size);
@ -2788,8 +2788,8 @@ EOF
# printf ("EXPORTS\n"); # printf ("EXPORTS\n");
# for (i = 0; i<nexp; i++) # for (i = 0; i<nexp; i++)
# { # {
# unsigned long name_rva = pe_as32 (erva+name_rvas+i*4); # unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
# printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i); # printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
# } # }
# #
# return 0; # return 0;

2
status.13x
View File

@ -72,4 +72,6 @@ What's new
- make automatic generation of autoscripts optional; this was annoying - make automatic generation of autoscripts optional; this was annoying
for patches. for patches.
- fix building on cygwin
- fix building on NetBSD [bug #1007] - fix building on NetBSD [bug #1007]