Changeset 28509
- Timestamp:
- 2013-10-22T16:23:07+13:00 (10 years ago)
- Location:
- main/trunk/greenstone2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/build-src/configure
r28328 r28509 1991 1991 _ACEOF 1992 1992 1993 elif test - d $gshome/ext/gnome-lib-minimal; then1993 elif test -f $gshome/ext/gnome-lib-minimal/devel.bash ; then 1994 1994 cat >>confdefs.h <<\_ACEOF 1995 1995 #define ENABLE_GNOMELIB_EXT $ENABLE_GNOMELIB_EXT … … 1997 1997 1998 1998 else 1999 echo "**** WARNING: No gnome-lib or gnome-lib-minimal in gs2build/ext folder. Disabling gnome-lib-ext"1999 echo "**** WARNING: No gnome-lib or gnome-lib-minimal(/devel.bash) in gs2build/ext folder. Disabling gnome-lib-ext" 2000 2000 cat >>confdefs.h <<\_ACEOF 2001 2001 #define ENABLE_GNOMELIB_EXT 0 … … 8410 8410 # For a gnome-lib that's already compiled, don't need to its source ./devel.bash to configure wvware 8411 8411 # If a gnome-lib is not yet compiled, we compile it first with CASCADE-MAKE.sh 8412 # Need to make sure that the gnome-lib-minimal is not the cut-down gnome-lib-minimal (which contains 8413 # only the linux/lib subfolder) that's included with linux and mac binaries, because we can't compile 8414 # wvware with the cut-down one, only run wvware with it. The test for the cut-down version is that 8415 # it does not contain devel.bash. 8412 8416 8413 8417 if test $ENABLE_GNOMELIB_EXT = 1; then … … 8421 8425 fi 8422 8426 8423 if test - d $gshome/ext/gnome-lib-minimal; then8427 if test -f $gshome/ext/gnome-lib-minimal/devel.bash; then 8424 8428 echo "*** gnome-lib (minimal) detected. Sourcing the gnomelib env for configuring wvware..." 8425 8429 cd $gshome/ext/gnome-lib-minimal -
main/trunk/greenstone2/build-src/configure.in
r28328 r28509 160 160 if test -d $gshome/ext/gnome-lib ; then 161 161 AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT) 162 elif test - d $gshome/ext/gnome-lib-minimal; then162 elif test -f $gshome/ext/gnome-lib-minimal/devel.bash ; then 163 163 AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT) 164 164 else 165 echo "**** WARNING: No gnome-lib or gnome-lib-minimal in gs2build/ext folder. Disabling gnome-lib-ext"165 echo "**** WARNING: No gnome-lib or gnome-lib-minimal(/devel.bash) in gs2build/ext folder. Disabling gnome-lib-ext" 166 166 AC_DEFINE(ENABLE_GNOMELIB_EXT, 0) 167 167 fi … … 478 478 # For a gnome-lib that's already compiled, don't need to its source ./devel.bash to configure wvware 479 479 # If a gnome-lib is not yet compiled, we compile it first with CASCADE-MAKE.sh 480 # Need to make sure that the gnome-lib-minimal is not the cut-down gnome-lib-minimal (which contains 481 # only the linux/lib subfolder) that's included with linux and mac binaries, because we can't compile 482 # wvware with the cut-down one, only run wvware with it. The test for the cut-down version is that 483 # it does not contain devel.bash. 480 484 481 485 if test $ENABLE_GNOMELIB_EXT = 1; then … … 489 493 fi 490 494 491 if test - d $gshome/ext/gnome-lib-minimal; then495 if test -f $gshome/ext/gnome-lib-minimal/devel.bash; then 492 496 echo "*** gnome-lib (minimal) detected. Sourcing the gnomelib env for configuring wvware..." 493 497 cd $gshome/ext/gnome-lib-minimal -
main/trunk/greenstone2/configure
r28327 r28509 2107 2107 _ACEOF 2108 2108 2109 elif test - d ext/gnome-lib-minimal; then2109 elif test -f ext/gnome-lib-minimal/devel.bash ; then 2110 2110 cat >>confdefs.h <<\_ACEOF 2111 2111 #define ENABLE_GNOMELIB_EXT $ENABLE_GNOMELIB_EXT … … 2128 2128 2129 2129 else 2130 echo "**** WARNING: No gnome-lib or gnome-lib-minimal in gs2build/ext folder. Unable to check out gnome-lib. Disabling gnome-lib-ext."2130 echo "**** WARNING: No gnome-lib or gnome-lib-minimal(/devel.bash) in gs2build/ext folder. Unable to check out gnome-lib. Disabling gnome-lib-ext." 2131 2131 cat >>confdefs.h <<\_ACEOF 2132 2132 #define ENABLE_GNOMELIB_EXT 0 … … 7872 7872 # For a gnome-lib that's already compiled, don't need to its source ./devel.bash to configure wvware 7873 7873 # If a gnome-lib is not yet compiled, we compile it first with CASCADE-MAKE.sh 7874 7875 if test -d ext/gnome-lib-minimal; then 7874 # Need to make sure that the gnome-lib-minimal is not the cut-down gnome-lib-minimal (which contains 7875 # only the linux/lib subfolder) that's included with linux and mac binaries, because we can't compile 7876 # wvware with the cut-down one, only run wvware with it. The test for the cut-down version is that 7877 # it does not contain devel.bash. 7878 7879 if test -f ext/gnome-lib-minimal/devel.bash; then 7876 7880 echo "*** gnome-lib (minimal) detected. Sourcing the gnomelib env for configuring wvware..." 7877 7881 cd ext/gnome-lib-minimal -
main/trunk/greenstone2/configure.in
r28327 r28509 231 231 if test -d ext/gnome-lib ; then 232 232 AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT) 233 elif test - d ext/gnome-lib-minimal; then233 elif test -f ext/gnome-lib-minimal/devel.bash ; then 234 234 AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT) 235 235 else … … 246 246 AC_DEFINE(ENABLE_GNOMELIB_EXT, 1) 247 247 else 248 echo "**** WARNING: No gnome-lib or gnome-lib-minimal in gs2build/ext folder. Unable to check out gnome-lib. Disabling gnome-lib-ext."248 echo "**** WARNING: No gnome-lib or gnome-lib-minimal(/devel.bash) in gs2build/ext folder. Unable to check out gnome-lib. Disabling gnome-lib-ext." 249 249 AC_DEFINE(ENABLE_GNOMELIB_EXT, 0) 250 250 fi … … 555 555 # For a gnome-lib that's already compiled, don't need to its source ./devel.bash to configure wvware 556 556 # If a gnome-lib is not yet compiled, we compile it first with CASCADE-MAKE.sh 557 558 if test -d ext/gnome-lib-minimal; then 557 # Need to make sure that the gnome-lib-minimal is not the cut-down gnome-lib-minimal (which contains 558 # only the linux/lib subfolder) that's included with linux and mac binaries, because we can't compile 559 # wvware with the cut-down one, only run wvware with it. The test for the cut-down version is that 560 # it does not contain devel.bash. 561 562 if test -f ext/gnome-lib-minimal/devel.bash; then 559 563 echo "*** gnome-lib (minimal) detected. Sourcing the gnomelib env for configuring wvware..." 560 564 cd ext/gnome-lib-minimal
Note:
See TracChangeset
for help on using the changeset viewer.