| 1 | | --- configure.orig 2009-12-30 17:56:37.000000000 -0600 |
| 2 | | +++ configure 2010-11-19 17:09:55.000000000 -0600 |
| 3 | | @@ -3080,66 +3080,6 @@ |
| 4 | | # mymakefile="Makefile.aix" |
| 5 | | ;; |
| 6 | | *apple-darwin*) |
| 7 | | - { echo "$as_me:$LINENO: checking for which Mac OSX -arch flags are supported" >&5 |
| 8 | | -echo $ECHO_N "checking for which Mac OSX -arch flags are supported... $ECHO_C" >&6; } |
| 9 | | -valid_arch_flags="" |
| 10 | | -found_arch_flags="" |
| 11 | | -arch_flags="ppc ppc64 x86_64 i386" |
| 12 | | -for a in $arch_flags; do |
| 13 | | - save_ldflags="$LDFLAGS" |
| 14 | | - LDFLAGS="$LDFLAGS -arch $a" |
| 15 | | - cat >conftest.$ac_ext <<_ACEOF |
| 16 | | -/* confdefs.h. */ |
| 17 | | -_ACEOF |
| 18 | | -cat confdefs.h >>conftest.$ac_ext |
| 19 | | -cat >>conftest.$ac_ext <<_ACEOF |
| 20 | | -/* end confdefs.h. */ |
| 21 | | -#include <stdio.h> |
| 22 | | -int |
| 23 | | -main () |
| 24 | | -{ |
| 25 | | -exit(0) |
| 26 | | - ; |
| 27 | | - return 0; |
| 28 | | -} |
| 29 | | -_ACEOF |
| 30 | | -rm -f conftest.$ac_objext conftest$ac_exeext |
| 31 | | -if { (ac_try="$ac_link" |
| 32 | | -case "(($ac_try" in |
| 33 | | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 34 | | - *) ac_try_echo=$ac_try;; |
| 35 | | -esac |
| 36 | | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 37 | | - (eval "$ac_link") 2>conftest.er1 |
| 38 | | - ac_status=$? |
| 39 | | - grep -v '^ *+' conftest.er1 >conftest.err |
| 40 | | - rm -f conftest.er1 |
| 41 | | - cat conftest.err >&5 |
| 42 | | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 43 | | - (exit $ac_status); } && { |
| 44 | | - test -z "$ac_c_werror_flag" || |
| 45 | | - test ! -s conftest.err |
| 46 | | - } && test -s conftest$ac_exeext && |
| 47 | | - $as_test_x conftest$ac_exeext; then |
| 48 | | - valid_arch_flags="$valid_arch_flags -arch $a";found_arch_flags="$found_arch_flags $a" |
| 49 | | -else |
| 50 | | - echo "$as_me: failed program was:" >&5 |
| 51 | | -sed 's/^/| /' conftest.$ac_ext >&5 |
| 52 | | - |
| 53 | | - a="$a" |
| 54 | | - |
| 55 | | -fi |
| 56 | | - |
| 57 | | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 58 | | - conftest$ac_exeext conftest.$ac_ext |
| 59 | | - LDFLAGS="$save_ldflags" |
| 60 | | -done |
| 61 | | -{ echo "$as_me:$LINENO: result: $found_arch_flags" >&5 |
| 62 | | -echo "${ECHO_T}$found_arch_flags" >&6; } |
| 63 | | - |
| 64 | | - |
| 65 | | - SYS_DEFS="$valid_arch_flags" |
| 66 | | - EEXTRA="$valid_arch_flags" |
| 67 | | ;; |
| 68 | | *dec-osf*) |
| 69 | | ;; |
| 70 | | @@ -9574,10 +9514,9 @@ |
| 71 | | # |
| 72 | | # MH LD_RXLIB_A1="${CC} -bundle -flat_namespace -undefined suppress -o \$(@)" |
| 73 | | # MH LD_RXLIB_A2="${CC} -bundle -flat_namespace -undefined suppress -o \$(@)" |
| 74 | | - EEXTRA="$valid_arch_flags" |
| 75 | | - LD_RXLIB_A1="${CC} ${EEXTRA} -dynamiclib ${LDFLAGS} -o \$(@)" |
| 76 | | - LD_RXLIB_A2="${CC} ${EEXTRA} -dynamiclib ${LDFLAGS} -o \$(@)" |
| 77 | | - LD_RXLIB_UTILA="${CC} ${EEXTRA} -dynamiclib ${LDFLAGS} -o \$(@)" |
| 78 | | + LD_RXLIB_A1="${CC} ${EEXTRA} -dynamiclib ${LDFLAGS} -install_name ${libdir}/\$(@) -o \$(@)" |
| 79 | | + LD_RXLIB_A2="${CC} ${EEXTRA} -dynamiclib ${LDFLAGS} -install_name ${libdir}/\$(@) -o \$(@)" |
| 80 | | + LD_RXLIB_UTILA="${CC} ${EEXTRA} -dynamiclib ${LDFLAGS} -install_name ${libdir}/\$(@) -o \$(@)" |
| 81 | | LD_RXLIB_B1="-L. -l${SHLFILE} -lc \$(SHLIBS)" |
| 82 | | LD_RXLIB_B2="-L. -l${SHLFILE} -lc \$(SHLIBS)" |
| 83 | | LD_RXLIB_UTILB="-L. -l${SHLFILE} -lc \$(SHLIBS)" |
| 84 | | @@ -9585,7 +9524,7 @@ |
| 85 | | SHLPRE="lib" |
| 86 | | # MH BUNDLE=".so" |
| 87 | | BUNDLE=".junk" |
| 88 | | - SHL_LD="${CC} ${EEXTRA} -dynamiclib ${LDFLAGS} -install_name ${SHLPRE}${SHLFILE}${SHLPST} -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')' |
| 89 | | + SHL_LD="${CC} ${EEXTRA} -dynamiclib ${LDFLAGS} -install_name ${libdir}/${SHLPRE}${SHLFILE}${SHLPST} -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')' |
| 90 | | SHL_BASE="${LIBPRE}${SHLFILE}${SHLPST}" |
| 91 | | # MH EXTRATARGET="libregina$BUNDLE" |
| 92 | | OTHER_INSTALLS="installlib" |
| | 1 | --- configure.orig 2015-10-29 23:28:34.000000000 +0200 |
| | 2 | +++ configure 2015-10-29 23:26:45.000000000 +0200 |
| | 3 | @@ -889,7 +889,7 @@ |
| | 4 | dvidir='${docdir}' |
| | 5 | pdfdir='${docdir}' |
| | 6 | psdir='${docdir}' |
| | 7 | -libdir='${exec_prefix}/lib' |
| | 8 | +libdir='${prefix}/lib' |
| | 9 | localedir='${datarootdir}/locale' |
| | 10 | mandir='${datarootdir}/man' |
| | 11 | |
