Changeset 2527Tweet

Timestamp:

Jul 15, 2008, 10:16:06 PM (13 years ago)

Author:

Sam Hocevar

Message:

• Build on HP-UX systems: disable unsupported warning flags, define _XOPEN_SOURCE_EXTENDED where appropriate, use AC_C_INLINE to avoid using the inline keyword when unsupported, and use #pragma INIT for library initialisation routines.

Location:

zzuf/trunk

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• m4 (added)
• m4/cflags.m4 (added)
• src/lib-fd.c (modified) (1 diff)
• src/libzzuf.c (modified) (1 diff)

zzuf/trunk/Makefile.am

@@ -4 +4 @@
 DIST_SUBDIRS = $(SUBDIRS)
 
-EXTRA_DIST = bootstrap AUTHORS
+EXTRA_DIST = bootstrap AUTHORS m4/cflags.m4
+ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 

zzuf/trunk/configure.ac

@@ -11 +11 @@
 AC_PROG_CPP
 AC_PROG_LIBTOOL
+
+AC_C_INLINE
+
+# Optimizations
+AC_TRY_CFLAGS(-g -O2, CFLAGS="${CFLAGS} -g -O2")
+# Code qui fait des warnings == code de porc == deux baffes dans ta gueule
+AC_TRY_CFLAGS(-Wall, CFLAGS="${CFLAGS} -Wall")
+AC_TRY_CFLAGS(-W, CFLAGS="${CFLAGS} -W")
+AC_TRY_CFLAGS(-Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare, CFLAGS="${CFLAGS} -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare")
 
 case "${host_os}" in
@@ -50 +59 @@
 AC_MSG_CHECKING(for recv() return value)
 ac_v_recv_t="int"
-AC_TRY_COMPILE([#include <sys/types.h>
-  #include <sys/socket.h>],
+AC_TRY_COMPILE([#define _XOPEN_SOURCE_EXTENDED
+                #include <sys/types.h>
+                #include <sys/socket.h>],
  [ssize_t recv(int s, void *buf, size_t len, int flags);],
  [ac_v_recv_t="ssize_t"])
 AC_MSG_RESULT($ac_v_recv_t)
 AC_DEFINE_UNQUOTED(RECV_T, $ac_v_recv_t, [Define to the recv() return type])
+
+AC_MSG_CHECKING(for pragma INIT/FINI)
+AC_TRY_COMPILE([],
+ [#pragma INIT "my_init"
+  void my_init(void)],
+ [AC_MSG_RESULT(yes)
+  AC_DEFINE(HAVE_PRAGMA_INIT, 1, [Define to 1 if you have pragma INIT])],
+ [AC_MSG_RESULT(no)])
 
 ac_cv_have_getopt_long="no"
@@ -74 +92 @@
 AC_SUBST(DL_LIBS)
 
-# Optimizations
-CFLAGS="${CFLAGS} -g -O2"
-# Code qui fait des warnings == code de porc == deux baffes dans ta gueule
-CFLAGS="${CFLAGS} -Wall -W -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare"
-
 AC_OUTPUT([
   Makefile

zzuf/trunk/src/lib-fd.c

@@ -26 +26 @@
 /* Use this to get lseek64() on glibc systems */
 #define _LARGEFILE64_SOURCE
+/* Use this to get proper prototypes on HP-UX systems */
+#define _XOPEN_SOURCE_EXTENDED
 
 #if defined HAVE_STDINT_H

zzuf/trunk/src/libzzuf.c

@@ -49 +49 @@
 
 /* Library initialisation shit */
+#if defined __GNUC__
 void _zz_init(void) __attribute__((constructor));
 void _zz_fini(void) __attribute__((destructor));
+#elif defined HAVE_PRAGMA_INIT
+#   pragma INIT "_zz_init"
+#   pragma FINI "_zz_fini"
+#endif
+
 #if defined HAVE_WINDOWS_H
 BOOL WINAPI DllMain(HINSTANCE, DWORD, PVOID);