| 1 | --- pkg-config-0.25.orig/glib-1.2.10/configure 2010-05-09 07:18:10.000000000 +0000 |
| 2 | +++ pkg-config-0.25/glib-1.2.10/configure 2011-03-16 08:37:21.000000000 +0000 |
| 3 | @@ -12188,56 +12188,9 @@ |
| 4 | |
| 5 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra flags to get ANSI library prototypes" >&5 |
| 6 | $as_echo_n "checking for extra flags to get ANSI library prototypes... " >&6; } |
| 7 | -glib_save_LIBS=$LIBS |
| 8 | -LIBS="$LIBS -lm" |
| 9 | -if test "$cross_compiling" = yes; then : |
| 10 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 11 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 12 | -as_fn_error "cannot run test program while cross compiling |
| 13 | -See \`config.log' for more details." "$LINENO" 5; } |
| 14 | -else |
| 15 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 16 | -/* end confdefs.h. */ |
| 17 | -#include <math.h> |
| 18 | - int main (void) { return (log(1) != log(1.)); } |
| 19 | -_ACEOF |
| 20 | -if ac_fn_c_try_run "$LINENO"; then : |
| 21 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 |
| 22 | -$as_echo "none needed" >&6; } |
| 23 | -else |
| 24 | - glib_save_CFLAGS=$CFLAGS |
| 25 | - CFLAGS="$CFLAGS -std1" |
| 26 | - if test "$cross_compiling" = yes; then : |
| 27 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 28 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 29 | -as_fn_error "cannot run test program while cross compiling |
| 30 | -See \`config.log' for more details." "$LINENO" 5; } |
| 31 | -else |
| 32 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 33 | -/* end confdefs.h. */ |
| 34 | -#include <math.h> |
| 35 | - int main (void) { return (log(1) != log(1.)); } |
| 36 | -_ACEOF |
| 37 | -if ac_fn_c_try_run "$LINENO"; then : |
| 38 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -std1" >&5 |
| 39 | -$as_echo "-std1" >&6; } |
| 40 | -else |
| 41 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 |
| 42 | -$as_echo "" >&6; } |
| 43 | - CFLAGS=$glib_save_CFLAGS |
| 44 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5 |
| 45 | -$as_echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;} |
| 46 | |
| 47 | -fi |
| 48 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ |
| 49 | - conftest.$ac_objext conftest.beam conftest.$ac_ext |
| 50 | -fi |
| 51 | - |
| 52 | - |
| 53 | -fi |
| 54 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ |
| 55 | - conftest.$ac_objext conftest.beam conftest.$ac_ext |
| 56 | -fi |
| 57 | +glib_save_LIBS="$LIBS -lm" |
| 58 | +glib_save_CFLAGS="$CFLAGS -std1" |
| 59 | |
| 60 | LIBS=$glib_save_LIBS |
| 61 | |
| 62 | @@ -12719,7 +12672,7 @@ |
| 63 | |
| 64 | fi |
| 65 | |
| 66 | - |
| 67 | +glib_cv_has__inline=yes |
| 68 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __inline" >&5 |
| 69 | $as_echo_n "checking for __inline... " >&6; } |
| 70 | if test "${glib_cv_has__inline+set}" = set; then : |
| 71 | @@ -12759,6 +12712,7 @@ |
| 72 | xyes) $as_echo "#define G_HAVE___INLINE 1" >>confdefs.h |
| 73 | |
| 74 | esac |
| 75 | +glib_cv_has__inline=yes |
| 76 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __inline__" >&5 |
| 77 | $as_echo_n "checking for __inline__... " >&6; } |
| 78 | if test "${glib_cv_has__inline__+set}" = set; then : |
| 79 | @@ -12766,10 +12720,6 @@ |
| 80 | else |
| 81 | |
| 82 | if test "$cross_compiling" = yes; then : |
| 83 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 84 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 85 | -as_fn_error "cannot run test program while cross compiling |
| 86 | -See \`config.log' for more details." "$LINENO" 5; } |
| 87 | else |
| 88 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 89 | /* end confdefs.h. */ |
| 90 | @@ -12798,6 +12748,7 @@ |
| 91 | xyes) $as_echo "#define G_HAVE___INLINE__ 1" >>confdefs.h |
| 92 | |
| 93 | esac |
| 94 | +glib_cv_hasinline=yes |
| 95 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 |
| 96 | $as_echo_n "checking for inline... " >&6; } |
| 97 | if test "${glib_cv_hasinline+set}" = set; then : |
| 98 | @@ -13493,6 +13444,7 @@ |
| 99 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glib_working_wctype" >&5 |
| 100 | $as_echo "$glib_working_wctype" >&6; } |
| 101 | |
| 102 | +glib_cv_sane_realloc=yes |
| 103 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether realloc (NULL,) will work" >&5 |
| 104 | $as_echo_n "checking whether realloc (NULL,) will work... " >&6; } |
| 105 | if test "${glib_cv_sane_realloc+set}" = set; then : |
| 106 | @@ -13534,7 +13486,7 @@ |
| 107 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glib_cv_sane_realloc" >&5 |
| 108 | $as_echo "$glib_cv_sane_realloc" >&6; } |
| 109 | |
| 110 | - |
| 111 | +glib_cv_va_copy=no |
| 112 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an implementation of va_copy()" >&5 |
| 113 | $as_echo_n "checking for an implementation of va_copy()... " >&6; } |
| 114 | if test "${glib_cv_va_copy+set}" = set; then : |
| 115 | @@ -13587,10 +13539,6 @@ |
| 116 | else |
| 117 | |
| 118 | if test "$cross_compiling" = yes; then : |
| 119 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 120 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 121 | -as_fn_error "cannot run test program while cross compiling |
| 122 | -See \`config.log' for more details." "$LINENO" 5; } |
| 123 | else |
| 124 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 125 | /* end confdefs.h. */ |
| 126 | @@ -13625,6 +13573,7 @@ |
| 127 | |
| 128 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glib_cv___va_copy" >&5 |
| 129 | $as_echo "$glib_cv___va_copy" >&6; } |
| 130 | +glib_cv_va_val_copy=yes |
| 131 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether va_lists can be copied by value" >&5 |
| 132 | $as_echo_n "checking whether va_lists can be copied by value... " >&6; } |
| 133 | if test "${glib_cv_va_val_copy+set}" = set; then : |
| 134 | @@ -13893,6 +13842,7 @@ |
| 135 | LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" |
| 136 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTLD_GLOBAL brokenness" >&5 |
| 137 | $as_echo_n "checking for RTLD_GLOBAL brokenness... " >&6; } |
| 138 | +glib_cv_rtldglobal_broken=no |
| 139 | if test "${glib_cv_rtldglobal_broken+set}" = set; then : |
| 140 | $as_echo_n "(cached) " >&6 |
| 141 | else |
| 142 | @@ -13942,6 +13892,7 @@ |
| 143 | else |
| 144 | G_MODULE_BROKEN_RTLD_GLOBAL=0 |
| 145 | fi |
| 146 | + glib_cv_uscore=yes |
| 147 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for preceeding underscore in symbols" >&5 |
| 148 | $as_echo_n "checking for preceeding underscore in symbols... " >&6; } |
| 149 | if test "${glib_cv_uscore+set}" = set; then : |
| 150 | @@ -14626,6 +14577,7 @@ |
| 151 | |
| 152 | if test "$ac_cv_header_pwd_h" = "yes"; then |
| 153 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpwuid_r" >&5 |
| 154 | +ac_cv_func_getpwuid_r=yes |
| 155 | $as_echo_n "checking for getpwuid_r... " >&6; } |
| 156 | if test "${ac_cv_func_getpwuid_r+set}" = set; then : |
| 157 | $as_echo_n "(cached) " >&6 |
| 158 | @@ -14727,11 +14679,7 @@ |
| 159 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_mutex_trylock is posix like" >&5 |
| 160 | $as_echo_n "checking whether pthread_mutex_trylock is posix like... " >&6; } |
| 161 | # DCE Threads return 1 as success, posix 0. what a mess. |
| 162 | - if test "$cross_compiling" = yes; then : |
| 163 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 164 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 165 | -as_fn_error "cannot run test program while cross compiling |
| 166 | -See \`config.log' for more details." "$LINENO" 5; } |
| 167 | + if test "$cross_compiling" = Xyes; then : |
| 168 | else |
| 169 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 170 | /* end confdefs.h. */ |
| 171 | @@ -14756,11 +14704,7 @@ |
| 172 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_cond_timedwait is posix like" >&5 |
| 173 | $as_echo_n "checking whether pthread_cond_timedwait is posix like... " >&6; } |
| 174 | # DCE Threads return -1 as failure, posix ETIMEDOUT. |
| 175 | - if test "$cross_compiling" = yes; then : |
| 176 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 177 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 178 | -as_fn_error "cannot run test program while cross compiling |
| 179 | -See \`config.log' for more details." "$LINENO" 5; } |
| 180 | + if test "$cross_compiling" = Xyes; then : |
| 181 | else |
| 182 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 183 | /* end confdefs.h. */ |
| 184 | @@ -14821,14 +14765,11 @@ |
| 185 | "yes") |
| 186 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of $mutex_default_type" >&5 |
| 187 | $as_echo_n "checking size of $mutex_default_type... " >&6; } |
| 188 | +glib_cv_sizeof_gmutex=0 |
| 189 | if test "${glib_cv_sizeof_gmutex+set}" = set; then : |
| 190 | $as_echo_n "(cached) " >&6 |
| 191 | else |
| 192 | - if test "$cross_compiling" = yes; then : |
| 193 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 194 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 195 | -as_fn_error "cannot run test program while cross compiling |
| 196 | -See \`config.log' for more details." "$LINENO" 5; } |
| 197 | + if test "$cross_compiling" = Xyes; then : |
| 198 | else |
| 199 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 200 | /* end confdefs.h. */ |
| 201 | @@ -14941,11 +14882,7 @@ |
| 202 | echo "#endif" >>confrun.c |
| 203 | done |
| 204 | echo "return 0; }" >>confrun.c |
| 205 | -if test "$cross_compiling" = yes; then : |
| 206 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 207 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 208 | -as_fn_error "cannot run test program while cross compiling |
| 209 | -See \`config.log' for more details." "$LINENO" 5; } |
| 210 | +if test "$cross_compiling" = Xyes; then : |
| 211 | else |
| 212 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 213 | /* end confdefs.h. */ |