Changeset 9123 for branches/pep/autogen.sh

Timestamp:

12/12/07 09:44:46 (12 months ago)

Author:

asterix

Message:

merge diff from trunk

Files:

• branches/pep/autogen.sh (modified) (3 diffs)

branches/pep/autogen.sh

@@ -1 +1 @@
 #!/usr/bin/env bash
+  AM_ARGS="--add-missing --gnu --copy"
+  CONF_ARGS=""
+  if test x`uname -s 2>/dev/null` = 'xDarwin';then
+    . /Library/Frameworks/GTK+.framework/Versions/Current/env
+    AM_ARGS="${AM_ARGS} --ignore-deps"
+    CONF_ARGS="${CONF_ARGS} --disable-idle --without-x"
+  fi
+
   echo "[encoding: UTF-8]" > po/POTFILES.in \
   && ls -1 -U data/gajim.desktop.in.in data/glade/*.glade \
@@ -9 +17 @@
         exit 1
   fi
-  set -x
+
   intltoolize --force --automake \
   && aclocal -I ./m4 \
@@ -15 +23 @@
   && autoheader \
   && autoconf  \
-  && automake --add-missing --gnu --copy \
-  && ./configure $@
+  && automake ${AM_ARGS} \
+  && ./configure ${CONF_ARGS} $@