projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
08222b1
)
fix build for Solaris
author
Nathan Bryant
<loanshark@uncensored.citadel.org>
Tue, 22 Jul 2003 03:07:50 +0000
(
03:07
+0000)
committer
Nathan Bryant
<loanshark@uncensored.citadel.org>
Tue, 22 Jul 2003 03:07:50 +0000
(
03:07
+0000)
citadel/ChangeLog
patch
|
blob
|
history
citadel/Makefile.in
patch
|
blob
|
history
citadel/aidepost.c
patch
|
blob
|
history
citadel/configure.ac
patch
|
blob
|
history
citadel/file_ops.c
patch
|
blob
|
history
citadel/routines2.c
patch
|
blob
|
history
diff --git
a/citadel/ChangeLog
b/citadel/ChangeLog
index 872ebd5e3644f0aa59d91c666cd5c12882b816d3..7398fc499bf6bdba34ba46ee0bb2f4f44ecb5ff0 100644
(file)
--- a/
citadel/ChangeLog
+++ b/
citadel/ChangeLog
@@
-1,4
+1,7
@@
$Log$
$Log$
+ Revision 608.5 2003/07/22 03:07:50 nbryant
+ fix build for Solaris
+
Revision 608.4 2003/07/20 20:46:06 ajc
* build system: link Berkeley DB only to the server, not to the client & utils
Revision 608.4 2003/07/20 20:46:06 ajc
* build system: link Berkeley DB only to the server, not to the client & utils
@@
-4881,4
+4884,3
@@
Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
* Initial CVS import
Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
* Initial CVS import
-
diff --git
a/citadel/Makefile.in
b/citadel/Makefile.in
index 53a283d55d524d940276b1a181db52bba478eeb4..9fc07608fc99e9ecf4d6818a77830d88d1c3165b 100644
(file)
--- a/
citadel/Makefile.in
+++ b/
citadel/Makefile.in
@@
-141,8
+141,9
@@
aidepost: aidepost.o config.o
citmail: citmail.o config.o
$(CC) citmail.o config.o $(LDFLAGS) -o citmail $(LIBS)
citmail: citmail.o config.o
$(CC) citmail.o config.o $(LDFLAGS) -o citmail $(LIBS)
+# setup does need LIBS defined, because it uses network functions which are in -lsocket -lnsl on Solaris.
setup: setup.o tools.o
setup: setup.o tools.o
- $(CC) setup.o tools.o $(
SETUP_LIBS) $(LDFLAGS) -o setup
+ $(CC) setup.o tools.o $(
LDFLAGS) -o setup $(LIBS) $(SETUP_LIBS)
chkpwd: chkpwd.o auth.o config.o
$(CC) chkpwd.o auth.o config.o $(LDFLAGS) -o chkpwd $(chkpwd_LIBS)
chkpwd: chkpwd.o auth.o config.o
$(CC) chkpwd.o auth.o config.o $(LDFLAGS) -o chkpwd $(chkpwd_LIBS)
diff --git
a/citadel/aidepost.c
b/citadel/aidepost.c
index 56f5781347f8106510a7af5ff4fb014dd3e4a4ed..3591ff8962fbd33c107050afafbbf27fc96f2c28 100644
(file)
--- a/
citadel/aidepost.c
+++ b/
citadel/aidepost.c
@@
-98,8
+98,8
@@
int main(int argc, char **argv)
}
snprintf(tempspool, sizeof tempspool,
}
snprintf(tempspool, sizeof tempspool,
- "./network/spoolin/ap.%04x",
- getpid());
+ "./network/spoolin/ap.%04
l
x",
+
(long)
getpid());
unlink(tempspool);
unlink(tempspool);
diff --git
a/citadel/configure.ac
b/citadel/configure.ac
index d95d0968ead8487858ca1ad8ac8f0ff95bd1d182..b18a71902c4a59a33354f47dda6f639df0dcfdc3 100644
(file)
--- a/
citadel/configure.ac
+++ b/
citadel/configure.ac
@@
-111,7
+111,6
@@
if test "$GCC" = yes; then
;;
esac
fi
;;
esac
fi
-AC_DISABLE_STATIC
AC_PROG_INSTALL
AC_PROG_YACC
missing_dir=`cd $ac_aux_dir && pwd`
AC_PROG_INSTALL
AC_PROG_YACC
missing_dir=`cd $ac_aux_dir && pwd`
diff --git
a/citadel/file_ops.c
b/citadel/file_ops.c
index f45099e39277aad679d4e728d2c544b4864ff605..7a6a771cd0b7d82907190549b32e7890eb05f457 100644
(file)
--- a/
citadel/file_ops.c
+++ b/
citadel/file_ops.c
@@
-270,8
+270,8
@@
void cmd_netf(char *cmdbuf)
return;
}
snprintf(outfile, sizeof outfile,
return;
}
snprintf(outfile, sizeof outfile,
- "%s/network/spoolin/nsf.%04x.%04x",
- BBSDIR, getpid(), ++seq);
+ "%s/network/spoolin/nsf.%04
l
x.%04x",
+ BBSDIR,
(long)
getpid(), ++seq);
ofp = fopen(outfile, "a");
if (ofp == NULL) {
cprintf("%d internal error\n", ERROR);
ofp = fopen(outfile, "a");
if (ofp == NULL) {
cprintf("%d internal error\n", ERROR);
@@
-801,8
+801,8
@@
void cmd_nuop(char *cmdbuf)
}
snprintf(CC->upl_path, sizeof CC->upl_path,
}
snprintf(CC->upl_path, sizeof CC->upl_path,
- "%s/network/spoolin/%s.%04x.%04x",
- BBSDIR, CC->net_node, getpid(), ++seq);
+ "%s/network/spoolin/%s.%04
l
x.%04x",
+ BBSDIR, CC->net_node,
(long)
getpid(), ++seq);
CC->upload_fp = fopen(CC->upl_path, "r");
if (CC->upload_fp != NULL) {
CC->upload_fp = fopen(CC->upl_path, "r");
if (CC->upload_fp != NULL) {
diff --git
a/citadel/routines2.c
b/citadel/routines2.c
index ba73090c210580fb7d86cf6b0ab167b64f99aa3d..374464cbbc91c95579ad9b7f9faa3f8c9374a357 100644
(file)
--- a/
citadel/routines2.c
+++ b/
citadel/routines2.c
@@
-44,6
+44,11
@@
#endif
#include "screen.h"
#endif
#include "screen.h"
+/* work around solaris include files */
+#ifdef reg
+#undef reg
+#endif
+
extern char temp[];
extern char tempdir[];
extern char *axdefs[7];
extern char temp[];
extern char tempdir[];
extern char *axdefs[7];