diff -u -r linuxconf-1.25/askrunlevel/boot.cc linuxconf-1.25.ia64/askrunlevel/boot.cc --- linuxconf-1.25/askrunlevel/boot.cc Thu Apr 12 23:16:04 2001 +++ linuxconf-1.25.ia64/askrunlevel/boot.cc Wed Apr 11 21:45:52 2001 @@ -5,6 +5,7 @@ #include #include #include +#include #include "askrunlevel.h" #include #include "../paths.h" diff -u -r linuxconf-1.25/fstab/quota.cc linuxconf-1.25.ia64/fstab/quota.cc --- linuxconf-1.25/fstab/quota.cc Thu Nov 2 02:32:58 2000 +++ linuxconf-1.25.ia64/fstab/quota.cc Thu Apr 12 12:03:21 2001 @@ -366,6 +366,18 @@ { return syscall(__NR_quotactl, cmd, special, id, addr); } +#elif defined(__ia64__) + #include + int quotactl(int cmd, const char * special, int id, caddr_t addr) + { + register long r8 asm ("r8"); + asm volatile ("mov r15=%1\n\t" + "break %2" + : "=r"(r8) + : "g"(__NR_quotactl), "g"(__BREAK_SYSCALL), + "r"(cmd), "r"(special), "r"(id), "r"(addr)); + return r8; + } #else #define __LIBRARY__ #include diff -u -r linuxconf-1.25/help.files/es/drbdconf/Makefile linuxconf-1.25.ia64/help.files/es/drbdconf/Makefile --- linuxconf-1.25/help.files/es/drbdconf/Makefile Mon Jan 22 02:13:35 2001 +++ linuxconf-1.25.ia64/help.files/es/drbdconf/Makefile Thu Apr 12 18:34:59 2001 @@ -1,12 +1 @@ -CURDIR=drbdconf -all: doc -DOCS := $(shell cat FILE_LIST) - -include /usr/lib/linuxconf-devel/rules.mak - -doc: - @/usr/lib/linuxconf-devel/sgml_2_help.sh $(DOCS) - -install: - @/usr/lib/linuxconf-devel/install_helps.sh $(CURDIR) $(LIB_LINUXCONF) - +include ../../scripts/help.mak diff -u -r linuxconf-1.25/help.files/es/heartbeatconf/Makefile linuxconf-1.25.ia64/help.files/es/heartbeatconf/Makefile --- linuxconf-1.25/help.files/es/heartbeatconf/Makefile Mon Jan 22 02:17:09 2001 +++ linuxconf-1.25.ia64/help.files/es/heartbeatconf/Makefile Thu Apr 12 18:35:27 2001 @@ -1,12 +1 @@ -CURDIR=heartbeatconf -all: doc -DOCS := $(shell cat FILE_LIST) - -include /usr/lib/linuxconf-devel/rules.mak - -doc: - @/usr/lib/linuxconf-devel/sgml_2_help.sh $(DOCS) - -install: - @/usr/lib/linuxconf-devel/install_helps.sh $(CURDIR) $(LIB_LINUXCONF) - +include ../../scripts/help.mak diff -u -r linuxconf-1.25/help.files/es/pslaveconf/Makefile linuxconf-1.25.ia64/help.files/es/pslaveconf/Makefile --- linuxconf-1.25/help.files/es/pslaveconf/Makefile Mon Jan 22 02:15:56 2001 +++ linuxconf-1.25.ia64/help.files/es/pslaveconf/Makefile Thu Apr 12 18:35:42 2001 @@ -1,12 +1 @@ -CURDIR=pslaveconf -all: doc -DOCS := $(shell cat FILE_LIST) - -include /usr/lib/linuxconf-devel/rules.mak - -doc: - @/usr/lib/linuxconf-devel/sgml_2_help.sh $(DOCS) - -install: - @/usr/lib/linuxconf-devel/install_helps.sh $(CURDIR) $(LIB_LINUXCONF) - +include ../../scripts/help.mak diff -u -r linuxconf-1.25/help.files/pt/drbdconf/Makefile linuxconf-1.25.ia64/help.files/pt/drbdconf/Makefile --- linuxconf-1.25/help.files/pt/drbdconf/Makefile Mon Jan 22 02:13:35 2001 +++ linuxconf-1.25.ia64/help.files/pt/drbdconf/Makefile Thu Apr 12 18:34:59 2001 @@ -1,12 +1 @@ -CURDIR=drbdconf -all: doc -DOCS := $(shell cat FILE_LIST) - -include /usr/lib/linuxconf-devel/rules.mak - -doc: - @/usr/lib/linuxconf-devel/sgml_2_help.sh $(DOCS) - -install: - @/usr/lib/linuxconf-devel/install_helps.sh $(CURDIR) $(LIB_LINUXCONF) - +include ../../scripts/help.mak diff -u -r linuxconf-1.25/help.files/pt/heartbeatconf/Makefile linuxconf-1.25.ia64/help.files/pt/heartbeatconf/Makefile --- linuxconf-1.25/help.files/pt/heartbeatconf/Makefile Mon Jan 22 02:17:09 2001 +++ linuxconf-1.25.ia64/help.files/pt/heartbeatconf/Makefile Thu Apr 12 18:35:27 2001 @@ -1,12 +1 @@ -CURDIR=heartbeatconf -all: doc -DOCS := $(shell cat FILE_LIST) - -include /usr/lib/linuxconf-devel/rules.mak - -doc: - @/usr/lib/linuxconf-devel/sgml_2_help.sh $(DOCS) - -install: - @/usr/lib/linuxconf-devel/install_helps.sh $(CURDIR) $(LIB_LINUXCONF) - +include ../../scripts/help.mak diff -u -r linuxconf-1.25/help.files/pt/pslaveconf/Makefile linuxconf-1.25.ia64/help.files/pt/pslaveconf/Makefile --- linuxconf-1.25/help.files/pt/pslaveconf/Makefile Mon Jan 22 02:15:56 2001 +++ linuxconf-1.25.ia64/help.files/pt/pslaveconf/Makefile Thu Apr 12 18:35:42 2001 @@ -1,12 +1 @@ -CURDIR=pslaveconf -all: doc -DOCS := $(shell cat FILE_LIST) - -include /usr/lib/linuxconf-devel/rules.mak - -doc: - @/usr/lib/linuxconf-devel/sgml_2_help.sh $(DOCS) - -install: - @/usr/lib/linuxconf-devel/install_helps.sh $(CURDIR) $(LIB_LINUXCONF) - +include ../../scripts/help.mak diff -u -r linuxconf-1.25/help.files/sources/drbdconf/Makefile linuxconf-1.25.ia64/help.files/sources/drbdconf/Makefile --- linuxconf-1.25/help.files/sources/drbdconf/Makefile Mon Jan 22 02:13:35 2001 +++ linuxconf-1.25.ia64/help.files/sources/drbdconf/Makefile Thu Apr 12 18:34:59 2001 @@ -1,12 +1 @@ -CURDIR=drbdconf -all: doc -DOCS := $(shell cat FILE_LIST) - -include /usr/lib/linuxconf-devel/rules.mak - -doc: - @/usr/lib/linuxconf-devel/sgml_2_help.sh $(DOCS) - -install: - @/usr/lib/linuxconf-devel/install_helps.sh $(CURDIR) $(LIB_LINUXCONF) - +include ../../scripts/help.mak diff -u -r linuxconf-1.25/help.files/sources/heartbeatconf/Makefile linuxconf-1.25.ia64/help.files/sources/heartbeatconf/Makefile --- linuxconf-1.25/help.files/sources/heartbeatconf/Makefile Mon Jan 22 02:17:09 2001 +++ linuxconf-1.25.ia64/help.files/sources/heartbeatconf/Makefile Thu Apr 12 18:35:27 2001 @@ -1,12 +1 @@ -CURDIR=heartbeatconf -all: doc -DOCS := $(shell cat FILE_LIST) - -include /usr/lib/linuxconf-devel/rules.mak - -doc: - @/usr/lib/linuxconf-devel/sgml_2_help.sh $(DOCS) - -install: - @/usr/lib/linuxconf-devel/install_helps.sh $(CURDIR) $(LIB_LINUXCONF) - +include ../../scripts/help.mak diff -u -r linuxconf-1.25/help.files/sources/pslaveconf/Makefile linuxconf-1.25.ia64/help.files/sources/pslaveconf/Makefile --- linuxconf-1.25/help.files/sources/pslaveconf/Makefile Mon Jan 22 02:15:56 2001 +++ linuxconf-1.25.ia64/help.files/sources/pslaveconf/Makefile Thu Apr 12 18:35:42 2001 @@ -1,12 +1 @@ -CURDIR=pslaveconf -all: doc -DOCS := $(shell cat FILE_LIST) - -include /usr/lib/linuxconf-devel/rules.mak - -doc: - @/usr/lib/linuxconf-devel/sgml_2_help.sh $(DOCS) - -install: - @/usr/lib/linuxconf-devel/install_helps.sh $(CURDIR) $(LIB_LINUXCONF) - +include ../../scripts/help.mak diff -u -r linuxconf-1.25/libmodules/parsers/isc.cc linuxconf-1.25.ia64/libmodules/parsers/isc.cc --- linuxconf-1.25/libmodules/parsers/isc.cc Sat Dec 30 15:19:04 2000 +++ linuxconf-1.25.ia64/libmodules/parsers/isc.cc Thu Apr 12 23:17:51 2001 @@ -66,7 +66,7 @@ if (pt != NULL){ char *start = tmp; while (start < pt){ - if (!isspace(start)) break; + if (!isspace(*start)) break; start++; } if (start == pt){ diff -u -r linuxconf-1.25/main/linuxconf.cc linuxconf-1.25.ia64/main/linuxconf.cc --- linuxconf-1.25/main/linuxconf.cc Thu Feb 8 18:53:35 2001 +++ linuxconf-1.25.ia64/main/linuxconf.cc Wed Apr 11 22:22:22 2001 @@ -256,6 +256,8 @@ { "Motorola", "mvme" }, { NULL, NULL } }; +#elif defined(__ia64__) + static const char keymap_arch[]="ia64"; #else #error Need a ifdef for your architecture here #endif diff -u -r linuxconf-1.25/modules/Xkbdconf/XFconfig.c linuxconf-1.25.ia64/modules/Xkbdconf/XFconfig.c --- linuxconf-1.25/modules/Xkbdconf/XFconfig.c Fri Dec 29 16:54:26 2000 +++ linuxconf-1.25.ia64/modules/Xkbdconf/XFconfig.c Thu Apr 12 17:20:42 2001 @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include diff -u -r linuxconf-1.25/modules/mouseconf/mousedetect.c linuxconf-1.25.ia64/modules/mouseconf/mousedetect.c --- linuxconf-1.25/modules/mouseconf/mousedetect.c Wed Nov 29 02:15:43 2000 +++ linuxconf-1.25.ia64/modules/mouseconf/mousedetect.c Thu Apr 12 17:22:17 2001 @@ -13,6 +13,7 @@ #include #include */ +#include #include diff -u -r linuxconf-1.25/rules.mak linuxconf-1.25.ia64/rules.mak --- linuxconf-1.25/rules.mak Mon Mar 12 02:43:48 2001 +++ linuxconf-1.25.ia64/rules.mak Thu Apr 12 12:27:36 2001 @@ -55,7 +55,7 @@ WWWBASE=$(HOME)/n/dnshtml WWWTECHBASE=$(WWWBASE)/linuxconf/tech SPEC_FILE = $(shell $(GCC) -v 2>&1 | head -1 | sed 's/^.* //') -LD_LINUX = $(notdir $(shell cat $(SPEC_FILE) | sed -n -e '/:-dynamic-linker/s/^.*:-dynamic-linker \([^}]*\).*/\1/p')) +LD_LINUX = $(patsubst ld-linux%.so.2,ld-linux.so.2,$(notdir $(shell cat $(SPEC_FILE) | sed -n -e '/:-dynamic-linker/s/^.*:-dynamic-linker \([^}]*\).*/\1/p'))) ifeq ($(LD_LINUX),ld-linux.so.2) CRYPTLIB=-lcrypt PAMLIB=-lpam --- linuxconf-1.25/modules/mouseconf/XFmousereset.c Mon Dec 18 14:26:13 2000 +++ linuxconf-1.25.ia64/modules/mouseconf/XFmousereset.c Fri Apr 13 12:16:22 2001 @@ -11,5 +11,5 @@ -// #include +#include #include -// #include +#include #include