patches/giflib-01-configure.diff
author drdoug007
Sat, 08 Sep 2007 01:46:23 +0000
changeset 458 8ffcaf7be051
permissions -rw-r--r--
2007-09-08 Doug Scott <[email protected]> * SFEeclipse.spec: *NEW* Eclipse IDE * SFEgiflib.spec: *NEW* GIF Library * base-specs/giflib.spec: base spec * base-specs/eclipse.spec: base spec * patches/eclipse-02-solaris.diff: Solaris x86 mods * patches/eclipse-01-make.diff: gcc -> SS12 * patches/giflib-03-wall.diff: remove -Wall * patches/giflib-04-u_int.diff: add u_intXX_t types * patches/giflib-01-configure.diff: configure additions * patches/giflib-02-giftext-segfault.diff: segfault patch from PLD * include/eclipse.desktop: Eclipse .desktop file

diff -ur giflib-4.1.4.orig/configure.ac giflib-4.1.4/configure.ac
--- giflib-4.1.4.orig/configure.ac	2005-10-10 13:22:20.000000000 +0700
+++ giflib-4.1.4/configure.ac	2007-09-06 11:24:47.602761795 +0700
@@ -14,6 +14,27 @@
 
 AC_PATH_XTRA
 
+AC_MSG_CHECKING([if inttypes has u_int32_t etc])
+AC_COMPILE_IFELSE(
+    [AC_LANG_PROGRAM(
+        [[
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+        ]],[[
+    u_int32_t  s;
+    sleep((unsigned int)s);
+        ]]
+    )],
+    [AC_DEFINE(HAVE_U_INT_TYPES, 1, [Define to 1 if have u_int32_t types etc])
+    AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
+
 dnl Checks for libraries.
 
     AC_CHECK_LIB(m, pow, [MATH_LIB="${MATH_LIB} -lm"
@@ -31,7 +52,7 @@
                              AC_DEFINE(HAVE_LIBGL_S, [1], [Define if the gl_s library is installed (SGI GL library)])
                  COMPILABLE_EXTRAS="${COMPILABLE_EXTRAS} gif2iris"],, $X_LIBS)
 
-    AC_CHECK_LIB(X11, main, [X11_LIB="${X11_LIB} ${X_PRE_LIBS} $X_LIBS ${X_EXTRA_LIBS} -lX11"
+    AC_CHECK_LIB(X11, main, [X11_LIB="${X11_LIB} $X_LIBS ${X_EXTRA_LIBS} -lX11"
                              AC_DEFINE(HAVE_LIBX11, [1], [Define if the X11 library is installed])
                  COMPILABLE_EXTRAS="${COMPILABLE_EXTRAS} gif2x11"],, $X_LIBS)
     DEVS="${GL_S_LIB} ${X11_LIB}"