File slang-2.2.2-autoconf.dif of Package slang

Overview Repositories Revisions Requests Users Attributes Meta

File slang-2.2.2-autoconf.dif of Package slang (Revision 2d7a3987a9fcf935b23dcf03068b8dde)

Currently displaying revision 2d7a3987a9fcf935b23dcf03068b8dde , Show latest

diff -urN slang-2.2.2.orig/autoconf/aclocal.m4 slang-2.2.2/autoconf/aclocal.m4
--- slang-2.2.2.orig/autoconf/aclocal.m4	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/autoconf/aclocal.m4	2010-08-15 13:48:23.000000000 +0200
@@ -317,18 +317,18 @@
 AC_DEFUN(JD_GCC_WARNINGS, dnl#{{{
 [
 AC_ARG_ENABLE(warnings,
-	      [  --enable-warnings       turn on GCC compiler warnings],
+	      AC_HELP_STRING([--enable-warnings],[turn on GCC compiler warnings]),
 	      [gcc_warnings=$enableval])
-if test -n "$GCC"
+if test -n "$GCC" && test -n "$gcc_warnings"
 then
-  #CFLAGS="$CFLAGS -fno-strength-reduce"
-  if test -n "$gcc_warnings"
-  then
-    CFLAGS="$CFLAGS -Wall -W -pedantic -Winline -Wmissing-prototypes \
- -Wnested-externs -Wpointer-arith -Wcast-align -Wshadow -Wstrict-prototypes"
-    # Now trim excess whitespace
-    CFLAGS=`echo $CFLAGS`
-  fi
+  CFLAGS="$CFLAGS -Wall -W -pedantic -Winline -Wmissing-prototypes \
+  -Wnested-externs -Wpointer-arith -Wcast-align -Wshadow -Wstrict-prototypes \
+  -Wformat -Wformat-security"
+  ELF_CFLAGS="$ELF_CFLAGS -Wall -W -pedantic -Winline -Wmissing-prototypes \
+  -Wnested-externs -Wpointer-arith -Wcast-align -Wshadow -Wstrict-prototypes \
+  -Wformat -Wformat-security"
+  # Now trim excess whitespace
+  CFLAGS=`echo $CFLAGS`
 fi
 ])
 
@@ -495,7 +495,7 @@
 done
 if test "$TERMCAP"; then
   AC_MSG_RESULT(no)
-  AC_DEFINE(USE_TERMCAP)
+  AC_DEFINE(USE_TERMCAP,1,[Define to use termcap])
 fi
 AC_SUBST(TERMCAP)dnl
 AC_SUBST(MISC_TERMINFO_DIRS)dnl
@@ -507,9 +507,9 @@
 AC_DEFUN(JD_ANSI_CC, dnl#{{{
 [
 AC_AIX
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_GCC_TRADITIONAL
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_CPP])
+AC_REQUIRE([AC_PROG_GCC_TRADITIONAL])
 AC_ISC_POSIX
 
 dnl #This stuff came from Yorick config script
@@ -521,7 +521,7 @@
   yes
 #endif
 ], [
-AC_DEFINE(_HPUX_SOURCE)
+AC_DEFINE(_HPUX_SOURCE,1,[Special define needed for HPUX])
 if test "$CC" = cc; then CC="cc -Ae"; fi
 ])dnl
 dnl
@@ -545,8 +545,11 @@
 dnl # Check for dynamic linker
 dnl #-------------------------------------------------------------------------
 DYNAMIC_LINK_LIB=""
+
+AH_TEMPLATE([HAVE_DLOPEN],[Define if you have dlopen])
+
 AC_CHECK_HEADER(dlfcn.h,[
-  AC_DEFINE(HAVE_DLFCN_H)
+  AC_DEFINE(HAVE_DLFCN_H,1,[Define if you have the dlfcn.h header])
   AC_CHECK_LIB(dl,dlopen,[
     DYNAMIC_LINK_LIB="-ldl"
     AC_DEFINE(HAVE_DLOPEN)
@@ -585,7 +588,7 @@
   *linux*|*gnu*|k*bsd*-gnu )
     DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic"
     ELF_CC="\$(CC)"
-    ELF_CFLAGS="\$(CFLAGS) -fPIC"
+    ELF_CFLAGS="$ELF_CFLAGS -fPIC"
     ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-O1 -Wl,--version-script,\$(VERSION_SCRIPT) -Wl,-soname,\$(ELFLIB_MAJOR)"
     ELF_DEP_LIBS="\$(DL_LIB) -lm -lc"
     CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC"
diff -urN slang-2.2.2.orig/autoconf/configure.ac slang-2.2.2/autoconf/configure.ac
--- slang-2.2.2.orig/autoconf/configure.ac	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/autoconf/configure.ac	2010-08-15 13:49:02.000000000 +0200
@@ -17,6 +17,62 @@
 AC_CONFIG_AUX_DIR(autoconf)
 AC_CANONICAL_HOST
 
+AH_TOP([
+/* -*- c -*- */
+/* Note: this is for unix only. */
+
+#ifndef SL_CONFIG_H
+#define SL_CONFIG_H
+])
+
+AH_BOTTOM([
+#if defined(HAVE_SIGADDSET) && defined(HAVE_SIGEMPTYSET)
+# if defined(HAVE_SIGACTION) && defined(HAVE_SIGPROCMASK)
+#  define SLANG_POSIX_SIGNALS
+# endif
+#endif
+
+/* Define if you need to in order for stat and other things to work.  */
+#undef _POSIX_SOURCE
+
+#ifdef _AIX
+# ifndef _POSIX_SOURCE
+#  define _POSIX_SOURCE 1
+# endif
+# ifndef _ALL_SOURCE
+#  define _ALL_SOURCE
+# endif
+/* This may generate warnings but the fact is that without it, xlc will 
+ * INCORRECTLY inline many str* functions. */
+# undef __STR__
+#endif
+
+/* define USE_TERMCAP if you want to use it instead of terminfo. */
+#if defined(sequent) || defined(NeXT)
+# ifndef USE_TERMCAP
+#  define USE_TERMCAP
+# endif
+#endif
+
+#if defined(ultrix) && !defined(__GNUC__)
+# ifndef NO_PROTOTYPES
+#  define NO_PROTOTYPES
+# endif
+#endif
+
+#ifndef unix
+# define unix 1
+#endif
+
+#ifndef __unix__
+# define __unix__ 1
+#endif
+
+#define _SLANG_SOURCE_	1
+#endif /* SL_CONFIG_H */
+])
+
+
 JD_INIT
 JD_ANSI_CC
 
@@ -125,20 +181,20 @@
 ])
 if test $jd_cv_nl_langinfo_codeset = yes
 then
-  AC_DEFINE(HAVE_NL_LANGINFO_CODESET, 1)
+  AC_DEFINE(HAVE_NL_LANGINFO_CODESET, 1, [Define to 1 if you have the nl_langinfo(CODESET) function])
 fi
 
-AC_CHECK_LIB(m, acosh, [AC_DEFINE(HAVE_ACOSH)])
-AC_CHECK_LIB(m, asinh, [AC_DEFINE(HAVE_ASINH)])
-AC_CHECK_LIB(m, atanh, [AC_DEFINE(HAVE_ATANH)])
-AC_CHECK_LIB(m, hypot, [AC_DEFINE(HAVE_HYPOT)])
-AC_CHECK_LIB(m, atan2, [AC_DEFINE(HAVE_ATAN2)])
-AC_CHECK_LIB(m, frexp, [AC_DEFINE(HAVE_FREXP)])
-AC_CHECK_LIB(m, frexpf, [AC_DEFINE(HAVE_FREXPF)])
-AC_CHECK_LIB(m, ldexp, [AC_DEFINE(HAVE_LDEXP)])
-AC_CHECK_LIB(m, ldexpf, [AC_DEFINE(HAVE_LDEXPF)])
-AC_CHECK_LIB(m, feclearexcept, [AC_DEFINE(HAVE_FECLEAREXCEPT)])
-AC_CHECK_LIB(m, fpsetsticky, [AC_DEFINE(HAVE_FPSETSTICKY)])
+AC_CHECK_LIB(m, acosh, [AC_DEFINE(HAVE_ACOSH,1,[Define to 1 if you have the `acosh' function])])
+AC_CHECK_LIB(m, asinh, [AC_DEFINE(HAVE_ASINH,1,[Define to 1 if you have the `asinh' function])])
+AC_CHECK_LIB(m, atanh, [AC_DEFINE(HAVE_ATANH,1,[Define to 1 if you have the `atanh' function])])
+AC_CHECK_LIB(m, hypot, [AC_DEFINE(HAVE_HYPOT,1,[Define to 1 if you have the `hypot' function])])
+AC_CHECK_LIB(m, atan2, [AC_DEFINE(HAVE_ATAN2,1,[Define to 1 if you have the `atan2' function])])
+AC_CHECK_LIB(m, frexp, [AC_DEFINE(HAVE_FREXP,1,[Define to 1 if you have the `frexp' function])])
+AC_CHECK_LIB(m, frexpf, [AC_DEFINE(HAVE_FREXPF,1,[Define to 1 if you have the `frexpf' function])])
+AC_CHECK_LIB(m, ldexp, [AC_DEFINE(HAVE_LDEXP,1,[Define to 1 if you have the `ldexp' function])])
+AC_CHECK_LIB(m, ldexpf, [AC_DEFINE(HAVE_LDEXPF,1,[Define to 1 if you have the `ldexpf' function])])
+AC_CHECK_LIB(m, feclearexcept, [AC_DEFINE(HAVE_FECLEAREXCEPT,1,[Define to 1 if you have the `feclearexcept' function])])
+AC_CHECK_LIB(m, fpsetsticky, [AC_DEFINE(HAVE_FPSETSTICKY,1,[Define to 1 if you have the `fpsetsticky' function])])
 
 JD_ELF_COMPILER
 JD_IEEE_CFLAGS
@@ -168,7 +224,7 @@
 if test $jd_with_pcre_library = yes
 then 
   PCRE_MODULE="pcre-module.so"
-  AC_DEFINE(HAVE_PCRE_H)
+  AC_DEFINE(HAVE_PCRE_H,1,[Define to 1 if you have the pcre.h header])
   extramodules="$extramodules pcre"
 else
   PCRE_MODULE=""
@@ -180,7 +236,7 @@
 if test $jd_with_onig_library = yes
 then 
   ONIG_MODULE="onig-module.so"
-  AC_DEFINE(HAVE_ONIGURUMA_H)
+  AC_DEFINE(HAVE_ONIGURUMA_H,1,[Define to 1 if you have the oniguruma.h header])
   extramodules="$extramodules oniguruma"
 else
   ONIG_MODULE=""
@@ -192,7 +248,7 @@
 if test $jd_with_png_library = yes
 then 
   PNG_MODULE="png-module.so"
-  AC_DEFINE(HAVE_PNG_H)
+  AC_DEFINE(HAVE_PNG_H,1,[Define to 1 if you have the png.h header])
   extramodules="$extramodules png"
 else
   PNG_MODULE=""
@@ -204,7 +260,7 @@
 if test $jd_with_z_library = yes
 then 
   ZLIB_MODULE="zlib-module.so"
-  AC_DEFINE(HAVE_ZLIB_H)
+  AC_DEFINE(HAVE_ZLIB_H, 1, [Define to 1 if you have the zlib library])
   extramodules="$extramodules z"
 else
   ZLIB_MODULE=""
@@ -212,14 +268,14 @@
 fi
 AC_SUBST(ZLIB_MODULE)
 
-m4_include([./iconv.m4])
+dnl m4_include([./iconv.m4])
 
 ICONV_MODULE=""
 JD_CHECK_FOR_LIBRARY(iconv)
 if test $jd_with_iconv_library = yes
 then 
   ICONV_MODULE="iconv-module.so"
-  AC_DEFINE(HAVE_ICONV_H)
+  AC_DEFINE(HAVE_ICONV_H, 1, [Define to 1 if you have the iconv library])
   ICONV_LIB="$ICONV_LIB -liconv"
   extramodules="$extramodules iconv"
 else

Places

File slang-2.2.2-autoconf.dif of Package slang (Revision 2d7a3987a9fcf935b23dcf03068b8dde)

Places