Index: ChangeLog
===================================================================
RCS file: /cvsroot/xforms/xforms/ChangeLog,v
retrieving revision 1.46
diff -u -p -r1.46 ChangeLog
--- ChangeLog	9 Sep 2003 09:38:46 -0000	1.46
+++ ChangeLog	9 Sep 2003 14:56:21 -0000
@@ -1,3 +1,14 @@
+2003-09-09  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* config/xformsinclude.m4 (XFORMS_CHECK_LIB_JPEG): no need to link
+	against the X11 libs...
+
+	* configure.ac: remove lots of checks for headers and functions.
+	We only keep the ones that were already tested for in the old
+	source (although we do not know whether they are still useful).
+
+	* lib/asyn_io.c: use HAVE_SYS_SELECT_H
+
 2003-09-09  Angus Leeming  <angus.leeming@btopenworld.com>
 
 	* lib/forms.c (fl_keyboard): pass it the event to allow it to
Index: configure.ac
===================================================================
RCS file: /cvsroot/xforms/xforms/configure.ac,v
retrieving revision 1.4
diff -u -p -r1.4 configure.ac
--- configure.ac	8 Sep 2003 23:48:36 -0000	1.4
+++ configure.ac	9 Sep 2003 14:56:21 -0000
@@ -65,41 +65,33 @@ XFORMS_LOOP_DIR($xforms_cv_extra_prefix,
 XFORMS_ADD_INC_DIR(CPPFLAGS,$dir/include)
   XFORMS_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
 
-# Check for X
-AC_PATH_XTRA
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST  dnl used
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
 
 # Checks for libraries.
 dnl by testing these we check if it is ok to have
 dnl -lc and -lm as args to the compiler
 AC_CHECK_LIB(m, sin)
 AC_CHECK_LIB(c, fopen)
-XFORMS_CHECK_LIB_JPEG
 
 # Checks for header files.
-XFORMS_PATH_XPM
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([fcntl.h float.h limits.h locale.h malloc.h memory.h stdlib.h string.h sys/select.h sys/time.h sys/timeb.h sys/types.h unistd.h, GL/glx.h])
+dnl we should do something clever when GL is not installed
+AC_CHECK_HEADERS([sys/select.h GL/glx.h])
 
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STAT
-AC_C_CONST  dnl used
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-AC_STRUCT_TM
+dnl we have some code in lib/listdir.c that could use that...
+dnl AC_HEADER_DIRENT
+
+
+# Check for X and XPM
+AC_PATH_XTRA
+XFORMS_PATH_XPM
+XFORMS_CHECK_LIB_JPEG
 
 # Checks for library functions.
-AC_FUNC_FORK
-AC_FUNC_MALLOC
 AC_TYPE_SIGNAL dnl used
-AC_FUNC_STAT
-AC_FUNC_STRTOD
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([usleep dup2 endpwent floor ftime getcwd gethostname gettimeofday getwd memmove memset modf pow putenv select setlocale strcasecmp strchr strdup strerror strrchr strstr strtol])
-
-AC_CHECK_FUNCS(snprintf vsnprintf)
+AC_CHECK_FUNCS([snprintf strcasecmp strerror usleep vsnprintf])
 XFORMS_CHECK_DECL(snprintf, stdio.h)
 XFORMS_CHECK_DECL(vsnprintf, stdio.h)
 
Index: config/xformsinclude.m4
===================================================================
RCS file: /cvsroot/xforms/xforms/config/xformsinclude.m4,v
retrieving revision 1.3
diff -u -p -r1.3 xformsinclude.m4
--- config/xformsinclude.m4	22 May 2003 17:47:15 -0000	1.3
+++ config/xformsinclude.m4	9 Sep 2003 14:56:21 -0000
@@ -30,12 +30,9 @@ esac])
 dnl Usage XFORMS_CHECK_LIB_JPEG: Checks for jpeg library
 AC_DEFUN(XFORMS_CHECK_LIB_JPEG,[
 ### Check for Jpeg library
-SAVE_LIBS="$LIBS"
-LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
 AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, JPEG_LIB="-ljpeg",
 	[XFORMS_LIB_ERROR(libjpeg,jpeg)])
 AC_SUBST(JPEG_LIB)
-LIBS="$SAVE_LIBS"
 ])
 
 dnl Usage XFORMS_PATH_XPM: Checks for xpm library and header
Index: lib/asyn_io.c
===================================================================
RCS file: /cvsroot/xforms/xforms/lib/asyn_io.c,v
retrieving revision 1.6
diff -u -p -r1.6 asyn_io.c
--- lib/asyn_io.c	9 Sep 2003 00:28:25 -0000	1.6
+++ lib/asyn_io.c	9 Sep 2003 14:56:21 -0000
@@ -46,7 +46,7 @@
 #include <sys/time.h>
 #endif
 
-#if defined(_AIX)
+#ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif