X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=533ccfd752d92f75f1aa4548d4a93c0ec57b9f0d;hb=04886e8f191744d287b126d97cf198694ffab97d;hp=6ccd5d36e5b200ec6f18aec0f1d1e1ebd74eef35;hpb=412926768f41195dfd853cfa87648cf21ee3d223;p=xboard.git

diff --git a/configure.ac b/configure.ac
index 6ccd5d3..533ccfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ dnl| to regenerate configure.  Then submit your changes to be folded into
 dnl| the standard version of xboard.
 
 dnl| define second argument as VERSION.PATCHLEVEL. e.g. 4.4.0j
-AC_INIT([xboard],[4.4.0.beta2],[bug-xboard@gnu.org])
+AC_INIT([xboard],[master-20091122],[bug-xboard@gnu.org])
 AM_INIT_AUTOMAKE
 
 AC_CONFIG_HEADERS([config.h])
@@ -107,6 +107,8 @@ AC_CHECK_FUNC(setlocale, [],
 
 AC_CHECK_LIB(seq, getpseudotty)
 
+
+dnl | check for X-libraries
 AC_PATH_XTRA
 if test -n "$no_x" ; then
   echo $PACKAGE requires the X Window System header files and libraries!
@@ -328,13 +330,9 @@ dnl| USE_PTYS=1
       CONF_CFLAGS="-fwritable-strings"
     fi
   ;;
-dnl| OS X
+
+dnl| add some libs for 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
 
@@ -411,6 +409,13 @@ enable_sigint=$enableval
 AC_DEFINE(ATTENTION, 1)])
 
 
+dnl | save all information for X in X_LIBS, also add the libraries themself
+dnl | since AC_PATH_XTRA only adds the paths
+X_LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS -lXmu -lX11 -lXt "    
+AC_SUBST(X_CFLAGS)
+AC_SUBST(X_LIBS)
+
+
 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])