Use the 32x32 icon set for the toolbar.

[pspp] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 14d11dc70a26e44bc22f28bac8ca5418360c4843..ee7c9b0be68b98ad8ec071497da577f9cf3c29bd 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -123,6 +123,9 @@ AC_DEFUN([PSPP_READLINE],
     AC_DEFINE(HAVE_READLINE, 1, [Define if you have the readline library.])
     AC_MSG_CHECKING([how to link with libreadline])
     AC_MSG_RESULT([$LIBREADLINE])
+    AC_SEARCH_LIBS([rl_outstream], [readline],
+        AC_DEFINE(HAVE_RL_OUTSTREAM, 1, [Define if the readline library provides rl_outstream.])
+    )
   else
     dnl If $LIBREADLINE didn't lead to a usable library, we don't
     dnl need $INCREADLINE either.
@@ -278,3 +281,31 @@ EOF
        AM_MAKEINFOFLAGS="$AM_MAKEINFOFLAGS -DMISSING_CLICKSEQUENCE"
        AC_SUBST([AM_MAKEINFOFLAGS])
    fi])
+
+# The following comes from Open vSwitch:
+# ----------------------------------------------------------------------
+# Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+dnl PSPP_ENABLE_WERROR
+AC_DEFUN([PSPP_ENABLE_WERROR],
+  [AC_ARG_ENABLE(
+     [Werror],
+     [AC_HELP_STRING([--enable-Werror], [Add -Werror to CFLAGS])],
+     [], [enable_Werror=no])
+   AC_CONFIG_COMMANDS_PRE(
+     [if test "X$enable_Werror" = Xyes; then
+        CFLAGS="$CFLAGS -Werror"
+      fi])])
+