x11/tk83/patches/patch-ac

   1 $NetBSD: patch-ac,v 1.4 2005/11/05 03:27:56 rillig Exp $
   2
   3 --- unix/tcl.m4.orig    2001-10-20 00:24:40.000000000 +0000
   4 +++ unix/tcl.m4
   5 @@ -602,6 +602,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
   6
   7      do64bit_ok=no
   8      fullSrcDir=`cd $srcdir; pwd`
   9 +    RPATH_FLAG=""
  10      EXTRA_CFLAGS=""
  11      TCL_EXPORT_FILE_SUFFIX=""
  12      UNSHARED_LIB_SUFFIX=""
  13 @@ -791,8 +792,11 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  14             LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  15             EXTRA_CFLAGS=""
  16             LDFLAGS=""
  17 +            SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  18 +            UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  19 +            TCL_LIB_VERSIONS_OK=nodots
  20             ;;
  21 -       IRIX-6.*|IRIX64-6.5*)
  22 +       IRIX-6.*)
  23             SHLIB_CFLAGS=""
  24             SHLIB_LD="ld -n32 -shared -rdata_shared"
  25             SHLIB_LD_LIBS='${LIBS}'
  26 @@ -815,6 +819,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  27                 esac
  28                 LDFLAGS="-n32"
  29             fi
  30 +            SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  31 +            UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  32 +            TCL_LIB_VERSIONS_OK=nodots
  33             ;;
  34         IRIX64-6.*)
  35             SHLIB_CFLAGS=""
  36 @@ -825,6 +832,15 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  37             DL_LIBS=""
  38             LDFLAGS=""
  39             LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  40 +            SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  41 +            UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  42 +            TCL_LIB_VERSIONS_OK=nodots
  43 +
  44 +           # Check to enable 64-bit flags for compiler/linker
  45 +            if test "${ABI}" = "64" ; then
  46 +                SHLIB_LD="ld -64 -shared -rdata_shared"
  47 +                LDFLAGS="$LDFLAGS -64"
  48 +            fi
  49             ;;
  50         Linux*)
  51             SHLIB_CFLAGS="-fPIC"
  52 @@ -915,7 +931,6 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  53             AC_CHECK_HEADER(dlfcn.h, [
  54                 # NetBSD/SPARC needs -fPIC, -fpic will not do.
  55                 SHLIB_CFLAGS="-fPIC"
  56 -               SHLIB_LD="ld -Bshareable -x"
  57                 SHLIB_LD_LIBS=""
  58                 SHLIB_SUFFIX=".so"
  59                 DL_OBJS="tclLoadDl.o"
  60 @@ -927,11 +942,19 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  61  #ifdef __ELF__
  62         yes
  63  #endif
  64 -               ],
  65 +               ], [
  66                     AC_MSG_RESULT(yes)
  67 -                   SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so',
  68 +                   SHLIB_LD='${TCL_CC} -shared -Wl,-x'
  69 +                   RPATH_FLAG='-Wl,-R'
  70 +                   LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
  71 +                   SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  72 +               ], [
  73                     AC_MSG_RESULT(no)
  74 +                   SHLIB_LD="ld -Bshareable -x"
  75 +                   RPATH_FLAG='-R'
  76 +                   LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
  77                     SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
  78 +               ]
  79                 )
  80             ], [
  81                 SHLIB_CFLAGS=""
  82 @@ -950,7 +973,7 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  83             UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  84             TCL_LIB_VERSIONS_OK=nodots
  85             ;;
  86 -       FreeBSD-*)
  87 +       FreeBSD-*|DragonFly-*)
  88             # FreeBSD 3.* and greater have ELF.
  89             SHLIB_CFLAGS="-fPIC"
  90             SHLIB_LD="ld -Bshareable -x"
  91 @@ -1130,6 +1153,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  92             DL_LIBS="-ldl"
  93             LDFLAGS=""
  94             LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
  95 +           SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  96 +           UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  97 +           TCL_LIB_VERSIONS_OK=nodots
  98             ;;
  99         SunOS-5*)
 100
 101 @@ -1174,6 +1200,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
 102             else
 103                 LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
 104             fi
 105 +           SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
 106 +           UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 107 +           TCL_LIB_VERSIONS_OK=nodots
 108             ;;
 109         ULTRIX-4.*)
 110             SHLIB_CFLAGS="-G 0"
 111 @@ -1329,7 +1358,7 @@ dnl AC_CHECK_TOOL(AR, ar, :)
 112                     ;;
 113                 IRIX*)
 114                     ;;
 115 -               NetBSD-*|FreeBSD-*|OpenBSD-*)
 116 +               NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*)
 117                     ;;
 118                 Rhapsody-*|Darwin-*)
 119                     ;;
 120 @@ -1652,7 +1681,11 @@ AC_DEFUN(SC_PATH_X, [
 121         for i in $dirs ; do
 122             if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
 123                 AC_MSG_RESULT($i)
 124 +               if test "${RPATH_FLAG}" != ""; then
 125 +                   XLIBSW="-L$i ${RPATH_FLAG}$i -lX11"
 126 +               else
 127                 XLIBSW="-L$i -lX11"
 128 +               fi
 129                 x_libraries="$i"
 130                 break
 131             fi
 132 @@ -1661,7 +1694,11 @@ AC_DEFUN(SC_PATH_X, [
 133         if test "$x_libraries" = ""; then
 134             XLIBSW=-lX11
 135         else
 136 +           if test "${RPATH_FLAG}" != ""; then
 137 +               XLIBSW="-L$x_libraries ${RPATH_FLAG}$x_libraries -lX11"
 138 +           else
 139             XLIBSW="-L$x_libraries -lX11"
 140 +           fi
 141         fi
 142      fi
 143      if test "$XLIBSW" = nope ; then