[33717] trunk/base

[afb at macports.org]

Revision: 33717
          http://trac.macosforge.org/projects/macports/changeset/33717
Author:   afb at macports.org
Date:     2008-02-03 15:12:47 -0800 (Sun, 03 Feb 2008)

Log Message:
-----------
provide X11 defaults for darwin, to work around X11 include symlink

Modified Paths:
--------------
    trunk/base/aclocal.m4
    trunk/base/configure

Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4	2008-02-03 23:09:46 UTC (rev 33716)
+++ trunk/base/aclocal.m4	2008-02-03 23:12:47 UTC (rev 33717)
@@ -448,6 +448,22 @@
 # ---------------------
 AC_DEFUN([MP_CHECK_X11], [
 
+        # work around symbolic X11 link in /usr/include by providing explicit defaults
+        case "$host" in
+            *-*-darwin9*)
+                if test "x$x_includes" = xNONE && test "x$x_libraries" = xNONE; then
+                    x_includes="/usr/X11/include"
+                    x_libraries="/usr/X11/lib"
+                fi
+                ;;
+            *-*-darwin*)
+                if test "x$x_includes" = xNONE && test "x$x_libraries" = xNONE; then
+                    x_includes="/usr/X11R6/include"
+                    x_libraries="/usr/X11R6/lib"
+                fi
+                ;;
+        esac
+
 	AC_PATH_X
 	AC_PATH_XTRA
 

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2008-02-03 23:09:46 UTC (rev 33716)
+++ trunk/base/configure	2008-02-03 23:12:47 UTC (rev 33717)
@@ -9349,7 +9349,25 @@
 
 
 # Check for X11 and paraphernalia
-{ echo "$as_me:$LINENO: checking for X" >&5
+
+
+        # work around symbolic X11 link in /usr/include by providing explicit defaults
+        case "$host" in
+            *-*-darwin9*)
+                if test "x$x_includes" = xNONE && test "x$x_libraries" = xNONE; then
+                    x_includes="/usr/X11/include"
+                    x_libraries="/usr/X11/lib"
+                fi
+                ;;
+            *-*-darwin*)
+                if test "x$x_includes" = xNONE && test "x$x_libraries" = xNONE; then
+                    x_includes="/usr/X11R6/include"
+                    x_libraries="/usr/X11R6/lib"
+                fi
+                ;;
+        esac
+
+	{ echo "$as_me:$LINENO: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6; }
 
 
@@ -9588,8 +9606,6 @@
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
 fi
 
-
-
 	if test "$no_x" = yes; then
   # Not all programs may use this symbol, but it does not hurt to define it.
 
@@ -10673,7 +10689,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lX11 -L/usr/X11R6/lib $X_LIBS $LIBS"
+LIBS="-lX11 $X_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080203/a30b5fb1/attachment.html