diff -uNr kdeedu-3.3.1/admin/ltmain.sh kdeedu-3.3.1-new/admin/ltmain.sh
--- kdeedu-3.3.1/admin/ltmain.sh	Tue Jun 15 12:47:06 2004
+++ kdeedu-3.3.1-new/admin/ltmain.sh	Mon Nov  8 15:22:09 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 kdeedu-3.3.1/configure kdeedu-3.3.1-new/configure
--- kdeedu-3.3.1/configure	Sun Oct  3 10:21:12 2004
+++ kdeedu-3.3.1-new/configure	Mon Nov  8 15:22:09 2004
@@ -7973,6 +7973,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
@@ -9616,10 +9629,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
@@ -11469,7 +11493,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'
@@ -12520,7 +12555,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
@@ -16343,7 +16389,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
@@ -18625,7 +18682,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
diff -uNr kdeedu-3.3.1/kstars/kstars/Makefile.in kdeedu-3.3.1-new/kstars/kstars/Makefile.in
--- kdeedu-3.3.1/kstars/kstars/Makefile.in	Sun Oct  3 10:21:10 2004
+++ kdeedu-3.3.1-new/kstars/kstars/Makefile.in	Mon Nov  8 15:22:09 2004
@@ -132,8 +132,7 @@
 	fitshistogram.$(OBJEXT) opssolarsystem.$(OBJEXT) \
 	streamwg.$(OBJEXT) indifitsconf.$(OBJEXT) \
 	imagesequence.$(OBJEXT) kstarsinterface_skel.$(OBJEXT) simclockinterface_skel.$(OBJEXT) addcatdialogui.$(OBJEXT) devmanager.$(OBJEXT) focusdialogdlg.$(OBJEXT) indiconf.$(OBJEXT) indihostconf.$(OBJEXT) opsadvancedui.$(OBJEXT) opscatalogui.$(OBJEXT) opscolorsui.$(OBJEXT) opsguides.$(OBJEXT) opssolarsystemui.$(OBJEXT) telescopewizard.$(OBJEXT) fovdialogui.$(OBJEXT) newfovui.$(OBJEXT) kswizardui.$(OBJEXT) contrastbrightnessgui.$(OBJEXT) imagereductionui.$(OBJEXT) histdialog.$(OBJEXT) statform.$(OBJEXT) fitsheaderdialog.$(OBJEXT) streamformui.$(OBJEXT) imgsequencedlgui.$(OBJEXT) Options.$(OBJEXT)
-@KDE_USE_FINAL_FALSE@kstars_OBJECTS = $(kstars_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kstars_OBJECTS = $(kstars_final_OBJECTS)
+kstars_OBJECTS = $(kstars_nofinal_OBJECTS)
 kstars_DEPENDENCIES = indi/liblilxml.a indi/libindicom.a \
 	indi/lzo/libminilzo.la tools/libkstarstools.a \
 	$(top_builddir)/libkdeedu/kdeeduplot/libkdeeduplot.la \
@@ -253,8 +252,6 @@
 KDE_RPATH = @KDE_RPATH@
 KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
 KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
 KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
 KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
 KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
@@ -1571,11 +1568,11 @@
 
 #>+ 3
 final:
-	$(MAKE) kstars_OBJECTS="$(kstars_final_OBJECTS)" all-am
+	$(MAKE) kstars_OBJECTS="$(kstars_nofinal_OBJECTS)" all-am
 
 #>+ 3
 final-install:
-	$(MAKE) kstars_OBJECTS="$(kstars_final_OBJECTS)" install-am
+	$(MAKE) kstars_OBJECTS="$(kstars_nofinal_OBJECTS)" install-am
 
 #>+ 3
 no-final:
diff -uNr kdeedu-3.3.1/kstars/kstars/indi/fli_ccd.c kdeedu-3.3.1-new/kstars/kstars/indi/fli_ccd.c
--- kdeedu-3.3.1/kstars/kstars/indi/fli_ccd.c	Sun Oct  3 03:13:39 2004
+++ kdeedu-3.3.1-new/kstars/kstars/indi/fli_ccd.c	Mon Nov  8 16:03:02 2004
@@ -19,6 +19,7 @@
 
 #endif
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -1717,7 +1718,7 @@
  
 	/* get a private connection to new client */
 	cli_len = sizeof(cli_socket);
-	s = accept (lsocket, (struct sockaddr *)&cli_socket, (socklen_t *)&cli_len);
+	s = accept (lsocket, (struct sockaddr *)&cli_socket, (kde_socklen_t *)&cli_len);
 	if(s < 0) {
 	    fprintf (stderr, "%s: accept: %s", me, strerror(errno));
 	    exit (1);
diff -uNr kdeedu-3.3.1/kturtle/examples/fr_FR/Makefile.in kdeedu-3.3.1-new/kturtle/examples/fr_FR/Makefile.in
--- kdeedu-3.3.1/kturtle/examples/fr_FR/Makefile.in	Sun Oct  3 10:21:10 2004
+++ kdeedu-3.3.1-new/kturtle/examples/fr_FR/Makefile.in	Mon Nov  8 15:22:09 2004
@@ -338,7 +338,7 @@
 xdg_appsdir = @xdg_appsdir@
 xdg_directorydir = @xdg_directorydir@
 xdg_menudir = @xdg_menudir@
-txt_DATA = triangle.logo carré.logo enroulé.logo exemple1.logo
+txt_DATA = triangle.logo exemple1.logo
 txtdir = $(kde_datadir)/kturtle/examples/fr_FR
 EXTRA_DIST = $(txt_DATA)
 #>- all: all-am
@@ -545,7 +545,7 @@
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=triangle.logo Makefile.in carré.logo enroulé.logo exemple1.logo Makefile.am 
+KDE_DIST=triangle.logo Makefile.in exemple1.logo Makefile.am 
 
 #>+ 2
 docs-am: