X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=8b3939636888225f84a2be95448acd16a33497df;hb=262a1501c25d57e39848d21647e607c8319c2088;hp=d7e3f25ba18e3bb1aa3b8c4e12d4c9dd20b20022;hpb=190e31d9e5c632b7f756efb8851dd9ef14b2d97d;p=xboard.git

diff --git a/configure.ac b/configure.ac
index d7e3f25..8b39396 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,14 +328,22 @@ dnl| USE_PTYS=1
       CONF_CFLAGS="-fwritable-strings"
     fi
   ;;
+dnl| OS X
+  *-apple-* )
+    if test -d /usr/X11/lib ; then
+      X_CFLAGS="$X_CFLAGS "
+      X_LIBS="$X_LIBS -L/usr/X11/lib -R/usr/X11/lib"
+      X_PRE_LIBS = "$X_PRE_LIBS -lXpm  -lSM -lICE"
+    fi
+  ;;
 esac
 
-AC_ARG_ENABLE(xpm,
-[  --enable-xpm            libXpm will be used if found (default)
-  --disable-xpm           libXpm will not be used],
-[enable_xpm="$enableval"], [enable_xpm="yes"])
+AC_ARG_ENABLE(	[xpm],
+		[AS_HELP_STRING([--enable-xpm],[libXpm will be used if found (default)])],
+		[enable_xpm="$enableval"],
+		[enable_xpm="yes"])
 
-if test "$enable_xpm" = "yes"; then
+if test x"$enable_xpm" != "xno"; then
   save_cflags="$CFLAGS"
   CFLAGS="$CFLAGS $X_CFLAGS"
   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
@@ -357,48 +365,68 @@ AC_SUBST(CONF_CFLAGS)
 AC_SUBST(CONF_LDFLAGS)
 
 AC_MSG_CHECKING(whether ptys or pipes should be used)
-AC_ARG_ENABLE(ptys, 
-[  --enable-ptys           force use of pseudo-ttys with child processes
-  --disable-ptys          force use of pipes with child processes],
+AC_ARG_ENABLE( [ptys], 
+	       [AS_HELP_STRING([--enable-ptys],[force use of pseudo-ttys with child processes])],
 [if test "$enableval" = yes; then
   USE_PTYS=1
+  enable_ptys="ptys"
   AC_MSG_RESULT([ptys (user override)])
 fi
 if test "$enableval" = no; then
   USE_PTYS=0
+  enable_ptys="pipes"
   AC_MSG_RESULT([pipes (user override)])
 fi],
 [if test "$USE_PTYS" = 1; then
   AC_MSG_RESULT(ptys)
+  enable_ptys="ptys"
 else
   AC_MSG_RESULT(pipes)
+  enable_ptys="pipes"
 fi])
 AC_DEFINE_UNQUOTED(USE_PTYS, $USE_PTYS)
 
 
 dnl | define not to build zippy as a default, so that autoheader is happy
 AC_DEFINE(ZIPPY, 0,[should zippy be enabled])
-AC_ARG_ENABLE(zippy, 
-[  --enable-zippy          support interfacing a chess program to ICS (default)
-  --disable-zippy         do not support interfacing a chess program to ICS],
-[enable_zippy="$enableval"], [enable_zippy="yes"])
-if test "$enable_zippy" = yes; then
+AC_ARG_ENABLE( [zippy], 
+	       [AS_HELP_STRING([--enable-zippy],[support interfacing a chess program to ICS (default)])],
+	       [], 
+	       [enable_zippy="yes"])
+
+if test x"$enable_zippy" != xno; then
   AC_DEFINE(ZIPPY, 1,[should zippy be enabled])
-  ZIPPY_O=zippy.o
-  ZIPPY_H=zippy.h
 fi
-AC_SUBST(ZIPPY_O)  
-AC_SUBST(ZIPPY_H)  
+AM_CONDITIONAL([ZIPPY], [test x$enable_zippy != xno])
+
 
 AC_ARG_ENABLE(sigint, 
-[  --enable-sigint         sending SIGINT (^C) wakes up GNU Chess (default)
-  --disable-sigint        typing a command wakes up GNU Chess],
+[AS_HELP_STRING([--enable-sigint],[sending SIGINT (^C) wakes up GNU Chess (default)])],
 [if test "$enableval" = yes; then
   AC_DEFINE(ATTENTION, 1)
-fi],
-[AC_DEFINE(ATTENTION, 1)])
+fi
+enable_sigint=$enableval
+],
+[enable_sigint="yes"
+AC_DEFINE(ATTENTION, 1)])
+
 
 AC_CONFIG_FILES([Makefile cmail])
 AC_CONFIG_COMMANDS([test-stamp-h],[test -z "$CONFIG_HEADERS" || date > stamp-h])
 AC_CONFIG_COMMANDS([chmod-cmail],[chmod 755 cmail])
 AC_OUTPUT
+
+dnl
+dnl Output a summary
+dnl
+echo ""
+echo " Configurations summary:"
+echo ""
+echo "        prefix:          $prefix"
+echo ""
+echo "        Xaw3d:           $with_xaw3d"
+echo ""
+echo "        xpm:             $enable_xpm"
+echo "        ptys:            $enable_ptys"
+echo "        zippy:           $enable_zippy"
+echo "        sigint:          $enable_sigint"