diff --git a/ChangeLog b/ChangeLog
index e99b756d4f22182c5b45b48b09cdc1783ea71d2f..b084ddf141c37644299a8f1ec8c69f11dded73e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-02  Laurynas Biveinis  <lauras@softhome.net>
+
+	* ltcf-c.sh: clear ac_cv_prog_cc_pic for DJGPP. Do not add
+	'-DPIC' to ac_cv_prog_cc_pic for DJGPP.
+	* ltcf-cxx.sh: likewise.
+	* ltcf-gcj.sh: likewise.
+	* ltconfig.sh: fix typo.
+
 2001-01-02  Laurynas Biveinis  <lauras@softhome.net>
 
 	* configure: handle DOS-style absolute paths.
diff --git a/ltcf-c.sh b/ltcf-c.sh
index 57df16c939bc68de3282d8e742d517fea49c0083..4ce77fc472a276b2e4f70938f0b7b5e78d083c7a 100644
--- a/ltcf-c.sh
+++ b/ltcf-c.sh
@@ -548,6 +548,10 @@ else
       # we not sure about C++ programs.
       ac_cv_prog_cc_static="$ac_cv_prog_cc_static ${ac_cv_prog_cc_wl}-lC"
       ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      ac_cv_prog_cc_pic=
+      ;;
     cygwin* | mingw* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
@@ -642,7 +646,16 @@ else
       ;;
     esac
   fi
-  ac_cv_prog_cc_pic="$ac_cv_prog_cc_pic -DPIC"
+  case "$host_os" in
+      # Platforms which do not suport PIC and -DPIC is meaningless
+      # on them:
+      *djgpp*)
+        ac_cv_prog_cc_pic=
+        ;;
+      *)
+        ac_cv_prog_cc_pic="$ac_cv_prog_cc_pic -DPIC"
+        ;;
+  esac
 fi
 
 need_lc=yes
diff --git a/ltcf-cxx.sh b/ltcf-cxx.sh
index fbcf248faa7f5abb0f152d0d81d4d1ba9d031105..9c7782f2791a91c0d76ca04d9a85413d9eb25938 100644
--- a/ltcf-cxx.sh
+++ b/ltcf-cxx.sh
@@ -595,6 +595,10 @@ if test "$with_gcc" = yes; then
     # we not sure about C++ programs.
     ac_cv_prog_cc_static="$ac_cv_prog_cc_static ${ac_cv_prog_cc_wl}-lC"
     ;;
+  *djgpp*)
+    # DJGPP does not support shared libraries at all
+    ac_cv_prog_cc_pic=
+    ;;
   cygwin* | mingw* | os2*)
     # This hack is so that the source file can tell whether it is being
     # built for inclusion in a dll (and should export symbols for example).
@@ -786,7 +790,17 @@ else
       ;;
   esac
 fi
-ac_cv_prog_cc_pic="$ac_cv_prog_cc_pic -DPIC"
+
+case "$host_os" in
+    # Platforms which do not suport PIC and -DPIC is meaningless
+    # on them:
+    *djgpp*)
+      ac_cv_prog_cc_pic=
+      ;;
+    *)
+      ac_cv_prog_cc_pic="$ac_cv_prog_cc_pic -DPIC"
+      ;;
+esac
 
 
 # Figure out "hidden" C++ library dependencies from verbose
diff --git a/ltcf-gcj.sh b/ltcf-gcj.sh
index acb30c0ace15aac641af77c837cfab99a8de6eda..dd46e0cd73b936e64cb95086da86a7fa87a5983a 100644
--- a/ltcf-gcj.sh
+++ b/ltcf-gcj.sh
@@ -546,6 +546,10 @@ fi
       # we not sure about C++ programs.
       ac_cv_prog_cc_static="$ac_cv_prog_cc_static ${ac_cv_prog_cc_wl}-lC"
       ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      ac_cv_prog_cc_pic=
+      ;;
     cygwin* | mingw* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
diff --git a/ltconfig b/ltconfig
index 25d1c6479151e617beec2b0811f00816afad4d6b..2f54843f54dd8eca3b4d04a4699de8822ae91fd2 100755
--- a/ltconfig
+++ b/ltconfig
@@ -1275,7 +1275,7 @@ sysv4)
   ;;
 esac
 
-# Handle CRLF in mingw too chain
+# Handle CRLF in mingw tool chain
 opt_cr=
 case "$host_os" in
 mingw*)