Ticket #57796: patch-csl-prefix.diff

cslbase/configure

@@ -4639 +4639 @@
 # that arise because they hand down options that lead to failures in
 # compilation of any sort at all are then THEIR job to resolve by providing
 # settings that are satisfactory.
-  CPPFLAGS="$CPPFLAGS -I/opt/local/include -I/opt/local/include/freetype2"
+  CPPFLAGS="$CPPFLAGS -I@PREFIX@/include -I@PREFIX@/include/freetype2"
   XLIBS="-lXext -lX11 -lXft -lfontconfig"
   macintosh_build="yes"
   darwin_build="yes"
@@ -24664 +24664 @@
 # configured for use without a GUI.
   if test "x$with_gui" = "xyes"
   then
-    LL=/opt/local/lib
+    LL=@PREFIX@/lib
     LIBS="$LL/libXrandr.a \
       $LL/libXcursor.a \
       $LL/libXrender.a \

cslbase/configure.ac

@@ -432 +432 @@
 # that arise because they hand down options that lead to failures in
 # compilation of any sort at all are then THEIR job to resolve by providing
 # settings that are satisfactory.
-  CPPFLAGS="$CPPFLAGS -I/opt/local/include -I/opt/local/include/freetype2"
+  CPPFLAGS="$CPPFLAGS -I@PREFIX@/include -I@PREFIX@/include/freetype2"
   XLIBS="-lXext -lX11 -lXft -lfontconfig"
   macintosh_build="yes"
   darwin_build="yes"
@@ -454 +454 @@
     CPPFLAGS="$CPPFLAGS -fno-common -I/usr/X11R6/include"
     DLL_CFLAGS="$CFLAGS -bundle -undefined suppress"
     AC_DEFINE(UNIX,[1],[True if we are running on Unix, Linux, BSD etc])
-    LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/opt/local/lib -L/opt/X11/lib"
+    LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L@PREFIX@/lib -L/opt/X11/lib"
     LDFLAGS="$LDFLAGS -framework Carbon -framework CoreServices -framework ApplicationServices"
   fi
   AC_CHECK_PROGS(REZ,[/usr/bin/Rez /Developer/tools/Rez],[Rez])
@@ -1552 +1552 @@
 # configured for use without a GUI.
   if test "x$with_gui" = "xyes"
   then
-    LL=/opt/local/lib
+    LL=@PREFIX@/lib
     LIBS="$LL/libXrandr.a \
       $LL/libXcursor.a \
       $LL/libXrender.a \
@@ -1582 +1582 @@
   else
 # This is to try to force linking against a system-provided version.
     LDFLAGS="-L/usr/lib -lcurses $LDFLAGS"
-    LL=/opt/local/lib
+    LL=@PREFIX@/lib
     LIBS="$LL/libz.a \
       $LL/libbz2.a \
       $LL/libiconv.a \

fox/configure

@@ -6139 +6139 @@
   *darwin*)
 # Ugh! With macports the autoconf recipe that establishes X11 paths
 # fails to include this one but it is needed!
-    CXXFLAGS="$CXXFLAGS -I/opt/local/include/freetype2"
+    CXXFLAGS="$CXXFLAGS -I@PREFIX@/include/freetype2"
   ;;
   *mingw32*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: host_os=$host_os so building for native Windows" >&5

fox/configure.ac

@@ -88 +88 @@
   *darwin*)
 # Ugh! With macports the autoconf recipe that establishes X11 paths
 # fails to include this one but it is needed!
-    CXXFLAGS="$CXXFLAGS -I/opt/local/include/freetype2"
+    CXXFLAGS="$CXXFLAGS -I@PREFIX@/include/freetype2"
   ;;
   *mingw32*)
     AC_MSG_NOTICE([host_os=$host_os so building for native Windows])

foxtests/configure

@@ -3908 +3908 @@
 
 $as_echo "#define UNIX 1" >>confdefs.h
 
-    LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/opt/local/lib -L/opt/X11/lib"
+    LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L@PREFIX@/lib -L/opt/X11/lib"
     LDFLAGS="$LDFLAGS -framework Carbon -framework CoreServices -framework ApplicationServices"
   fi
   ;;

foxtests/configure.ac

@@ -212 +212 @@
     CPPFLAGS="$CPPFLAGS -fno-common -I/usr/X11R6/include"
     DLL_CFLAGS="$CFLAGS -bundle -undefined suppress"
     AC_DEFINE(UNIX,[1],[True if we are running on Unix, Linux, BSD etc])
-    LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/opt/local/lib -L/opt/X11/lib"
+    LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L@PREFIX@/lib -L/opt/X11/lib"
     LDFLAGS="$LDFLAGS -framework Carbon -framework CoreServices -framework ApplicationServices"
   fi
   ;;