[PATCH] Restore FreeBSD 1.x support and fix support for Freebsd 1x.

[Tijl Coosemans]

* build-aux/config.libpath: Restore FreeBSD 1.x support,
revert 1bf9d10cc5e78c522b6e28a7dc43a10e6dcfaaed.
* build-aux/config.rpath: Restore FreeBSD 1.x support,
revert 4fc71678bebfe59aaa2681f4fa84fb9cf3c92db2 and treat
freebsd2.2* like freebsd*.
* m4/printf.m4: replace freebsd[1-4]* with freebsd[1-4].*.
* m4/unlinkdir.m4: Special case FreeBSD<2.2 instead of FreeBSD>=2.2.
---
 ChangeLog                | 12 ++++++++++++
 build-aux/config.libpath |  2 ++
 build-aux/config.rpath   | 11 ++++++-----
 m4/printf.m4             | 16 ++++++++--------
 m4/unlinkdir.m4          |  3 ++-
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5bb9d97..a361e4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2014-05-30  Tijl Coosemans <address@hidden>
+
+       Restore FreeBSD 1.x support and fix support for Freebsd 1x.
+
+       * build-aux/config.libpath: Restore FreeBSD 1.x support,
+       revert 1bf9d10cc5e78c522b6e28a7dc43a10e6dcfaaed.
+       * build-aux/config.rpath: Restore FreeBSD 1.x support,
+       revert 4fc71678bebfe59aaa2681f4fa84fb9cf3c92db2 and treat
+       freebsd2.2* like freebsd*.
+       * m4/printf.m4: replace freebsd[1-4]* with freebsd[1-4].*.
+       * m4/unlinkdir.m4: Special case FreeBSD<2.2 instead of FreeBSD>=2.2.
+
 2014-05-30  Paul Eggert  <address@hidden>
 
        ftoastr: work around compiler bug in IBM xlc 12.1
diff --git a/build-aux/config.libpath b/build-aux/config.libpath
index 6900970..a8477df 100755
--- a/build-aux/config.libpath
+++ b/build-aux/config.libpath
@@ -66,6 +66,8 @@ case $host_os in
   dgux*)
     shlibpath_var=LD_LIBRARY_PATH
     ;;
+  freebsd1.*)
+    ;;
   freebsd* | dragonfly*)
     shlibpath_var=LD_LIBRARY_PATH
     ;;
diff --git a/build-aux/config.rpath b/build-aux/config.rpath
index ab6fd99..11d0c5d 100755
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@@ -367,11 +367,10 @@ else
     dgux*)
       hardcode_libdir_flag_spec='-L$libdir'
       ;;
-    freebsd2.2*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
+    freebsd1.*)
+      ld_shlibs=no
       ;;
-    freebsd2*)
+    freebsd2.[01]*)
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
@@ -548,9 +547,11 @@ case "$host_os" in
   dgux*)
     library_names_spec='$libname$shrext'
     ;;
+  freebsd1.*)
+    ;;
   freebsd* | dragonfly*)
     case "$host_os" in
-      freebsd[123]*)
+      freebsd[23].*)
         library_names_spec='$libname$shrext$versuffix' ;;
       *)
         library_names_spec='$libname$shrext' ;;
diff --git a/m4/printf.m4 b/m4/printf.m4
index 9346ab0..6f9c6cf 100644
--- a/m4/printf.m4
+++ b/m4/printf.m4
@@ -61,7 +61,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_printf_sizes_c99="guessing yes";;
                                  # Guess yes on FreeBSD >= 5.
-           freebsd[1-4]*)        gl_cv_func_printf_sizes_c99="guessing no";;
+           freebsd[1-4].*)       gl_cv_func_printf_sizes_c99="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_printf_sizes_c99="guessing no";;
@@ -220,7 +220,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_printf_infinite="guessing yes";;
                                  # Guess yes on FreeBSD >= 6.
-           freebsd[1-5]*)        gl_cv_func_printf_infinite="guessing no";;
+           freebsd[1-5].*)       gl_cv_func_printf_infinite="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_printf_infinite="guessing no";;
@@ -442,7 +442,7 @@ changequote(,)dnl
                                          # Guess yes on glibc systems.
                    *-gnu*)               
gl_cv_func_printf_infinite_long_double="guessing yes";;
                                          # Guess yes on FreeBSD >= 6.
-                   freebsd[1-5]*)        
gl_cv_func_printf_infinite_long_double="guessing no";;
+                   freebsd[1-5].*)       
gl_cv_func_printf_infinite_long_double="guessing no";;
                    freebsd* | kfreebsd*) 
gl_cv_func_printf_infinite_long_double="guessing yes";;
                                          # Guess yes on HP-UX >= 11.
                    hpux[7-9]* | hpux10*) 
gl_cv_func_printf_infinite_long_double="guessing no";;
@@ -588,7 +588,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_printf_directive_f="guessing yes";;
                                  # Guess yes on FreeBSD >= 6.
-           freebsd[1-5]*)        gl_cv_func_printf_directive_f="guessing no";;
+           freebsd[1-5].*)       gl_cv_func_printf_directive_f="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_printf_directive_f="guessing no";;
@@ -1136,7 +1136,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_snprintf_truncation_c99="guessing 
yes";;
                                  # Guess yes on FreeBSD >= 5.
-           freebsd[1-4]*)        gl_cv_func_snprintf_truncation_c99="guessing 
no";;
+           freebsd[1-4].*)       gl_cv_func_snprintf_truncation_c99="guessing 
no";;
            freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing 
yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_snprintf_truncation_c99="guessing 
no";;
@@ -1235,7 +1235,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_snprintf_retval_c99="guessing 
yes";;
                                  # Guess yes on FreeBSD >= 5.
-           freebsd[1-4]*)        gl_cv_func_snprintf_retval_c99="guessing no";;
+           freebsd[1-4].*)       gl_cv_func_snprintf_retval_c99="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing 
yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_snprintf_retval_c99="guessing no";;
@@ -1316,7 +1316,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_snprintf_directive_n="guessing 
yes";;
                                  # Guess yes on FreeBSD >= 5.
-           freebsd[1-4]*)        gl_cv_func_snprintf_directive_n="guessing 
no";;
+           freebsd[1-4].*)       gl_cv_func_snprintf_directive_n="guessing 
no";;
            freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing 
yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_snprintf_directive_n="guessing 
no";;
@@ -1458,7 +1458,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu*)               gl_cv_func_vsnprintf_zerosize_c99="guessing 
yes";;
                                  # Guess yes on FreeBSD >= 5.
-           freebsd[1-4]*)        gl_cv_func_vsnprintf_zerosize_c99="guessing 
no";;
+           freebsd[1-4].*)       gl_cv_func_vsnprintf_zerosize_c99="guessing 
no";;
            freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing 
yes";;
                                  # Guess yes on Mac OS X >= 10.3.
            darwin[1-6].*)        gl_cv_func_vsnprintf_zerosize_c99="guessing 
no";;
diff --git a/m4/unlinkdir.m4 b/m4/unlinkdir.m4
index 99797af..ae01cbe 100644
--- a/m4/unlinkdir.m4
+++ b/m4/unlinkdir.m4
@@ -21,9 +21,10 @@ AC_DEFUN([gl_UNLINKDIR],
   # and might create garbage in the file system,
   # so the code below simply relies on the kernel name and version number.
   case $host_os in
+  freebsd1.* | freebsd2.[01]*) ;;
   gnu[[0-9]]* | \
   linux-* | linux | \
-  freebsd2.2* | freebsd[[3-9]]* | freebsd[[1-9]][[0-9]]* | \
+  freebsd* | \
   cygwin | \
   mingw*)
     AC_DEFINE([UNLINK_CANNOT_UNLINK_DIR], [1],
-- 
1.9.3