Ticket #57796: patch-csl-prefix.diff

File patch-csl-prefix.diff, 4.6 KB (added by mbrethen, 6 years ago)
  • cslbase/configure

    diff -ur csl.orig/cslbase/configure csl/cslbase/configure
    old new  
    46394639# that arise because they hand down options that lead to failures in
    46404640# compilation of any sort at all are then THEIR job to resolve by providing
    46414641# settings that are satisfactory.
    4642   CPPFLAGS="$CPPFLAGS -I/opt/local/include -I/opt/local/include/freetype2"
     4642  CPPFLAGS="$CPPFLAGS -I@PREFIX@/include -I@PREFIX@/include/freetype2"
    46434643  XLIBS="-lXext -lX11 -lXft -lfontconfig"
    46444644  macintosh_build="yes"
    46454645  darwin_build="yes"
     
    2466424664# configured for use without a GUI.
    2466524665  if test "x$with_gui" = "xyes"
    2466624666  then
    24667     LL=/opt/local/lib
     24667    LL=@PREFIX@/lib
    2466824668    LIBS="$LL/libXrandr.a \
    2466924669      $LL/libXcursor.a \
    2467024670      $LL/libXrender.a \
  • cslbase/configure.ac

    diff -ur csl.orig/cslbase/configure.ac csl/cslbase/configure.ac
    old new  
    432432# that arise because they hand down options that lead to failures in
    433433# compilation of any sort at all are then THEIR job to resolve by providing
    434434# settings that are satisfactory.
    435   CPPFLAGS="$CPPFLAGS -I/opt/local/include -I/opt/local/include/freetype2"
     435  CPPFLAGS="$CPPFLAGS -I@PREFIX@/include -I@PREFIX@/include/freetype2"
    436436  XLIBS="-lXext -lX11 -lXft -lfontconfig"
    437437  macintosh_build="yes"
    438438  darwin_build="yes"
     
    454454    CPPFLAGS="$CPPFLAGS -fno-common -I/usr/X11R6/include"
    455455    DLL_CFLAGS="$CFLAGS -bundle -undefined suppress"
    456456    AC_DEFINE(UNIX,[1],[True if we are running on Unix, Linux, BSD etc])
    457     LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/opt/local/lib -L/opt/X11/lib"
     457    LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L@PREFIX@/lib -L/opt/X11/lib"
    458458    LDFLAGS="$LDFLAGS -framework Carbon -framework CoreServices -framework ApplicationServices"
    459459  fi
    460460  AC_CHECK_PROGS(REZ,[/usr/bin/Rez /Developer/tools/Rez],[Rez])
     
    15521552# configured for use without a GUI.
    15531553  if test "x$with_gui" = "xyes"
    15541554  then
    1555     LL=/opt/local/lib
     1555    LL=@PREFIX@/lib
    15561556    LIBS="$LL/libXrandr.a \
    15571557      $LL/libXcursor.a \
    15581558      $LL/libXrender.a \
     
    15821582  else
    15831583# This is to try to force linking against a system-provided version.
    15841584    LDFLAGS="-L/usr/lib -lcurses $LDFLAGS"
    1585     LL=/opt/local/lib
     1585    LL=@PREFIX@/lib
    15861586    LIBS="$LL/libz.a \
    15871587      $LL/libbz2.a \
    15881588      $LL/libiconv.a \
  • fox/configure

    diff -ur csl.orig/fox/configure csl/fox/configure
    old new  
    61396139  *darwin*)
    61406140# Ugh! With macports the autoconf recipe that establishes X11 paths
    61416141# fails to include this one but it is needed!
    6142     CXXFLAGS="$CXXFLAGS -I/opt/local/include/freetype2"
     6142    CXXFLAGS="$CXXFLAGS -I@PREFIX@/include/freetype2"
    61436143  ;;
    61446144  *mingw32*)
    61456145    { $as_echo "$as_me:${as_lineno-$LINENO}: host_os=$host_os so building for native Windows" >&5
  • fox/configure.ac

    diff -ur csl.orig/fox/configure.ac csl/fox/configure.ac
    old new  
    8888  *darwin*)
    8989# Ugh! With macports the autoconf recipe that establishes X11 paths
    9090# fails to include this one but it is needed!
    91     CXXFLAGS="$CXXFLAGS -I/opt/local/include/freetype2"
     91    CXXFLAGS="$CXXFLAGS -I@PREFIX@/include/freetype2"
    9292  ;;
    9393  *mingw32*)
    9494    AC_MSG_NOTICE([host_os=$host_os so building for native Windows])
  • foxtests/configure

    diff -ur csl.orig/foxtests/configure csl/foxtests/configure
    old new  
    39083908
    39093909$as_echo "#define UNIX 1" >>confdefs.h
    39103910
    3911     LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/opt/local/lib -L/opt/X11/lib"
     3911    LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L@PREFIX@/lib -L/opt/X11/lib"
    39123912    LDFLAGS="$LDFLAGS -framework Carbon -framework CoreServices -framework ApplicationServices"
    39133913  fi
    39143914  ;;
  • foxtests/configure.ac

    diff -ur csl.orig/foxtests/configure.ac csl/foxtests/configure.ac
    old new  
    212212    CPPFLAGS="$CPPFLAGS -fno-common -I/usr/X11R6/include"
    213213    DLL_CFLAGS="$CFLAGS -bundle -undefined suppress"
    214214    AC_DEFINE(UNIX,[1],[True if we are running on Unix, Linux, BSD etc])
    215     LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/opt/local/lib -L/opt/X11/lib"
     215    LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L@PREFIX@/lib -L/opt/X11/lib"
    216216    LDFLAGS="$LDFLAGS -framework Carbon -framework CoreServices -framework ApplicationServices"
    217217  fi
    218218  ;;