Show
Ignore:
Timestamp:
26.09.2013 16:32:41 (7 years ago)
Author:
ak19
Message:

Adding in the enable-gnome-lib-ext configure flag for GS2's configure as well: this additionally checks out the gnome-lib package from SVN before compiling it.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/configure

    r28309 r28316  
    681681CFLAGS 
    682682LDFLAGS 
     683ENABLE_GNOMELIB_EXT 
    683684ENABLE_LUCENE 
    684685ENABLE_MGPP 
     
    757758enable_mgpp 
    758759enable_lucene 
     760enable_gnome_lib_ext 
    759761with_dmalloc 
    760762with_regex 
     
    14151417  --disable-mgpp          Disable MGPP compilation 
    14161418  --disable-lucene        Disable Lucene compilation 
     1419  --enable-gnome-lib-ext  Enable the gnome-lib extension 
    14171420 
    14181421Optional Packages: 
     
    22012204else 
    22022205  ENABLE_LUCENE=0 
     2206fi 
     2207 
     2208 
     2209 
     2210# Check whether --enable-gnome-lib-ext was given. 
     2211if test "${enable_gnome_lib_ext+set}" = set; then 
     2212  enableval=$enable_gnome_lib_ext; ENABLE_GNOMELIB_EXT=1 
     2213else 
     2214  ENABLE_GNOMELIB_EXT=0 
     2215fi 
     2216 
     2217if test -d ext/gnome-lib ; then 
     2218   cat >>confdefs.h <<\_ACEOF 
     2219#define ENABLE_GNOMELIB_EXT $ENABLE_GNOMELIB_EXT 
     2220_ACEOF 
     2221 
     2222elif test -d ext/gnome-lib-minimal ; then 
     2223   cat >>confdefs.h <<\_ACEOF 
     2224#define ENABLE_GNOMELIB_EXT $ENABLE_GNOMELIB_EXT 
     2225_ACEOF 
     2226 
     2227else 
     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 
    22032251fi 
    22042252