[Lunar-commits] r16027 - moonbase/trunk/web/links2

[Auke Kok]

Author: sofar
Date: 2005-08-06 17:03:24 +0000 (Sat, 06 Aug 2005)
New Revision: 16027

Modified:
   moonbase/trunk/web/links2/BUILD
   moonbase/trunk/web/links2/CONFIGURE
   moonbase/trunk/web/links2/DEPENDS
Log:
Rewritten depends+configure: the libpng is NOT required when you use non-graphical build so I explicitly use it... but you cannot disable it manually if you build it with graphical support ON.


Modified: moonbase/trunk/web/links2/BUILD
===================================================================
--- moonbase/trunk/web/links2/BUILD	2005-08-06 16:34:48 UTC (rev 16026)
+++ moonbase/trunk/web/links2/BUILD	2005-08-06 17:03:24 UTC (rev 16027)
@@ -1,5 +1,12 @@
 (
 
+  if [ "$USE_GRAPHICS" == "y" ] ; then
+    OPTS="$OPTS --enable-graphics"
+  fi
+  if [ "$USE_JSCRIPT" == "y" ] ; then
+    OPTS="$OPTS --enable-javascript"
+  fi
+
   # temp patch for a bug in links-2.1pre18
   patch_it $SOURCE_CACHE/$SOURCE2 1 &&
   default_build

Modified: moonbase/trunk/web/links2/CONFIGURE
===================================================================
--- moonbase/trunk/web/links2/CONFIGURE	2005-08-06 16:34:48 UTC (rev 16026)
+++ moonbase/trunk/web/links2/CONFIGURE	2005-08-06 17:03:24 UTC (rev 16027)
@@ -1,14 +1,2 @@
-if  !  grep  -q  CONFIGURED  $MODULE_CONFIG;  then
-
-  if  query  "Enable graphics support?" y;  then
-    OPTS="$OPTS --enable-graphics"
-  fi
-
-  if  query  "Enable javascript interpreter?" y;  then
-    OPTS="$OPTS --enable-javascript"
-  fi
-  
-  echo  'OPTS='\"$OPTS\"    >>  $MODULE_CONFIG
-  echo  'CONFIGURED="y"'  >>  $MODULE_CONFIG
-
-fi
+mquery USE_GRAPHICS "Enable graphics support?" y
+mquery USE_JSCRIPT "Enable javascript interpreter?" y

Modified: moonbase/trunk/web/links2/DEPENDS
===================================================================
--- moonbase/trunk/web/links2/DEPENDS	2005-08-06 16:34:48 UTC (rev 16026)
+++ moonbase/trunk/web/links2/DEPENDS	2005-08-06 17:03:24 UTC (rev 16027)
@@ -1,5 +1,10 @@
 depends  ncurses &&
-depends  libpng  &&
+
+optional_depends  libpng                  \
+                  ""                      \
+                  ""                      \
+				  "for PNG support"              &&
+
 optional_depends  gpm                     \
                   "--with-gpm"            \
                   "--without-gpm"         \