| 1 | diff -purN pkg-config-0.23.orig/glib-1.2.10/configure pkg-config-0.23/glib-1.2.10/configure |
| 2 | --- pkg-config-0.23.orig/glib-1.2.10/configure 2009-11-30 14:46:09.000000000 +0100 |
| 3 | +++ pkg-config-0.23/glib-1.2.10/configure 2009-11-30 15:28:03.000000000 +0100 |
| 4 | @@ -20566,11 +20566,7 @@ echo $ECHO_N "checking for extra flags t |
| 5 | glib_save_LIBS=$LIBS |
| 6 | LIBS="$LIBS -lm" |
| 7 | if test "$cross_compiling" = yes; then |
| 8 | - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
| 9 | -See \`config.log' for more details." >&5 |
| 10 | -echo "$as_me: error: cannot run test program while cross compiling |
| 11 | -See \`config.log' for more details." >&2;} |
| 12 | - { (exit 1); exit 1; }; } |
| 13 | + LIBS="$LIBS -lm" |
| 14 | else |
| 15 | cat >conftest.$ac_ext <<_ACEOF |
| 16 | /* confdefs.h. */ |
| 17 | @@ -20612,11 +20608,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 |
| 18 | glib_save_CFLAGS=$CFLAGS |
| 19 | CFLAGS="$CFLAGS -std1" |
| 20 | if test "$cross_compiling" = yes; then |
| 21 | - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
| 22 | -See \`config.log' for more details." >&5 |
| 23 | -echo "$as_me: error: cannot run test program while cross compiling |
| 24 | -See \`config.log' for more details." >&2;} |
| 25 | - { (exit 1); exit 1; }; } |
| 26 | + CFLAGS="$glib_save_CFLAGS" |
| 27 | else |
| 28 | cat >conftest.$ac_ext <<_ACEOF |
| 29 | /* confdefs.h. */ |
| 30 | @@ -23769,11 +23761,7 @@ if test "${glib_cv_has__inline+set}" = s |
| 31 | else |
| 32 | |
| 33 | if test "$cross_compiling" = yes; then |
| 34 | - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
| 35 | -See \`config.log' for more details." >&5 |
| 36 | -echo "$as_me: error: cannot run test program while cross compiling |
| 37 | -See \`config.log' for more details." >&2;} |
| 38 | - { (exit 1); exit 1; }; } |
| 39 | + glib_cv_has__inline=yes |
| 40 | else |
| 41 | cat >conftest.$ac_ext <<_ACEOF |
| 42 | /* confdefs.h. */ |
| 43 | @@ -23839,11 +23827,7 @@ if test "${glib_cv_has__inline__+set}" = |
| 44 | else |
| 45 | |
| 46 | if test "$cross_compiling" = yes; then |
| 47 | - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
| 48 | -See \`config.log' for more details." >&5 |
| 49 | -echo "$as_me: error: cannot run test program while cross compiling |
| 50 | -See \`config.log' for more details." >&2;} |
| 51 | - { (exit 1); exit 1; }; } |
| 52 | + glib_cv_has__inline__=yes |
| 53 | else |
| 54 | cat >conftest.$ac_ext <<_ACEOF |
| 55 | /* confdefs.h. */ |
| 56 | @@ -23909,11 +23893,7 @@ if test "${glib_cv_hasinline+set}" = set |
| 57 | else |
| 58 | |
| 59 | if test "$cross_compiling" = yes; then |
| 60 | - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
| 61 | -See \`config.log' for more details." >&5 |
| 62 | -echo "$as_me: error: cannot run test program while cross compiling |
| 63 | -See \`config.log' for more details." >&2;} |
| 64 | - { (exit 1); exit 1; }; } |
| 65 | + glib_cv_hasinline=yes |
| 66 | else |
| 67 | cat >conftest.$ac_ext <<_ACEOF |
| 68 | /* confdefs.h. */ |
| 69 | @@ -26330,11 +26310,7 @@ if test "${glib_cv_sane_realloc+set}" = |
| 70 | else |
| 71 | |
| 72 | if test "$cross_compiling" = yes; then |
| 73 | - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
| 74 | -See \`config.log' for more details." >&5 |
| 75 | -echo "$as_me: error: cannot run test program while cross compiling |
| 76 | -See \`config.log' for more details." >&2;} |
| 77 | - { (exit 1); exit 1; }; } |
| 78 | + glib_cv_sane_realloc=yes |
| 79 | else |
| 80 | cat >conftest.$ac_ext <<_ACEOF |
| 81 | /* confdefs.h. */ |
| 82 | @@ -26403,11 +26379,7 @@ if test "${glib_cv_va_copy+set}" = set; |
| 83 | else |
| 84 | |
| 85 | if test "$cross_compiling" = yes; then |
| 86 | - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
| 87 | -See \`config.log' for more details." >&5 |
| 88 | -echo "$as_me: error: cannot run test program while cross compiling |
| 89 | -See \`config.log' for more details." >&2;} |
| 90 | - { (exit 1); exit 1; }; } |
| 91 | + glib_cv_va_copy=yes |
| 92 | else |
| 93 | cat >conftest.$ac_ext <<_ACEOF |
| 94 | /* confdefs.h. */ |
| 95 | @@ -26477,11 +26449,7 @@ if test "${glib_cv___va_copy+set}" = set |
| 96 | else |
| 97 | |
| 98 | if test "$cross_compiling" = yes; then |
| 99 | - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
| 100 | -See \`config.log' for more details." >&5 |
| 101 | -echo "$as_me: error: cannot run test program while cross compiling |
| 102 | -See \`config.log' for more details." >&2;} |
| 103 | - { (exit 1); exit 1; }; } |
| 104 | + glib_cv___va_copy=yes |
| 105 | else |
| 106 | cat >conftest.$ac_ext <<_ACEOF |
| 107 | /* confdefs.h. */ |
| 108 | @@ -26551,11 +26519,7 @@ if test "${glib_cv_va_val_copy+set}" = s |
| 109 | else |
| 110 | |
| 111 | if test "$cross_compiling" = yes; then |
| 112 | - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
| 113 | -See \`config.log' for more details." >&5 |
| 114 | -echo "$as_me: error: cannot run test program while cross compiling |
| 115 | -See \`config.log' for more details." >&2;} |
| 116 | - { (exit 1); exit 1; }; } |
| 117 | + glib_cv_va_val_copy=yes |
| 118 | else |
| 119 | cat >conftest.$ac_ext <<_ACEOF |
| 120 | /* confdefs.h. */ |
| 121 | @@ -27137,11 +27101,7 @@ if test "${glib_cv_rtldglobal_broken+set |
| 122 | else |
| 123 | |
| 124 | if test "$cross_compiling" = yes; then |
| 125 | - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
| 126 | -See \`config.log' for more details." >&5 |
| 127 | -echo "$as_me: error: cannot run test program while cross compiling |
| 128 | -See \`config.log' for more details." >&2;} |
| 129 | - { (exit 1); exit 1; }; } |
| 130 | + glib_cv_rtldglobal_broken=yes |
| 131 | else |
| 132 | cat >conftest.$ac_ext <<_ACEOF |
| 133 | /* confdefs.h. */ |
| 134 | @@ -27217,11 +27177,7 @@ echo $ECHO_N "checking for preceeding un |
| 135 | else |
| 136 | |
| 137 | if test "$cross_compiling" = yes; then |
| 138 | - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
| 139 | -See \`config.log' for more details." >&5 |
| 140 | -echo "$as_me: error: cannot run test program while cross compiling |
| 141 | -See \`config.log' for more details." >&2;} |
| 142 | - { (exit 1); exit 1; }; } |
| 143 | + glib_cv_uscore=yes |
| 144 | else |
| 145 | cat >conftest.$ac_ext <<_ACEOF |
| 146 | /* confdefs.h. */ |
| 147 | @@ -28550,11 +28506,7 @@ echo $ECHO_N "checking for getpwuid_r... |
| 148 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 149 | else |
| 150 | if test "$cross_compiling" = yes; then |
| 151 | - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
| 152 | -See \`config.log' for more details." >&5 |
| 153 | -echo "$as_me: error: cannot run test program while cross compiling |
| 154 | -See \`config.log' for more details." >&2;} |
| 155 | - { (exit 1); exit 1; }; } |
| 156 | + ac_cv_func_getpwuid_r=yes |
| 157 | else |
| 158 | cat >conftest.$ac_ext <<_ACEOF |
| 159 | /* confdefs.h. */ |
| 160 | @@ -28730,11 +28682,7 @@ rm -f core conftest.err conftest.$ac_obj |
| 161 | echo $ECHO_N "checking whether pthread_mutex_trylock is posix like... $ECHO_C" >&6; } |
| 162 | # DCE Threads return 1 as success, posix 0. what a mess. |
| 163 | if test "$cross_compiling" = yes; then |
| 164 | - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
| 165 | -See \`config.log' for more details." >&5 |
| 166 | -echo "$as_me: error: cannot run test program while cross compiling |
| 167 | -See \`config.log' for more details." >&2;} |
| 168 | - { (exit 1); exit 1; }; } |
| 169 | + echo |
| 170 | else |
| 171 | cat >conftest.$ac_ext <<_ACEOF |
| 172 | /* confdefs.h. */ |
| 173 | @@ -28790,11 +28738,7 @@ fi |
| 174 | echo $ECHO_N "checking whether pthread_cond_timedwait is posix like... $ECHO_C" >&6; } |
| 175 | # DCE Threads return -1 as failure, posix ETIMEDOUT. |
| 176 | if test "$cross_compiling" = yes; then |
| 177 | - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
| 178 | -See \`config.log' for more details." >&5 |
| 179 | -echo "$as_me: error: cannot run test program while cross compiling |
| 180 | -See \`config.log' for more details." >&2;} |
| 181 | - { (exit 1); exit 1; }; } |
| 182 | + echo |
| 183 | else |
| 184 | cat >conftest.$ac_ext <<_ACEOF |
| 185 | /* confdefs.h. */ |
| 186 | @@ -28889,11 +28833,7 @@ if test "${glib_cv_sizeof_gmutex+set}" = |
| 187 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 188 | else |
| 189 | if test "$cross_compiling" = yes; then |
| 190 | - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
| 191 | -See \`config.log' for more details." >&5 |
| 192 | -echo "$as_me: error: cannot run test program while cross compiling |
| 193 | -See \`config.log' for more details." >&2;} |
| 194 | - { (exit 1); exit 1; }; } |
| 195 | + glib_cv_sizeof_gmutex=0 |
| 196 | else |
| 197 | cat >conftest.$ac_ext <<_ACEOF |
| 198 | /* confdefs.h. */ |
| 199 | @@ -29063,11 +29003,7 @@ for glib_sysdef_input in POLLIN:1 POLLOU |
| 200 | done |
| 201 | echo "return 0; }" >>confrun.c |
| 202 | if test "$cross_compiling" = yes; then |
| 203 | - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
| 204 | -See \`config.log' for more details." >&5 |
| 205 | -echo "$as_me: error: cannot run test program while cross compiling |
| 206 | -See \`config.log' for more details." >&2;} |
| 207 | - { (exit 1); exit 1; }; } |
| 208 | + echo |
| 209 | else |
| 210 | cat >conftest.$ac_ext <<_ACEOF |
| 211 | /* confdefs.h. */ |