Changeset 28318


Ignore:
Timestamp:
09/26/13 16:39:20 (8 years ago)
Author:
ak19
Message:

Although gs2build's toplevel configure files are unused, adding in the equivalent changes just made to greenstone2's toplevel configure files.

Location:
main/trunk/gs2build
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/gs2build/configure

    r28310 r28318  
    681681CFLAGS
    682682LDFLAGS
     683ENABLE_GNOMELIB_EXT
    683684ENABLE_LUCENE
    684685ENABLE_MGPP
     
    747748enable_mgpp
    748749enable_lucene
     750enable_gnome_lib_ext
    749751with_dmalloc
    750752with_regex
     
    14001402  --disable-mgpp        Disable MGPP compilation
    14011403  --disable-lucene        Disable Lucene compilation
     1404  --enable-gnome-lib-ext  Enable the gnome-lib extension
    14021405
    14031406Optional Packages:
     
    20652068  ENABLE_LUCENE=0
    20662069fi
     2070
     2071
     2072
     2073# Check whether --enable-gnome-lib-ext was given.
     2074if test "${enable_gnome_lib_ext+set}" = set; then
     2075  enableval=$enable_gnome_lib_ext; ENABLE_GNOMELIB_EXT=1
     2076else
     2077  ENABLE_GNOMELIB_EXT=0
     2078fi
     2079
     2080if test -d ext/gnome-lib ; then
     2081   cat >>confdefs.h <<\_ACEOF
     2082#define ENABLE_GNOMELIB_EXT $ENABLE_GNOMELIB_EXT
     2083_ACEOF
     2084
     2085elif test -d ext/gnome-lib-minimal ; then
     2086   cat >>confdefs.h <<\_ACEOF
     2087#define ENABLE_GNOMELIB_EXT $ENABLE_GNOMELIB_EXT
     2088_ACEOF
     2089
     2090else
     2091   # Running `svn` returns 127 if no svn is installed. It returns 1 if svn is installed,
     2092   # since it suggests running svn --help. It returns 0 if running `svn --version`
     2093
     2094   if test $ENABLE_GNOMELIB_EXT = 1; then
     2095      svn --version
     2096      result=$?
     2097      if test $result = 0; then
     2098         cd ext
     2099     svn co http://svn.greenstone.org/gs2-extensions/gnome-lib/trunk/src gnome-lib
     2100     cd ..
     2101     cat >>confdefs.h <<\_ACEOF
     2102#define ENABLE_GNOMELIB_EXT 1
     2103_ACEOF
     2104
     2105      else
     2106         echo "**** WARNING: No gnome-lib or gnome-lib-minimal in gs2build/ext folder. Unable to check out gnome-lib. Disabling gnome-lib-ext."
     2107     cat >>confdefs.h <<\_ACEOF
     2108#define ENABLE_GNOMELIB_EXT 0
     2109_ACEOF
     2110
     2111      fi
     2112   fi
     2113fi
     2114
    20672115
    20682116
  • main/trunk/gs2build/configure.in

    r28310 r28318  
    130130fi
    131131AC_SUBST(ENABLE_LUCENE)
     132
     133
     134dnl
     135dnl Set compilation and/or sourcing of gnome-lib extension (disabled by default)
     136dnl
     137AC_ARG_ENABLE(gnome-lib-ext, [  --enable-gnome-lib-ext  Enable the gnome-lib extension], ENABLE_GNOMELIB_EXT=1, ENABLE_GNOMELIB_EXT=0)
     138if test -d ext/gnome-lib ; then
     139   AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT)
     140elif test -d ext/gnome-lib-minimal ; then
     141   AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT)
     142else
     143   # Running `svn` returns 127 if no svn is installed. It returns 1 if svn is installed,
     144   # since it suggests running svn --help. It returns 0 if running `svn --version`
     145
     146   if test $ENABLE_GNOMELIB_EXT = 1; then
     147      svn --version
     148      result=$?
     149      if test $result = 0; then
     150         cd ext
     151     svn co http://svn.greenstone.org/gs2-extensions/gnome-lib/trunk/src gnome-lib
     152     cd ..
     153     AC_DEFINE(ENABLE_GNOMELIB_EXT, 1)
     154      else
     155         echo "**** WARNING: No gnome-lib or gnome-lib-minimal in gs2build/ext folder. Unable to check out gnome-lib. Disabling gnome-lib-ext."
     156     AC_DEFINE(ENABLE_GNOMELIB_EXT, 0)
     157      fi
     158   fi
     159fi
     160AC_SUBST(ENABLE_GNOMELIB_EXT)
     161
    132162
    133163dnl Checks for programs.
Note: See TracChangeset for help on using the changeset viewer.