summaryrefslogtreecommitdiff
path: root/acconfig.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-11-15 17:10:57 +1100
committerDamien Miller <djm@mindrot.org>1999-11-15 17:10:57 +1100
commit3f905872b0d15be24078c4db131f0ecdb5ebb5e6 (patch)
tree700210571ddc52d55dcbaabf593e52b5d7531c3f /acconfig.h
parentc6d5ce86a9ed296dbc99b8fc593099a87830fd18 (diff)
- Merged more Solaris compability from Marc G. Fournier
<marc.fournier@acadiau.ca> - Wrote autoconf tests for __progname symbol
Diffstat (limited to 'acconfig.h')
-rw-r--r--acconfig.h45
1 files changed, 43 insertions, 2 deletions
diff --git a/acconfig.h b/acconfig.h
index 8678b7cdb..2844bdca2 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -3,7 +3,10 @@
3/* SSL directory. */ 3/* SSL directory. */
4#undef ssldir 4#undef ssldir
5 5
6/* Random number pool */ 6/* Location of lastlog file */
7#undef LASTLOG_LOCATION
8
9/* Location of random number pool */
7#undef RANDOM_POOL 10#undef RANDOM_POOL
8 11
9/* Are we using the Entropy gathering daemon */ 12/* Are we using the Entropy gathering daemon */
@@ -21,9 +24,12 @@
21/* Define is libutil has login() function */ 24/* Define is libutil has login() function */
22#undef HAVE_LIBUTIL_LOGIN 25#undef HAVE_LIBUTIL_LOGIN
23 26
24/* Define if you *don't* want to use an external ssh-askpass */ 27/* Define if you want external askpass support */
25#undef USE_EXTERNAL_ASKPASS 28#undef USE_EXTERNAL_ASKPASS
26 29
30/* Define if libc defines __progname */
31#undef HAVE___PROGNAME
32
27@BOTTOM@ 33@BOTTOM@
28 34
29/* ******************* Shouldn't need to edit below this line ************** */ 35/* ******************* Shouldn't need to edit below this line ************** */
@@ -40,6 +46,9 @@ enum
40}; 46};
41#endif 47#endif
42 48
49#include <sys/types.h> /* For u_intXX_t */
50#include <paths.h> /* For _PATH_XXX */
51
43#if !defined(u_int32_t) && defined(uint32_t) 52#if !defined(u_int32_t) && defined(uint32_t)
44#define u_int32_t uint32_t 53#define u_int32_t uint32_t
45#endif 54#endif
@@ -47,3 +56,35 @@ enum
47#if !defined(u_int16_t) && defined(uint16_t) 56#if !defined(u_int16_t) && defined(uint16_t)
48#define u_int16_t uint16_t 57#define u_int16_t uint16_t
49#endif 58#endif
59
60#ifndef _PATH_LASTLOG
61# ifdef LASTLOG_LOCATION
62# define _PATH_LASTLOG LASTLOG_LOCATION
63# endif
64#endif
65
66#ifndef _PATH_UTMP
67# ifdef UTMP_FILE
68# define _PATH_UTMP UTMP_FILE
69# endif
70#endif
71
72#ifndef _PATH_WTMP
73# ifdef WTMP_FILE
74# define _PATH_WTMP WTMP_FILE
75# endif
76#endif
77
78#ifndef _PATH_BSHELL
79# define _PATH_BSHELL "/bin/sh"
80#endif
81
82#ifndef _PATH_STDPATH
83# define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin:"
84#endif
85
86#ifndef _PATH_MAILDIR
87# ifdef MAILDIR
88# define _PATH_MAILDIR MAILDIR
89# endif
90#endif