Minor portability and compilation fixes.

diff --git a/Makefile.am b/Makefile.am
index f8392925a4aef6ce421af8e9eaa4e235948e1857..d05ab3a9779d024a93e8a80294961e8e9eca6075 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,12 +47,12 @@ checktypes_LDADD =
 checktypes_DEPENDENCIES = 
 
 
-$(makedoc_OBJECTS): $(makedoc_SOURCES)
-       $(HOST_CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c $<
+# $(makedoc_OBJECTS): $(makedoc_SOURCES)
+#      $(HOST_CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c $<
 
-makedoc: $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES)
-       @rm -rf makedoc
-       $(HOST_CC) $(AM_CFLAGS) $(LDFLAGS) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) -o makedoc
+# makedoc: $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES)
+#      @rm -rf makedoc
+#      $(HOST_CC) $(AM_CFLAGS) $(LDFLAGS) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) -o makedoc
 
 CPP=@CPP@
 

diff --git a/configure.in b/configure.in
index 83f160eedfb01e6285fb7b90bb31ac9ed0e24ee5..8c8a897e690dad13be9745f94c0a0decbaa675bd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -204,7 +204,7 @@ AC_CHECK_HEADERS(stdarg.h sys/ioctl.h ioctl.h sysexits.h)
 AC_CHECK_HEADERS(sys/time.h sys/resource.h)
 AC_CHECK_HEADERS(unix.h)
 
-AC_CHECK_FUNCS(setrlimit)
+AC_CHECK_FUNCS(setrlimit getsid)
 
 AC_TYPE_SIGNAL
 

diff --git a/init.c b/init.c
index 7d26ea6c63f540bfd1033f4580a0765e953af688..fefaaa61b8e3f9fac0acda86274eea9de2d432e7 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1836,10 +1836,12 @@ void mutt_init (int skip_sys_rc, LIST *commands)
     set_option (OPTLOCALES);
 #endif
 
+#ifdef HAVE_GETSID
   /* Unset suspend by default if we're the session leader */
   if (getsid(0) == getpid())
     unset_option (OPTSUSPEND);
-  
+#endif
+
   mutt_init_history ();
 
   

diff --git a/main.c b/main.c
index 64c6ce329e6aec1b478017aefd17d60d7bbad42d..219f6163fe43ee2518f4179496084f7519012a1f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -371,6 +371,12 @@ static void show_version (void)
        "-ICONV_NONTRANS  "
 #endif
 
+#if HAVE_GETSID
+       "+HAVE_GETSID"
+#else
+       "-HAVE_GETSID"
+#endif
+       
        );
 
 #ifdef ISPELL