Changeset 1538

Timestamp:

01/28/2007 12:47:12 PM (1 year ago)

Author:

jan

Message:

fixed checks for libfcgi and the different locations of the
fastcgi-headers

Files:

• trunk/configure.in (modified) (1 diff)
• trunk/src/Makefile.am (modified) (1 diff)
• trunk/src/fcgi-stat-accel.c (modified) (3 diffs)

trunk/configure.in

@@ -543 +543 @@
- AC_CHECK_HEADERS([fastcgi.h],[
-   fastcgi_found=yes
+   AC_DEFINE(HAVE_FASTCGI_H, 1, [ fastcgi.h ])
+ ],[
+   AC_CHECK_HEADERS([fastcgi/fastcgi.h],[
+     fastcgi_found=yes
+     AC_DEFINE(HAVE_FASTCGI_FASTCGI_H, 1, [fastcgi/fastcgi.h])
+   ])
- ])
-])
-
-test "x$fastcgi_found" = xyes
+[test "x$fastcgi_found" = xyes]
-
-

trunk/src/Makefile.am

@@ -83 +83 @@
-if CHECK_WITH_FASTCGI
-fcgi_stat_accel_SOURCES=fcgi-stat-accel.c
-$(FCGI_LIB)
+-lfcgi
-endif
-

trunk/src/fcgi-stat-accel.c

@@ -9 +9 @@
-*/
-
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
-
-#include <sys/types.h>
@@ -19 +22 @@
-
-#include <stdlib.h>
-
+
-#include <fastcgi/fcgiapp.h>
+#elif defined (HAVE_FASTCGI_H)
+#include <fcgiapp.h>
+#endif
-
-#define THREAD_COUNT 20
@@ -37 +43 @@
-        char *filename;
-
-FCGI_FAIL_ACCEPT_ON_INTR
+/* FCGI_FAIL_ACCEPT_ON_INTR */ 0
-
-        while(1){