make/autoconf/lib-freetype.m4

rev 59383 : [mq]: final

*** 51,67 ****
  
      FREETYPE_LIB_NAME="${LIBRARY_PREFIX}${FREETYPE_BASE_NAME}${SHARED_LIBRARY_SUFFIX}"
      if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
        AC_MSG_NOTICE([Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location.])
        FOUND_FREETYPE=no
-     else
-       if test "x$OPENJDK_TARGET_OS" = "xsolaris" \
-           && test -s "$POTENTIAL_FREETYPE_LIB_PATH$OPENJDK_TARGET_CPU_ISADIR/$FREETYPE_LIB_NAME"; then
-         # Found lib in isa dir, use that instead.
-         POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH$OPENJDK_TARGET_CPU_ISADIR"
-         AC_MSG_NOTICE([Rewriting to use $POTENTIAL_FREETYPE_LIB_PATH instead])
-       fi
      fi
    fi
  
    if test "x$FOUND_FREETYPE" = "xyes"; then
      FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
--- 51,60 ----
*** 90,104 ****
    AC_ARG_WITH(freetype-lib, [AS_HELP_STRING([--with-freetype-lib],
        [specify directory for the freetype library])])
  
    # This setup is to verify access to system installed freetype header and
    # libraries. On Windows and MacOS this does not apply and using these options
!   # will report an error. On other platforms (Linux, Solaris), they will
!   # default to using the system libraries. If they are found automatically,
!   # nothing need be done. If they are not found, the configure
!   # "--with-freetype-*" options may be used to fix that. If the preference is
!   # to bundle on these platforms then use --with-freetype=bundled.
  
    FREETYPE_BASE_NAME=freetype
    FREETYPE_CFLAGS=
    FREETYPE_LIBS=
  
--- 83,97 ----
    AC_ARG_WITH(freetype-lib, [AS_HELP_STRING([--with-freetype-lib],
        [specify directory for the freetype library])])
  
    # This setup is to verify access to system installed freetype header and
    # libraries. On Windows and MacOS this does not apply and using these options
!   # will report an error. On other platforms they will default to using the
!   # system libraries. If they are found automatically, nothing need be done.
!   # If they are not found, the configure "--with-freetype-*" options may be
!   # used to fix that. If the preference is to bundle on these platforms then
!   # use --with-freetype=bundled.
  
    FREETYPE_BASE_NAME=freetype
    FREETYPE_CFLAGS=
    FREETYPE_LIBS=
  
*** 165,183 ****
            # Check modules using pkg-config, but only if we have it (ugly output
            # results otherwise)
            if test "x$PKG_CONFIG" != "x" ; then
              PKG_CHECK_MODULES(FREETYPE, freetype2, [FOUND_FREETYPE=yes], [FOUND_FREETYPE=no])
              if test "x$FOUND_FREETYPE" = "xyes" ; then
-               # On solaris, pkg_check adds -lz to freetype libs, which isn't
-               # necessary for us.
-               FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's/-lz//g'`
-               # 64-bit libs for Solaris x86 are installed in the amd64
-               # subdirectory, change lib to lib/amd64
-               if test "x$OPENJDK_TARGET_OS" = "xsolaris" && \
-                   test "x$OPENJDK_TARGET_CPU" = "xx86_64" ; then
-                 FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's?/lib?/lib/amd64?g'`
-               fi
                AC_MSG_CHECKING([for freetype])
                AC_MSG_RESULT([yes (using pkg-config)])
              fi
            fi
          fi
--- 158,167 ----