Changeset 28316
- Timestamp:
- 2013-09-26T16:32:41+12:00 (10 years ago)
- Location:
- main/trunk/greenstone2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/configure
r28309 r28316 681 681 CFLAGS 682 682 LDFLAGS 683 ENABLE_GNOMELIB_EXT 683 684 ENABLE_LUCENE 684 685 ENABLE_MGPP … … 757 758 enable_mgpp 758 759 enable_lucene 760 enable_gnome_lib_ext 759 761 with_dmalloc 760 762 with_regex … … 1415 1417 --disable-mgpp Disable MGPP compilation 1416 1418 --disable-lucene Disable Lucene compilation 1419 --enable-gnome-lib-ext Enable the gnome-lib extension 1417 1420 1418 1421 Optional Packages: … … 2201 2204 else 2202 2205 ENABLE_LUCENE=0 2206 fi 2207 2208 2209 2210 # Check whether --enable-gnome-lib-ext was given. 2211 if test "${enable_gnome_lib_ext+set}" = set; then 2212 enableval=$enable_gnome_lib_ext; ENABLE_GNOMELIB_EXT=1 2213 else 2214 ENABLE_GNOMELIB_EXT=0 2215 fi 2216 2217 if test -d ext/gnome-lib ; then 2218 cat >>confdefs.h <<\_ACEOF 2219 #define ENABLE_GNOMELIB_EXT $ENABLE_GNOMELIB_EXT 2220 _ACEOF 2221 2222 elif test -d ext/gnome-lib-minimal ; then 2223 cat >>confdefs.h <<\_ACEOF 2224 #define ENABLE_GNOMELIB_EXT $ENABLE_GNOMELIB_EXT 2225 _ACEOF 2226 2227 else 2228 # Running `svn` returns 127 if no svn is installed. It returns 1 if svn is installed, 2229 # since it suggests running svn --help. It returns 0 if running `svn --version` 2230 2231 if test $ENABLE_GNOMELIB_EXT = 1; then 2232 echo "@@@@ TOTO" 2233 svn --version 2234 result=$? 2235 if test $result = 0; then 2236 cd ext 2237 svn co http://svn.greenstone.org/gs2-extensions/gnome-lib/trunk/src gnome-lib 2238 cd .. 2239 cat >>confdefs.h <<\_ACEOF 2240 #define ENABLE_GNOMELIB_EXT 1 2241 _ACEOF 2242 2243 else 2244 echo "**** WARNING: No gnome-lib or gnome-lib-minimal in gs2build/ext folder. Unable to check out gnome-lib. Disabling gnome-lib-ext." 2245 cat >>confdefs.h <<\_ACEOF 2246 #define ENABLE_GNOMELIB_EXT 0 2247 _ACEOF 2248 2249 fi 2250 fi 2203 2251 fi 2204 2252 -
main/trunk/greenstone2/configure.in
r28308 r28316 223 223 fi 224 224 AC_SUBST(ENABLE_LUCENE) 225 226 227 dnl 228 dnl Set compilation and/or sourcing of gnome-lib extension (disabled by default) 229 dnl 230 AC_ARG_ENABLE(gnome-lib-ext, [ --enable-gnome-lib-ext Enable the gnome-lib extension], ENABLE_GNOMELIB_EXT=1, ENABLE_GNOMELIB_EXT=0) 231 if test -d ext/gnome-lib ; then 232 AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT) 233 elif test -d ext/gnome-lib-minimal ; then 234 AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT) 235 else 236 # Running `svn` returns 127 if no svn is installed. It returns 1 if svn is installed, 237 # since it suggests running svn --help. It returns 0 if running `svn --version` 238 239 if test $ENABLE_GNOMELIB_EXT = 1; then 240 echo "@@@@ TOTO" 241 svn --version 242 result=$? 243 if test $result = 0; then 244 cd ext 245 svn co http://svn.greenstone.org/gs2-extensions/gnome-lib/trunk/src gnome-lib 246 cd .. 247 AC_DEFINE(ENABLE_GNOMELIB_EXT, 1) 248 else 249 echo "**** WARNING: No gnome-lib or gnome-lib-minimal in gs2build/ext folder. Unable to check out gnome-lib. Disabling gnome-lib-ext." 250 AC_DEFINE(ENABLE_GNOMELIB_EXT, 0) 251 fi 252 fi 253 fi 254 AC_SUBST(ENABLE_GNOMELIB_EXT) 225 255 226 256
Note:
See TracChangeset
for help on using the changeset viewer.