Changeset 81

Timestamp:

03/24/07 12:13:46 (20 months ago)

Author:

pguyot

Message:

New switch for configure to configure contrib packages.
New contrib package: inwt (interactive NEWT/0).

Location:

NEWT0/trunk

Files:

• Makefile.in (modified) (2 diffs)
• configure (modified) (5 diffs)
• configure.in (modified) (3 diffs)
• contrib/inwt (added)
• contrib/inwt/Makefile (added)
• contrib/inwt/Makefile.in (added)
• contrib/inwt/README (added)
• contrib/inwt/inwt.nwt (added)

NEWT0/trunk/Makefile.in

@@ -65 +65 @@
                 $(ext)/protoREGEX
 
-CONTRIBLIBS   = $(contrib)/NewtObjC \
-        $(contrib)/NativeCalls
+CONTRIBLIBS   = $(contrib)/inwt \
+                $(contrib)/NewtObjC \
+                $(contrib)/NativeCalls
 
 OBJS          = $(MAINOBJ) $(UTILSOBJS) $(PARSEROBJS) $(COREOBJS)
@@ -199 +200 @@
 ### CLEAN
 
+clean_contrib::
+    @for subdir in $(CONTRIBLIBS); do \
+        (cd $$subdir && $(MAKE) clean) || exit 1; \
+    done
+
 clean:
     rm -rf build/*
+    test "x@MAKE_CONTRIB@" = x || $(MAKE) clean_contrib
+

NEWT0/trunk/configure

@@ -852 +852 @@
   --enable-compat         enable compatibility with the Newton, and break many
                           features on the desktop
+  --enable-contrib        include contrib packages (inwt, NativeCalls, and
+                          NewtObjC)
 
 Optional Packages:
@@ -4884 +4886 @@
     LIBNEWT_LDSHARED='$(CC) -dynamic -bundle -undefined suppress -flat_namespace'
     DLEXT='dylib'
-    MAKE_CONTRIB='contrib'
     ;;
   cygwin*|mingw*)
@@ -4972 +4973 @@
 fi;
 
+# Check whether --enable-contrib or --disable-contrib was given.
+if test "${enable_contrib+set}" = set; then
+  enableval="$enable_contrib"
+  MAKE_CONTRIB='contrib'
+fi;
+
 test "x$compat" = xno && cat >>confdefs.h <<\_ACEOF
 #define __NAMED_MAGIC_POINTER__ 1
@@ -5006 +5013 @@
 
 
-                                                  ac_config_files="$ac_config_files Makefile ext/protoFILE/Makefile ext/protoREGEX/Makefile contrib/NativeCalls/Makefile contrib/NewtObjC/Makefile"
+                                                            ac_config_files="$ac_config_files Makefile ext/protoFILE/Makefile ext/protoREGEX/Makefile contrib/inwt/Makefile contrib/NativeCalls/Makefile contrib/NewtObjC/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -5535 +5542 @@
   "ext/protoFILE/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/protoFILE/Makefile" ;;
   "ext/protoREGEX/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/protoREGEX/Makefile" ;;
+  "contrib/inwt/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/inwt/Makefile" ;;
   "contrib/NativeCalls/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/NativeCalls/Makefile" ;;
   "contrib/NewtObjC/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/NewtObjC/Makefile" ;;

NEWT0/trunk/configure.in

@@ -104 +104 @@
     LIBNEWT_LDSHARED='$(CC) -dynamic -bundle -undefined suppress -flat_namespace'
     DLEXT='dylib'
-    MAKE_CONTRIB='contrib'
     ;;
   cygwin*|mingw*)
@@ -174 +173 @@
         [compat='yes'],
         [compat='no'])
+
+AC_ARG_ENABLE(contrib,
+    AS_HELP_STRING([--enable-contrib],
+        [include contrib packages (inwt, NativeCalls, and NewtObjC)]),
+        [MAKE_CONTRIB='contrib'])
 
 test "x$compat" = xno && AC_DEFINE(__NAMED_MAGIC_POINTER__)
@@ -200 +204 @@
                  ext/protoFILE/Makefile
                  ext/protoREGEX/Makefile
+                 contrib/inwt/Makefile
+                 contrib/inwt/inwt
                  contrib/NativeCalls/Makefile
                  contrib/NewtObjC/Makefile])