serialmgr: Look for things in /usr, not /usr/local

[sympathy.git] / src / sympathy.h.head.in

diff --git a/src/sympathy.h.head.in b/src/sympathy.h.head.in
index a703ce258f01b7eb47db36180040c94e6901a569..3ea6878e9986303df145bad112e379552378a28f 100644 (file)
--- a/src/sympathy.h.head.in
+++ b/src/sympathy.h.head.in
@@ -1,17 +1,26 @@
 /*
  * sympathy.h.head.in:
  *
- * Copyright (c) 2008 James McKenzie <james@fishsoup.dhs.org>,
+ * Copyright (c) 2008 James McKenzie <sympathy@madingley.org>,
  * All rights reserved.
  *
  */
 
 /*
- * $Id$
+ * $Id: sympathy.h.head.in,v 1.4 2010/07/16 11:06:39 james Exp $
  */
 
 /*
- * $Log$
+ * $Log: sympathy.h.head.in,v $
+ * Revision 1.4  2010/07/16 11:06:39  james
+ * add missing G2
+ *
+ * Revision 1.3  2008/03/07 14:13:40  james
+ * *** empty log message ***
+ *
+ * Revision 1.2  2008/02/13 18:05:06  james
+ * *** empty log message ***
+ *
  * Revision 1.1  2008/02/13 16:57:29  james
  * *** empty log message ***
  *
@@ -33,10 +42,11 @@ extern "C" {
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 
-/*the integer constants here are set by configure*/
+/* the integer constants here are set by configure */
 
-/*get uint32_t and friends defined */
+/* get uint32_t and friends defined */
 #if @G2_HAVE_STDINT_H@
 #include <stdint.h>
 #elif @G2_HAVE_SYS_INT_TYPES_H@
@@ -49,7 +59,37 @@ extern "C" {
 /* If the following is <> then configure failed to find where */
 /* struct tm was defined - report it as a bug */
 
-/*get struct tm defined*/
+/* get struct tm defined */
 #include <@G2_TM_H@>
 
+#if @G2_TM_IN_SYS_TIME@
+#include <sys/time.h>
+#if @G2_TIME_WITH_SYS_TIME@
+#include <time.h>
+#endif
+#else
+#if @G2_TIME_WITH_SYS_TIME@
+#include <sys/time.h>
+#endif
+#include <time.h>
+#endif
+
+
+#if @G2_HAVE_MALLOC_H@
+#include <malloc.h>
+#endif
+
+#if @G2_HAVE_UNISTD_H@
+#include <unistd.h>
+#endif
+
+#if @G2_HAVE_STDINT_H@
+#include <stdint.h>
+#elif @G2_HAVE_SYS_INT_TYPES_H@
+#include <sys/int_types.h>
+#endif
+
+#include <termio.h>
+#include <termios.h>
+