Changeset 1179

Timestamp:

01/01/08 03:58:03 (8 months ago)

Author:

shawnw

Message:

Added config.guess and config.sub for host type detection.
Added configure check for gcc 4.2's -fstack-protector option.

Files:

• 1.8.3/branches/devel/aclocal.m4 (modified) (1 diff)
• 1.8.3/branches/devel/config.guess (added)
• 1.8.3/branches/devel/config.sub (added)
• 1.8.3/branches/devel/configure (modified) (7 diffs)
• 1.8.3/branches/devel/configure.in (modified) (2 diffs)

1.8.3/branches/devel/aclocal.m4

@@ -978 +978 @@
-AC_SUBST([PCRE_CFLAGS])
-])
+##### http://autoconf-archive.cryp.to/ax_gcc_option.html
+#
+# SYNOPSIS
+#
+#   AX_GCC_OPTION(OPTION,EXTRA-OPTIONS,TEST-PROGRAM,ACTION-IF-SUCCESSFUL,ACTION-IF-NOT-SUCCESFUL)
+#
+# DESCRIPTION
+#
+#   AX_GCC_OPTION checks wheter gcc accepts the passed OPTION. If it
+#   accepts the OPTION then ACTION-IF-SUCCESSFUL will be executed,
+#   otherwise ACTION-IF-UNSUCCESSFUL.
+#
+#   NOTE: This macro will be obsoleted by AX_C_CHECK_FLAG
+#   AX_CXX_CHECK_FLAG, AX_CPP_CHECK_FLAG, AX_CXXCPP_CHECK_FLAG and
+#   AX_LD_CHECK_FLAG.
+#
+#   A typical usage should be the following one:
+#
+#     AX_GCC_OPTION([-fomit-frame-pointer],[],[],[
+#       AC_MSG_NOTICE([The option is supported])],[
+#       AC_MSG_NOTICE([No luck this time])
+#     ])
+#
+#   The macro doesn't discriminate between languages so, if you are
+#   testing for an option that works for C++ but not for C you should
+#   use '-x c++' as EXTRA-OPTIONS:
+#
+#     AX_GCC_OPTION([-fno-rtti],[-x c++],[],[ ... ],[ ... ])
+#
+#   OPTION is tested against the following code:
+#
+#     int main()
+#     {
+#             return 0;
+#     }
+#
+#   The optional TEST-PROGRAM comes handy when the default main() is
+#   not suited for the option being checked
+#
+#   So, if you need to test for -fstrict-prototypes option you should
+#   probably use the macro as follows:
+#
+#     AX_GCC_OPTION([-fstrict-prototypes],[-x c++],[
+#       int main(int argc, char ** argv)
+#       {
+#           (void) argc;
+#           (void) argv;
+#
+#           return 0;
+#       }
+#     ],[ ... ],[ ... ])
+#
+#   Note that the macro compiles but doesn't link the test program so
+#   it is not suited for checking options that are passed to the
+#   linker, like:
+#
+#     -Wl,-L<a-library-path>
+#
+#   In order to avoid such kind of problems you should think about
+#   usinguse the AX_*_CHECK_FLAG family macros
+#
+# LAST MODIFICATION
+#
+#   2007-11-26
+#
+# COPYLEFT
+#
+#   Copyright (c) 2007 Francesco Salvestrini <salvestrini@users.sourceforge.net>
+#   Copyright (c) 2007 Bogdan Drozdowski <bogdandr@op.pl>
+#
+#   This program is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation; either version 2 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#   General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+#   02111-1307, USA.
+#
+#   As a special exception, the respective Autoconf Macro's copyright
+#   owner gives unlimited permission to copy, distribute and modify the
+#   configure scripts that are the output of Autoconf when processing
+#   the Macro. You need not follow the terms of the GNU General Public
+#   License when using or distributing such scripts, even though
+#   portions of the text of the Macro appear in them. The GNU General
+#   Public License (GPL) does govern all other use of the material that
+#   constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the
+#   Autoconf Macro released by the Autoconf Macro Archive. When you
+#   make and distribute a modified version of the Autoconf Macro, you
+#   may extend this special exception to the GPL to apply to your
+#   modified version as well.
+
+AC_DEFUN([AX_GCC_OPTION], [
+  AC_REQUIRE([AC_PROG_CC])
+
+  AC_MSG_CHECKING([if gcc accepts $1 option])
+
+  AS_IF([ test "x$GCC" = "xyes" ],[
+    AS_IF([ test -z "$3" ],[
+      ax_gcc_option_test="int main()
+{
+    return 0;
+}"
+    ],[
+      ax_gcc_option_test="$3"
+    ])
+
+    # Dump the test program to file
+    cat <<EOF > conftest.c
+$ax_gcc_option_test
+EOF
+
+    # Dump back the file to the log, useful for debugging purposes
+    AC_TRY_COMMAND(cat conftest.c 1>&AS_MESSAGE_LOG_FD)
+
+    AS_IF([ AC_TRY_COMMAND($CC $2 $1 -c conftest.c 1>&AS_MESSAGE_LOG_FD) ],[
+            AC_MSG_RESULT([yes])
+        $4
+    ],[
+        AC_MSG_RESULT([no])
+        $5
+    ])
+  ],[
+    AC_MSG_RESULT([no gcc available])
+  ])
+])

1.8.3/branches/devel/configure

@@ -651 +651 @@
-host_alias
-target_alias
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
-CAT
-CC
@@ -1266 +1274 @@
-
-  cat <<\_ACEOF
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
@@ -1729 +1741 @@
-ac_config_headers="$ac_config_headers config.h"
-
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+if test "${ac_cv_build+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+if test "${ac_cv_host+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
-
-if test "x$CFLAGS" = "x"; then
@@ -2963 +3089 @@
-fi
-
+
+
+
+  { echo "$as_me:$LINENO: checking if gcc accepts -fstack-protector option" >&5
+echo $ECHO_N "checking if gcc accepts -fstack-protector option... $ECHO_C" >&6; }
+
+  if  test "x$GCC" = "xyes" ; then
+
+    if  test -z "" ; then
+
+      ax_gcc_option_test="int main()
+{
+    return 0;
+}"
+
+else
+
+      ax_gcc_option_test=""
+
+fi
+
+
+    # Dump the test program to file
+    cat <<EOF > conftest.c
+$ax_gcc_option_test
+EOF
+
+    # Dump back the file to the log, useful for debugging purposes
+    { ac_try='cat conftest.c 1>&5'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }
+
+    if  { ac_try='$CC  -fstack-protector -c conftest.c 1>&5'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } ; then
+
+            { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+                   CFLAGS="$CFLAGS -fstack-protector"
+
+
+else
+
+        { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+
+fi
+
+
+else
+
+    { echo "$as_me:$LINENO: result: no gcc available" >&5
+echo "${ECHO_T}no gcc available" >&6; }
+
+fi
+
+
+
+
-# Extract the first word of "chmod", so it can be a program name with args.
-set dummy chmod; ac_word=$2
@@ -3081 +3274 @@
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
@@ -16882 +17044 @@
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
-CAT!$CAT$ac_delim
-CC!$CC$ac_delim
@@ -16930 +17100 @@
-_ACEOF
-
-83
+91
-    break
-  elif $ac_last_try; then

1.8.3/branches/devel/configure.in

@@ -7 +7 @@
-AC_INIT(configure.in)
-AC_CONFIG_HEADERS(config.h)
+AC_CANONICAL_HOST
-
-if test "x$CFLAGS" = "x"; then
@@ -39 +40 @@
- fi
-fi
+
+AX_GCC_OPTION([-fstack-protector], [], [], [
+                   CFLAGS="$CFLAGS -fstack-protector"
+                   ], [])
+                   
-
-AC_PATH_PROG(CHMOD, chmod)