[Xfce4-commits] <xfce4-dev-tools:master> Check for glibtoolize.

Benedikt Meurer noreply at xfce.org
Sun Dec 19 12:14:02 CET 2010


Updating branch refs/heads/master
         to e9f246a0486cc03168f7a8b47fadb64a9843da30 (commit)
       from d1702a893ff5f2c0fdf3cb0779360d155004efb1 (commit)

commit e9f246a0486cc03168f7a8b47fadb64a9843da30
Author: Benedikt Meurer <benedikt.meurer at googlemail.com>
Date:   Sun Dec 19 12:13:19 2010 +0100

    Check for glibtoolize.

 scripts/xdt-autogen.in.in |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/scripts/xdt-autogen.in.in b/scripts/xdt-autogen.in.in
index 3a128e4..b5a075c 100644
--- a/scripts/xdt-autogen.in.in
+++ b/scripts/xdt-autogen.in.in
@@ -409,7 +409,13 @@ done
 ##
 ## Check for libtoolize
 ##
-test -z "${XDT_PROG_LIBTOOLIZE}" && XDT_PROG_LIBTOOLIZE="libtoolize"
+if test -z "${XDT_PROG_LIBTOOLIZE}"; then
+  if type glibtoolize >/dev/null 2>&1; then
+    XDT_PROG_LIBTOOLIZE="glibtoolize"
+  elif type libtoolize >/dev/null 2>&1; then
+    XDT_PROG_LIBTOOLIZE="libtoolize"
+  fi
+fi
 for configure_ac_file in $CONFIGURE_AC_FILES; do
   if grep -q "^AC_PROG_LIBTOOL" "${configure_ac_file}"; then
     (${XDT_PROG_LIBTOOLIZE} --version) </dev/null >/dev/null 2>&0 || {



More information about the Xfce4-commits mailing list