[cairo-commit] 3 commits - build/configure.ac.system configure.ac test/any2ppm.c

[Chris Wilson]

 build/configure.ac.system |    2 +-
 configure.ac              |    2 +-
 test/any2ppm.c            |    7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit e4b1f871e9cbb04590df5dc6f6f7854642fa0340
Author: Ginn Chen <Ginn.Chen at Sun.COM>
Date:   Tue Mar 3 10:27:11 2009 +0000

    [configure] Detect mkdir variant with non-gcc compilers.
    
    It doesn't work for non GCC compiler right now, as "-Werror -Wall" is
    an error to non GCC compiler.
    
    I swapped the sequence of build/configure.ac.system and build/
    configure.ac.warnings, then WARN_CFLAGS can be used.

diff --git a/build/configure.ac.system b/build/configure.ac.system
index 4544a54..d71d2d0 100644
--- a/build/configure.ac.system
+++ b/build/configure.ac.system
@@ -81,7 +81,7 @@ AC_CHECK_FUNC(mkdir,
 	      [AC_MSG_CHECKING([mkdir variant])
 	      mkdir_variant="unknown"
 	      save_CFLAGS="$CFLAGS"
-	      CFLAGS="-Werror -Wall $CFLAGS" # non-gcc compilers?
+	      CFLAGS=$WARN_CFLAGS
 	      AC_TRY_COMPILE([
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/configure.ac b/configure.ac
index 229eb6a..48b61b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,9 +19,9 @@ dnl The order of the includes here is rather important
 dnl
 m4_include(build/configure.ac.version)	dnl macros setting up various version declares
 m4_include(build/configure.ac.tools)	dnl checks for tools we use
-m4_include(build/configure.ac.system)	dnl checks for system functions, headers, libs
 m4_include(build/configure.ac.features)	dnl macros for backend/feature handling
 m4_include(build/configure.ac.warnings)	dnl checks for compiler warning
+m4_include(build/configure.ac.system)	dnl checks for system functions, headers, libs
 m4_include(build/configure.ac.analysis)	dnl checks for analysis tools (lcov, etc)
 m4_include(build/configure.ac.noversion) dnl disable builtin libtool versioning
 AC_CACHE_SAVE
commit f178f55e47013a92a47a24ac04b1041963b03976
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Mar 3 10:25:05 2009 +0000

    [test/any2ppm] Update the cairo-script-interpreter callback.
    
    Reflect the current prototype which now specifies the content to use when
    creating the surface.

diff --git a/test/any2ppm.c b/test/any2ppm.c
index 0149230..1327581 100644
--- a/test/any2ppm.c
+++ b/test/any2ppm.c
@@ -239,6 +239,7 @@ write_ppm (cairo_surface_t *surface, int fd)
 
 static cairo_surface_t *
 _create_image (void *closure,
+	       cairo_content_t content,
 	       double width, double height)
 	       //csi_object_t *dictionary)
 {
commit 694f2eea9feecfdc437e6964d1e758fab7315af9
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Mar 3 10:24:25 2009 +0000

    [test/any2ppm] Add feature checks for daemon()
    
    Add the feature checks for the presence of the daemon() function call.

diff --git a/test/any2ppm.c b/test/any2ppm.c
index 7b3dabb..0149230 100644
--- a/test/any2ppm.c
+++ b/test/any2ppm.c
@@ -77,7 +77,7 @@
 #include <libspectre/spectre.h>
 #endif
 
-#if HAVE_FCNTL_H && HAVE_SIGNAL_H && HAVE_SYS_STAT_H && HAVE_SYS_SOCKET_H && HAVE_SYS_POLL_H && HAVE_SYS_UN_H
+#if HAVE_UNISTD_H && HAVE_FCNTL_H && HAVE_SIGNAL_H && HAVE_SYS_STAT_H && HAVE_SYS_SOCKET_H && HAVE_SYS_POLL_H && HAVE_SYS_UN_H
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/stat.h>
@@ -89,7 +89,11 @@
 #define SOCKET_PATH "./.any2ppm"
 #define TIMEOUT 60000 /* 60 seconds */
 
+#if _BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE < 500)
 #define CAN_RUN_AS_DAEMON 1
+#else
+#define CAN_RUN_AS_DAEMON 0
+#endif
 #endif
 
 #define ARRAY_LENGTH(A) (sizeof (A) / sizeof (A[0]))