libs/gd/patches/100-configure_fix.patch

   1 --- a/configure
   2 +++ b/configure
   3 @@ -9454,21 +9454,6 @@
   4  shlibpath_overrides_runpath=unknown
   5  version_type=none
   6  dynamic_linker="$host_os ld.so"
   7 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
   8 -if test "$GCC" = yes; then
   9 -  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
  10 -  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
  11 -    # if the path contains ";" then we assume it to be the separator
  12 -    # otherwise default to the standard path separator (i.e. ":") - it is
  13 -    # assumed that no part of a normal pathname contains ";" but that should
  14 -    # okay in the real world where ";" in dirpaths is itself problematic.
  15 -    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  16 -  else
  17 -    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
  18 -  fi
  19 -else
  20 -  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
  21 -fi
  22  need_lib_prefix=unknown
  23  hardcode_into_libs=no
  24
  25 @@ -9816,12 +9801,6 @@
  26    # before this can be enabled.
  27    hardcode_into_libs=yes
  28
  29 -  # Append ld.so.conf contents to the search path
  30 -  if test -f /etc/ld.so.conf; then
  31 -    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
  32 -    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
  33 -  fi
  34 -
  35    # We used to test for /lib/ld.so.1 and disable shared libraries on
  36    # powerpc, because MkLinux only supported shared libraries with the
  37    # GNU dynamic linker.  Since this was broken with cross compilers,
  38 @@ -13364,21 +13343,6 @@
  39  shlibpath_overrides_runpath=unknown
  40  version_type=none
  41  dynamic_linker="$host_os ld.so"
  42 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
  43 -if test "$GCC" = yes; then
  44 -  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
  45 -  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
  46 -    # if the path contains ";" then we assume it to be the separator
  47 -    # otherwise default to the standard path separator (i.e. ":") - it is
  48 -    # assumed that no part of a normal pathname contains ";" but that should
  49 -    # okay in the real world where ";" in dirpaths is itself problematic.
  50 -    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  51 -  else
  52 -    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
  53 -  fi
  54 -else
  55 -  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
  56 -fi
  57  need_lib_prefix=unknown
  58  hardcode_into_libs=no
  59
  60 @@ -13726,12 +13690,6 @@
  61    # before this can be enabled.
  62    hardcode_into_libs=yes
  63
  64 -  # Append ld.so.conf contents to the search path
  65 -  if test -f /etc/ld.so.conf; then
  66 -    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
  67 -    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
  68 -  fi
  69 -
  70    # We used to test for /lib/ld.so.1 and disable shared libraries on
  71    # powerpc, because MkLinux only supported shared libraries with the
  72    # GNU dynamic linker.  Since this was broken with cross compilers,
  73 @@ -15936,21 +15894,6 @@
  74  shlibpath_overrides_runpath=unknown
  75  version_type=none
  76  dynamic_linker="$host_os ld.so"
  77 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
  78 -if test "$GCC" = yes; then
  79 -  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
  80 -  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
  81 -    # if the path contains ";" then we assume it to be the separator
  82 -    # otherwise default to the standard path separator (i.e. ":") - it is
  83 -    # assumed that no part of a normal pathname contains ";" but that should
  84 -    # okay in the real world where ";" in dirpaths is itself problematic.
  85 -    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  86 -  else
  87 -    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
  88 -  fi
  89 -else
  90 -  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
  91 -fi
  92  need_lib_prefix=unknown
  93  hardcode_into_libs=no
  94
  95 @@ -16298,12 +16241,6 @@
  96    # before this can be enabled.
  97    hardcode_into_libs=yes
  98
  99 -  # Append ld.so.conf contents to the search path
 100 -  if test -f /etc/ld.so.conf; then
 101 -    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 102 -    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 103 -  fi
 104 -
 105    # We used to test for /lib/ld.so.1 and disable shared libraries on
 106    # powerpc, because MkLinux only supported shared libraries with the
 107    # GNU dynamic linker.  Since this was broken with cross compilers,
 108 @@ -18515,21 +18452,6 @@
 109  shlibpath_overrides_runpath=unknown
 110  version_type=none
 111  dynamic_linker="$host_os ld.so"
 112 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
 113 -if test "$GCC" = yes; then
 114 -  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 115 -  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
 116 -    # if the path contains ";" then we assume it to be the separator
 117 -    # otherwise default to the standard path separator (i.e. ":") - it is
 118 -    # assumed that no part of a normal pathname contains ";" but that should
 119 -    # okay in the real world where ";" in dirpaths is itself problematic.
 120 -    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
 121 -  else
 122 -    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 123 -  fi
 124 -else
 125 -  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 126 -fi
 127  need_lib_prefix=unknown
 128  hardcode_into_libs=no
 129
 130 @@ -18877,12 +18799,6 @@
 131    # before this can be enabled.
 132    hardcode_into_libs=yes
 133
 134 -  # Append ld.so.conf contents to the search path
 135 -  if test -f /etc/ld.so.conf; then
 136 -    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 137 -    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 138 -  fi
 139 -
 140    # We used to test for /lib/ld.so.1 and disable shared libraries on
 141    # powerpc, because MkLinux only supported shared libraries with the
 142    # GNU dynamic linker.  Since this was broken with cross compilers,
 143 @@ -22026,14 +21942,14 @@
 144
 145
 146    if test -n "$LIBPNG12_CONFIG"; then
 147 -    libpng_CPPFLAGS=`libpng12-config --cflags`
 148 +    libpng_CPPFLAGS=`$LIBPNG12_CONFIG --cflags`
 149      # should be --ldopts, but it's currently broken
 150 -    libpng_LDFLAGS=`libpng12-config --ldflags`
 151 +    libpng_LDFLAGS=`$LIBPNG12_CONFIG --ldflags`
 152      libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[^ ][^ ]*//g'`
 153    elif test -n "$LIBPNG_CONFIG"; then
 154 -    libpng_CPPFLAGS=`libpng-config --cflags`
 155 +    libpng_CPPFLAGS=`$LIBPNG_CONFIG --cflags`
 156      # should be --ldopts, but it's currently broken
 157 -    libpng_LDFLAGS=`libpng-config --ldflags`
 158 +    libpng_LDFLAGS=`$LIBPNG_CONFIG --ldflags`
 159      libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[^ ][^ ]*//g'`
 160    elif test -d "$withval"; then
 161      libpng_CPPFLAGS="-I$withval/include"
 162 --- a/configure.ac
 163 +++ b/configure.ac
 164 @@ -61,7 +61,7 @@
 165  AC_HEADER_STDC
 166  AC_CHECK_HEADERS([errno.h limits.h stddef.h stdlib.h string.h unistd.h])
 167
 168 -AM_ICONV
 169 +m4_pattern_allow([AM_ICONV])
 170  # if test -n "$LIBICONV" ; then
 171  #   LIBS="$LIBS $LIBICONV"
 172  # fi