improve autoconf and travis

OpenSmalltalk · Mar 8, 2018 · 698661a · 698661a
1 parent 2a4dd9b
commit 698661a
Show file tree

Hide file tree

Showing 4 changed files with 121 additions and 38 deletions.
diff --git a/.travis_install.sh b/.travis_install.sh
@@ -5,10 +5,14 @@ if [[ "${ARCH}" = "linux64x64" ]]; then
             debhelper \
             devscripts \
             libasound2-dev \
+            libc6-dev \
             libssl-dev \
             libfreetype6-dev \
             libx11-dev \
             libxext-dev \
+            libpango1.0-dev \
+            libpulse-dev \
+            libaudio-dev \
             gcc-multilib \
             uuid-dev
 elif [[ "${ARCH}" = "linux32x86" ]]; then
@@ -29,6 +33,9 @@ elif [[ "${ARCH}" = "linux32x86" ]]; then
             libgl1-mesa-dev:i386 \
             libxext-dev:i386 \
             libglapi-mesa:i386 \
+            libpango1.0-dev:i386 \
+            libpulse-dev:i386 \
+            libaudio-dev:i386 \
             gcc-multilib \
             uuid-dev:i386 \
             libcurl3-dev:i386

diff --git a/platforms/unix/config/config.h.in b/platforms/unix/config/config.h.in
@@ -5,19 +5,19 @@
  *   Copyright (C) 1996-2007 by Ian Piumarta and other authors/contributors
  *                              listed elsewhere in this file.
  *   All rights reserved.
- *   
+ *
  *   This file is part of Unix Squeak.
- * 
+ *
  *   Permission is hereby granted, free of charge, to any person obtaining a copy
  *   of this software and associated documentation files (the "Software"), to deal
  *   in the Software without restriction, including without limitation the rights
  *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  *   copies of the Software, and to permit persons to whom the Software is
  *   furnished to do so, subject to the following conditions:
- * 
+ *
  *   The above copyright notice and this permission notice shall be included in
  *   all copies or substantial portions of the Software.
- * 
+ *
  *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  *   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  *   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,13 +27,13 @@
  *   SOFTWARE.
  */
 
- /* Author: Ian.Piumarta@squeakland.org
-  *
-  * Last edited: 2006-04-23 12:34:41 by piumarta on emilia.local
-  */
+/* Author: Ian.Piumarta@squeakland.org
+ *
+ * Last edited: 2006-04-23 12:34:41 by piumarta on emilia.local
+ */
 
- #ifndef __sq_config_h
- #define __sq_config_h
+#ifndef __sq_config_h
+#define __sq_config_h
 
 
 /* Define if building universal (internal helper macro) */
@@ -86,6 +86,9 @@
 /* epoll_pwait(7) is supported */
 #undef HAVE_EPOLL_PWAIT
 
+/* Define to 1 if you have the <execinfo.h> header file. */
+#undef HAVE_EXECINFO_H
+
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 

diff --git a/platforms/unix/config/configure b/platforms/unix/config/configure
@@ -1,6 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69.
+# Generated by GNU Autoconf 2.69 for OpenSmalltalk VM devel.
+#
+# Report bugs to <vm-dev@lists.squeakfoundation.org>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -272,7 +274,8 @@ fi
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: vm-dev@lists.squeakfoundation.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -585,14 +588,13 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
-
-ac_unique_file="opensmalltalk-vm"
+PACKAGE_NAME='OpenSmalltalk VM'
+PACKAGE_TARNAME='opensmalltalk-vm'
+PACKAGE_VERSION='devel'
+PACKAGE_STRING='OpenSmalltalk VM devel'
+PACKAGE_BUGREPORT='vm-dev@lists.squeakfoundation.org'
+PACKAGE_URL='http://opensmalltalk.org/'
+
 ac_unique_file="config.h.in"
 # Factoring default headers for most tests.
 ac_includes_default="\
@@ -864,7 +866,7 @@ localstatedir='${prefix}/var'
 runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -1373,7 +1375,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures OpenSmalltalk VM devel to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1422,7 +1424,8 @@ Fine tuning of the installation directories:
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --docdir=DIR            documentation root
+                          [DATAROOTDIR/doc/opensmalltalk-vm]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1443,7 +1446,9 @@ _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of OpenSmalltalk VM devel:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
@@ -1513,7 +1518,8 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to the package provider.
+Report bugs to <vm-dev@lists.squeakfoundation.org>.
+OpenSmalltalk VM home page: <http://opensmalltalk.org/>.
 _ACEOF
 ac_status=$?
 fi
@@ -1576,7 +1582,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
+OpenSmalltalk VM configure devel
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1735,6 +1741,10 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ------------------------------------------------ ##
+## Report this to vm-dev@lists.squeakfoundation.org ##
+## ------------------------------------------------ ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
@@ -2281,7 +2291,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by OpenSmalltalk VM $as_me devel, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2571,6 +2581,7 @@ as_fn_append ac_header_list " sys/filio.h"
 as_fn_append ac_header_list " sys/select.h"
 as_fn_append ac_header_list " features.h"
 as_fn_append ac_header_list " alloca.h"
+as_fn_append ac_header_list " execinfo.h"
 as_fn_append ac_func_list " mmap"
 as_fn_append ac_func_list " nanosleep"
 # Check that the precious variables saved in the cache have kept the same
@@ -2644,10 +2655,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
 SVNREV=`grep '\$Rev: ' ${srcdir}/../../../platforms/Cross/vm/sqSCCSVersion.h \
-	        | sed 's/.*$Rev: \(0-90-9*\).*";/\1/'` \
-	        | head -n 1
+	        | sed 's/.*$Rev: \(0-90-9*\).*";/\1/' \
+	        | head -n 1`
 
 # Check whether --with-vmversion was given.
 if test "${with_vmversion+set}" = set; then :
@@ -13772,6 +13782,66 @@ fi
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace" >&5
+$as_echo_n "checking for library containing backtrace... " >&6; }
+if ${ac_cv_search_backtrace+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char backtrace ();
+int
+main ()
+{
+return backtrace ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' execinfo; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_backtrace=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_backtrace+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_backtrace+:} false; then :
+
+else
+  ac_cv_search_backtrace=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_backtrace" >&5
+$as_echo "$ac_cv_search_backtrace" >&6; }
+ac_res=$ac_cv_search_backtrace
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+
+
+
+
 
 
 ac_ext=c
@@ -18551,7 +18621,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
+This file was extended by OpenSmalltalk VM $as_me devel, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18611,13 +18681,14 @@ $config_headers
 Configuration commands:
 $config_commands
 
-Report bugs to the package provider."
+Report bugs to <vm-dev@lists.squeakfoundation.org>.
+OpenSmalltalk VM home page: <http://opensmalltalk.org/>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-config.status
+OpenSmalltalk VM config.status devel
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/platforms/unix/config/configure.ac b/platforms/unix/config/configure.ac
@@ -32,14 +32,16 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([opensmalltalk-vm],[],[vm-dev@lists.squeakfoundation.org],[OpenSmalltalk VM],[http://opensmalltalk.org/])
+AC_INIT([OpenSmalltalk VM],[devel],
+        [vm-dev@lists.squeakfoundation.org],
+        [],
+        [http://opensmalltalk.org/])
 
 AC_CONFIG_SRCDIR([config.h.in])
 
-
 SVNREV=`grep '\$Rev: ' ${srcdir}/../../../platforms/Cross/vm/sqSCCSVersion.h \
-	        | sed 's/.*$Rev: \([0-9][0-9]*\).*";/\1/'` \
-	        | head -n 1
+	        | sed 's/.*$Rev: \([0-9][0-9]*\).*";/\1/' \
+	        | head -n 1`
 AC_ARG_WITH(vmversion,
 	AS_HELP_STRING([ --with-vmversion=M.N], [vm version number (default=5.0)]),
 	[vmversion="${with_vmversion}"],
@@ -292,7 +294,7 @@ AC_SEARCH_LIBS([socket], [socket])
 AC_SEARCH_LIBS([sin], [m])
 
 AC_CHECK_HEADERS_ONCE([execinfo.h])
-AC_SEARCH_LIBS([bactrace],[execinfo])
+AC_SEARCH_LIBS([backtrace],[execinfo])
 
 
 AX_PTHREAD([