build: fix our adjustments for gnulib files in lib.

* configure.ac: For prepending lib/ to the values of config
variables, fix detection of empty values.  Also, due to recent
gnulib changes, add LIBUNISTRING_UNITYPES_H and
LIBUNISTRING_UNIWIDTH_H to the list of those variables.

diff --git a/ChangeLog b/ChangeLog
index e2846ca3569b8793b41af67290f5f4dfb1488f47..188a5949925f996a863f96c9d4510378c081fdad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-25  Joel E. Denny  <joeldenny@joeldenny.org>
+
+       build: fix our adjustments for gnulib files in lib.
+       * configure.ac: For prepending lib/ to the values of config
+       variables, fix detection of empty values.  Also, due to recent
+       gnulib changes, add LIBUNISTRING_UNITYPES_H and
+       LIBUNISTRING_UNIWIDTH_H to the list of those variables.
+
 2010-07-25  Joel E. Denny  <joeldenny@joeldenny.org>
 
        maint: use announce-gen's new --mail-headers.

diff --git a/configure.ac b/configure.ac
index 1fd22566887cbb10a8119199b7766c6c82baeeb4..5fe57bfc93286a10c3bbbccef917c714f5879386 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -165,9 +165,10 @@ gt_JAVAEXEC
 # So prefix paths with lib/.  See also etc/prefix-gnulib-mk.
 gl_LIBOBJS=`echo "$gl_LIBOBJS" | sed -e 's, , lib/,g'`
 for ac_var in ALLOCA_H ERRNO_H FCNTL_H GETOPT_H INTTYPES_H \
+              LIBUNISTRING_UNITYPES_H LIBUNISTRING_UNIWIDTH_H \
               STDBOOL_H STDINT_H SYS_WAIT_H WCHAR_H WCTYPE_H
 do
-  eval "test 'x$ac_var' = x || $ac_var=lib/\$$ac_var"
+  eval "test x\$$ac_var = x || $ac_var=lib/\$$ac_var"
 done
 AC_CONFIG_FILES([Makefile
                 po/Makefile.in