comparison autogen.sh @ 29107:339cb6c7f0fd

merge of '6aa03fdea8a7360d07b6a8c72cfd0796a2990753' and 'c047500743d38f32ef46dd29915364cca00299a8'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Wed, 16 Sep 2009 15:44:34 +0000
parents a709dc0bb3f3
children 47c988cae716
comparison
equal deleted inserted replaced
29105:94f85ba7e5a9 29107:339cb6c7f0fd
127 # Check for our required helpers 127 # Check for our required helpers
128 ############################################################################### 128 ###############################################################################
129 check "$libtoolize"; LIBTOOLIZE=${BIN}; 129 check "$libtoolize"; LIBTOOLIZE=${BIN};
130 check "glib-gettextize"; GLIB_GETTEXTIZE=${BIN}; 130 check "glib-gettextize"; GLIB_GETTEXTIZE=${BIN};
131 check "intltoolize"; INTLTOOLIZE=${BIN}; 131 check "intltoolize"; INTLTOOLIZE=${BIN};
132 check "sed"; SED=${BIN};
132 check "aclocal"; ACLOCAL=${BIN}; 133 check "aclocal"; ACLOCAL=${BIN};
133 check "autoheader"; AUTOHEADER=${BIN}; 134 check "autoheader"; AUTOHEADER=${BIN};
134 check "automake"; AUTOMAKE=${BIN}; 135 check "automake"; AUTOMAKE=${BIN};
135 check "autoconf"; AUTOCONF=${BIN}; 136 check "autoconf"; AUTOCONF=${BIN};
136 137
138 # Run all of our helpers 139 # Run all of our helpers
139 ############################################################################### 140 ###############################################################################
140 run_or_die ${LIBTOOLIZE} ${LIBTOOLIZE_FLAGS:-"-c -f --automake"} 141 run_or_die ${LIBTOOLIZE} ${LIBTOOLIZE_FLAGS:-"-c -f --automake"}
141 run_or_die ${GLIB_GETTEXTIZE} ${GLIB_GETTEXTIZE_FLAGS:-"--force --copy"} 142 run_or_die ${GLIB_GETTEXTIZE} ${GLIB_GETTEXTIZE_FLAGS:-"--force --copy"}
142 run_or_die ${INTLTOOLIZE} ${INTLTOOLIZE_FLAGS:-"-c -f --automake"} 143 run_or_die ${INTLTOOLIZE} ${INTLTOOLIZE_FLAGS:-"-c -f --automake"}
144 # This call to sed is needed to work around an annoying bug in intltool 0.40.6
145 # See http://developer.pidgin.im/ticket/9520 for details
146 run_or_die ${SED} "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in
143 run_or_die ${ACLOCAL} ${ACLOCAL_FLAGS:-"-I m4macros"} 147 run_or_die ${ACLOCAL} ${ACLOCAL_FLAGS:-"-I m4macros"}
144 run_or_die ${AUTOHEADER} ${AUTOHEADER_FLAGS} 148 run_or_die ${AUTOHEADER} ${AUTOHEADER_FLAGS}
145 run_or_die ${AUTOMAKE} ${AUTOMAKE_FLAGS:-"-a -c --gnu"} 149 run_or_die ${AUTOMAKE} ${AUTOMAKE_FLAGS:-"-a -c --gnu"}
146 run_or_die ${AUTOCONF} ${AUTOCONF_FLAGS} 150 run_or_die ${AUTOCONF} ${AUTOCONF_FLAGS}
147 151