--- kde-2.2/kdepim/libical/src/libicalss/icalfileset.c.orig	Mon Aug 13 09:29:10 2001
+++ kde-2.2/kdepim/libical/src/libicalss/icalfileset.c	Mon Aug 13 09:29:16 2001
@@ -361,7 +361,7 @@
 icalcomponent* icalfileset_get_component(icalfileset* cluster){
     struct icalfileset_impl *impl = (struct icalfileset_impl*)cluster;
 
-    icalerror_check_arg_re((impl!=0),"cluster",ICAL_BADARG_ERROR);
+    icalerror_check_arg_re((impl!=0),"cluster",(int)ICAL_BADARG_ERROR);
 
     return impl->cluster;
 }
--- kde-2.2/kdepim/libkcal/Makefile.am.orig	Wed Aug 15 16:16:06 2001
+++ kde-2.2/kdepim/libkcal/Makefile.am	Wed Aug 15 16:16:24 2001
@@ -5,7 +5,7 @@
   -I$(top_builddir)/libical/src/libicalss -I$(srcdir)/versit $(all_includes)
 
 lib_LTLIBRARIES   = libkcal.la
-libkcal_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 -module
+libkcal_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined -version-info 1:0:0 -module
 libkcal_la_LIBADD  = $(LIB_QT) versit/libversit.la $(LIB_KFILE) \
                      $(top_builddir)/libical/src/libical/libical.la \
                      $(top_builddir)/libical/src/libicalss/libicalss.la
--- kde-2.2/kdepim/kgantt/kgantt/Makefile.am.orig	Wed Aug 15 16:17:42 2001
+++ kde-2.2/kdepim/kgantt/kgantt/Makefile.am	Wed Aug 15 16:17:55 2001
@@ -10,7 +10,7 @@
 xQGanttBarViewPort_Events.cpp \
 xQGanttBarView.cpp  xQGanttListView.cpp KGanttBarConfig.cpp
 
-libkgantt_la_LDFLAGS = -version-info 0:2:0 $(all_libraries) -no-undefined
+libkgantt_la_LDFLAGS = $(KDE_RPATH) -version-info 0:2:0 $(all_libraries) -no-undefined
 libkgantt_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) 
 
 
--- kde-2.2/kdepim/libimap/Makefile.am.orig	Wed Aug 15 16:19:15 2001
+++ kde-2.2/kdepim/libimap/Makefile.am	Wed Aug 15 16:19:33 2001
@@ -10,5 +10,5 @@
 Utils.cpp
 
 libkimap_la_LDFLAGS      = -module -version-info 0:0 -no-undefined
-libkimap_la_LIBADD       = $(all_libraries) $(LIB_QT)
+libkimap_la_LIBADD       = $(KDE_RPATH) $(all_libraries) $(LIB_QT)
 libkimap_la_METASOURCES  = AUTO
--- kde-2.2/kdepim/librmm/Makefile.am.orig	Wed Aug 15 16:21:03 2001
+++ kde-2.2/kdepim/librmm/Makefile.am	Wed Aug 15 16:21:12 2001
@@ -1,7 +1,7 @@
 SUBDIRS           = rmm
 INCLUDES          = -Irmm $(all_includes)
 lib_LTLIBRARIES   = librmm.la
-librmm_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 -module
+librmm_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined -version-info 1:0:0 -module
 librmm_la_LIBADD  = $(LIB_QT)
 
 librmm_la_SOURCES = \
--- kde-2.2/kdepim/libical/src/libical/icalderivedparameter.c.in.orig	Thu Aug 16 13:38:28 2001
+++ kde-2.2/kdepim/libical/src/libical/icalderivedparameter.c.in	Thu Aug 16 13:47:18 2001
@@ -55,7 +55,7 @@
     
 };
 
-extern  struct icalparameter_kind_map parameter_map[];
+static struct icalparameter_kind_map parameter_map[];
 
 
 const char* icalparameter_kind_to_string(icalparameter_kind kind)
@@ -102,7 +102,7 @@
     icalvalue_kind kind; 
 };
 
-extern struct icalparameter_value_kind_map value_kind_map[];
+static struct icalparameter_value_kind_map value_kind_map[];
 
 
 icalvalue_kind icalparameter_value_to_value_kind(icalparameter_value value)
@@ -129,7 +129,7 @@
 };
 
 
-extern struct icalparameter_map icalparameter_map[];
+static struct icalparameter_map icalparameter_map[];
 
 
 const char* icalparameter_enum_to_string(int e) 
--- kde-2.2/kdepim/libical/src/libical/icalderivedproperty.c.in.orig	Thu Aug 16 13:39:35 2001
+++ kde-2.2/kdepim/libical/src/libical/icalderivedproperty.c.in	Thu Aug 16 13:47:28 2001
@@ -59,7 +59,7 @@
 
 };
 
-extern struct icalproperty_map property_map[];
+static struct icalproperty_map property_map[];
 
 const char* icalproperty_kind_to_string(icalproperty_kind kind)
 {
@@ -139,7 +139,7 @@
     const char* str;
 }; 
 
-extern struct icalproperty_enum_map enum_map[];
+static struct icalproperty_enum_map enum_map[];
 
 
 const char* icalproperty_enum_to_string(int e)
--- kde-2.2/kdepim/libical/src/libical/icalderivedvalue.c.in.orig	Thu Aug 16 13:44:17 2001
+++ kde-2.2/kdepim/libical/src/libical/icalderivedvalue.c.in	Thu Aug 16 13:47:34 2001
@@ -60,7 +60,7 @@
 	char name[20];
 };
 
-extern struct icalvalue_kind_map value_map[]; 
+static struct icalvalue_kind_map value_map[]; 
 
 const char* icalvalue_kind_to_string(icalvalue_kind kind)
 {
--- kde-2.2/kdepim/admin/ltmain.sh.orig	Wed Aug 22 10:48:31 2001
+++ kde-2.2/kdepim/admin/ltmain.sh	Wed Aug 22 10:48:36 2001
@@ -3766,6 +3766,14 @@
       case "$host" in
         ia64-*-aix5*) ;;
         *-*-aix4* | *-*-aix5*)
+                   # Strange problem building korganizer: if -lkgantt appears before -lqt,
+                   # it seems that libkgantt overrides some symbols and causes strange behavior.
+                   if ($echo "X$compile_command" | grep "lkgantt") >/dev/null 2>&1; then
+	             compile_command=`$echo "X$compile_command" | $Xsed -e 's%-lkgantt%%g'`" -lkgantt"
+                   fi
+                   if ($echo "X$finalize_command" | grep "lkgantt") >/dev/null 2>&1; then
+	             finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%-lkgantt%%g'`" -lkgantt"
+                   fi
                    compile_command=`$echo "X$compile_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"`
                    finalize_command=`$echo "X$finalize_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;;
       esac