Makefile.am | 2 +-
Makefile.in | 3 ++-
VERSION.sh | 2 +-
admserv/genrb_wrapper.sh | 5 +++--
configure | 45 ++++++++++++++++++++++++++++++++++++++++++++-
m4/icu.m4 | 5 +++++
6 files changed, 56 insertions(+), 6 deletions(-)
New commits:
commit ebe5bbf8ab76a395896cf87886851d34a757c374
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Thu Jan 14 14:05:29 2010 -0700
Allow configure to find genrb correctly on all platforms
Found a bug in genrb_wrapper.sh - was not removing the icu paths from
the command line arguments
Bumped version to 1.1.10.a3
diff --git a/Makefile.am b/Makefile.am
index c286449..f84257b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -385,7 +385,7 @@ MOSTLYCLEANFILES = $(nodist_cmdbin_SCRIPTS) $(nodist_config_DATA)
if WINNT
ICU_GENRB = @icu_bin(a)/genrb.exe
else
-ICU_GENRB = sh $(srcdir)/admserv/genrb_wrapper.sh @icu_bin@ @icu_libdir@
+ICU_GENRB = sh -x $(srcdir)/admserv/genrb_wrapper.sh "@icu_bin@"
"@icu_libdir@"
endif
# need a reverse sort
diff --git a/Makefile.in b/Makefile.in
index f3c0fed..3c9521b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -326,6 +326,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GENRB = @GENRB@
HPUX_FALSE = @HPUX_FALSE@
HPUX_TRUE = @HPUX_TRUE@
HTTPD = @HTTPD@
@@ -774,7 +775,7 @@ nodist_config_DATA = admserv/cfgstuff/console.conf
admserv/cfgstuff/admserv.conf
@APACHE22_TRUE@HTTPD_CONF_SRC = admserv/cfgstuff/httpd-2.2.conf.in
MOSTLYCLEANFILES = $(nodist_cmdbin_SCRIPTS) $(nodist_config_DATA) \
$(RESOURCE_BUNDLES_ROOT)
-@WINNT_FALSE@ICU_GENRB = sh $(srcdir)/admserv/genrb_wrapper.sh @icu_bin@ @icu_libdir@
+@WINNT_FALSE@ICU_GENRB = sh -x $(srcdir)/admserv/genrb_wrapper.sh "@icu_bin@"
"@icu_libdir@"
# Resource Bundle Compiler
@WINNT_TRUE@ICU_GENRB = @icu_bin(a)/genrb.exe
diff --git a/VERSION.sh b/VERSION.sh
index ac8a357..db6d59d 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -15,7 +15,7 @@ VERSION_MAINT=10
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
-VERSION_PREREL=.a2
+VERSION_PREREL=.a3
# NOTES on VERSION_PREREL
# use aN for an alpha release e.g. a1, a2, etc.
# use rcN for a release candidate e.g. rc1, rc2, etc.
diff --git a/admserv/genrb_wrapper.sh b/admserv/genrb_wrapper.sh
index e467396..94508ad 100644
--- a/admserv/genrb_wrapper.sh
+++ b/admserv/genrb_wrapper.sh
@@ -30,6 +30,7 @@ if [ $# -lt 3 ]; then
exit 1
fi
+icu_bin="$1" ; shift
+icu_lib="$1" ; shift
# HP SHLIB_PATH too for old versions of HP-UX
-set -x
-SHLIB_PATH=$2:$SHLIB_PATH LD_LIBRARY_PATH=$2:$LD_LIBRARY_PATH PATH=$1:$PATH exec genrb
$@
+SHLIB_PATH=$icu_lib:$SHLIB_PATH LD_LIBRARY_PATH=$icu_lib:$LD_LIBRARY_PATH
PATH=$icu_bin:$PATH exec genrb "$@"
diff --git a/configure b/configure
index e331a66..d293a35 100755
--- a/configure
+++ b/configure
@@ -466,7 +466,7 @@ ac_includes_default="\
#endif"
ac_default_prefix=/opt/dirsrv
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION
PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir
libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir
infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF
AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p
AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu
host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR
am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE
am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE
SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP
CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION
debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec
CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE
SOLARIS_FALSE initconfigdir HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache
with_selinux SELINUX_TRUE SELINUX_FALSE instconfigdir dslibdir nspr_inc nspr_lib
nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc
ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver
icu_lib icu_libdir icu_inc icu_bin apr_inc apache_inc apache_conf apache_prefix apache_bin
extra_cppflags ap_ver_suf instancename cgibindir cmdbindir moddir modnssbindir propertydir
htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup admlogdir
piddir pidfile admservport admservip ldifdir admmoddir nssmoddir infdir perldir updatedir
brand capbrand vendor vendorurl WINNT_TRUE WINNT
_FALSE APACHE22_TRUE APACHE22_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION
PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir
libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir
infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF
AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p
AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu
host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR
am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE
am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE
SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP
CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION
debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec
CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE
SOLARIS_FALSE initconfigdir HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG GENRB nsspcache
with_selinux SELINUX_TRUE SELINUX_FALSE instconfigdir dslibdir nspr_inc nspr_lib
nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc
ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver
icu_lib icu_libdir icu_inc icu_bin apr_inc apache_inc apache_conf apache_prefix apache_bin
extra_cppflags ap_ver_suf instancename cgibindir cmdbindir moddir modnssbindir propertydir
htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup admlogdir
piddir pidfile admservport admservip ldifdir admmoddir nssmoddir infdir perldir updatedir
brand capbrand vendor vendorurl WINNT_TRUE
WINNT_FALSE APACHE22_TRUE APACHE22_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -24724,6 +24724,48 @@ echo "$as_me: error: ICU not found, specify with
--with-icu." >&2;}
fi
fi
+# Extract the first word of "genrb", so it can be a program name with args.
+set dummy genrb; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_GENRB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$GENRB"; then
+ ac_cv_prog_GENRB="$GENRB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$icu_bin:$PATH"
+for as_dir in $as_dummy
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_GENRB="1"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+GENRB=$ac_cv_prog_GENRB
+if test -n "$GENRB"; then
+ echo "$as_me:$LINENO: result: $GENRB" >&5
+echo "${ECHO_T}$GENRB" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if test -z "$GENRB" ; then
+ { { echo "$as_me:$LINENO: error: genrb not found in icu_bin $icu_bin or PATH
$PATH - please specify ICU bin directory" >&5
+echo "$as_me: error: genrb not found in icu_bin $icu_bin or PATH $PATH - please
specify ICU bin directory" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2006 Red Hat, Inc.
# All rights reserved.
@@ -26091,6 +26133,7 @@ s,@APXS@,$APXS,;t t
s,@APR_CONFIG@,$APR_CONFIG,;t t
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
s,@ICU_CONFIG@,$ICU_CONFIG,;t t
+s,@GENRB@,$GENRB,;t t
s,@nsspcache@,$nsspcache,;t t
s,@with_selinux@,$with_selinux,;t t
s,@SELINUX_TRUE@,$SELINUX_TRUE,;t t
diff --git a/m4/icu.m4 b/m4/icu.m4
index 8be4fa3..7c89368 100644
--- a/m4/icu.m4
+++ b/m4/icu.m4
@@ -100,3 +100,8 @@ if test -z "$icu_lib"; then
AC_MSG_ERROR([ICU not found, specify with --with-icu.])
fi
fi
+
+AC_CHECK_PROG([GENRB], [genrb], [1], [], [$icu_bin:$PATH])
+if test -z "$GENRB" ; then
+ AC_MSG_ERROR([genrb not found in icu_bin $icu_bin or PATH $PATH - please specify ICU
bin directory])
+fi