diff -uNr kdewebdev-3.3.1/admin/ltmain.sh kdewebdev-3.3.1-new/admin/ltmain.sh --- kdewebdev-3.3.1/admin/ltmain.sh Tue Jun 15 12:47:06 2004 +++ kdewebdev-3.3.1-new/admin/ltmain.sh Mon Oct 18 16:11:57 2004 @@ -4397,6 +4397,7 @@ # We should set the shlibpath_var rpath= for dir in $temp_rpath; do + if test "$dir" != "@FINKPREFIX@/lib"; then case $dir in [\\/]* | [A-Za-z]:[\\/]*) # Absolute path. @@ -4407,6 +4408,7 @@ rpath="$rpath\$thisdir/$dir:" ;; esac + fi done temp_rpath="$rpath" fi diff -uNr kdewebdev-3.3.1/configure kdewebdev-3.3.1-new/configure --- kdewebdev-3.3.1/configure Sun Oct 3 10:38:31 2004 +++ kdewebdev-3.3.1-new/configure Mon Oct 18 16:11:57 2004 @@ -7979,6 +7979,19 @@ lt_cv_sys_max_cmd_len=8192; ;; + netbsd* | freebsd* | openbsd* | darwin* ) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for *BSD + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + ;; + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but @@ -9622,10 +9635,21 @@ archive_cmds_need_lc=no case "$host_os" in rhapsody* | darwin1.[012]) - allow_undefined_flag='-undefined suppress' + allow_undefined_flag='-Wl,-undefined -Wl,suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + ;; + 10.*) + allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup' + ;; + esac + fi ;; esac lt_int_apple_cc_single_mod=no @@ -11475,7 +11499,18 @@ allow_undefined_flag='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + ;; + 10.*) + allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup' + ;; + esac + fi ;; esac output_verbose_link_cmd='echo' @@ -12526,7 +12561,18 @@ allow_undefined_flag_CXX='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + ;; + 10.*) + allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup' + ;; + esac + fi ;; esac lt_int_apple_cc_single_mod=no @@ -16349,7 +16395,18 @@ allow_undefined_flag_F77='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + ;; + 10.*) + allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup' + ;; + esac + fi ;; esac lt_int_apple_cc_single_mod=no @@ -18631,7 +18688,18 @@ allow_undefined_flag_GCJ='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + ;; + 10.*) + allow_undefined_flag_GCJ='-Wl,-undefined -Wl,dynamic_lookup' + ;; + esac + fi ;; esac lt_int_apple_cc_single_mod=no @@ -36886,8 +36954,10 @@ if test "x`echo $KDE_VERSION | grep 3.1.9`" = "x"; then if test "x`echo $KDE_VERSION | grep 3.2`" = "x"; then if test "x`echo $KDE_VERSION | grep 3.3`" = "x"; then + if test "x`echo $KDE_VERSION | grep 3.3`" = "x"; then echo "The KDE version is too old, WYSIWYG mode disabled!" build_wysiwyg="no" + fi fi fi fi