Changeset 28308 for main/trunk/greenstone2/build-src/Makefile.in

Timestamp:

2013-09-25T19:49:10+12:00 (11 years ago)

Author:

ak19

Message:

Configuration and make stages now work with gnome-lib. Committing GS2 configure.in, build-src's configure.in and Makefile.in. Will commit the two configure files for these from the ubuntu since the autoconf is of a higher version there. Also need to commit the gs2build configure.in and configure still.

File:

• main/trunk/greenstone2/build-src/Makefile.in (modified) (1 diff)

main/trunk/greenstone2/build-src/Makefile.in

@@ -54 +54 @@
 MODULEDIRS = @MODULEDIRS@
 
+ENABLE_GNOMELIB_EXT=@ENABLE_GNOMELIB_EXT@
+
 
 all:
+    if test $(ENABLE_GNOMELIB_EXT) = 1; then \
+      if test -d ../ext/gnome-lib; then \
+        pushd ../ext/gnome-lib && source ./devel.bash && popd; \
+      elif test -d ../ext/gnome-lib-minimal; then \
+        pushd ../ext/gnome-lib-minimal && source ./devel.bash && popd; \
+      fi; \
+    fi
     for odir in $(COMPILEDIRS) $(MODULEDIRS); do \
       echo making $@ in $$odir; \