[Astlinux-commits] SF.net SVN: astlinux:[5835] branches/1.0/package

[<abe...@us...>]

Revision: 5835
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5835&view=rev
Author:   abelbeck
Date:     2012-12-24 21:44:09 +0000 (Mon, 24 Dec 2012)
Log Message:
-----------
allow perl and microperl to coexist, giving priority to perl if we have to choose
Note: none of these changes effect package options we use, simply for consistency

Modified Paths:
--------------
    branches/1.0/package/autoconf/Config.in
    branches/1.0/package/autoconf/autoconf.mk
    branches/1.0/package/automake/Config.in
    branches/1.0/package/automake/automake.mk
    branches/1.0/package/cups/cups.mk
    branches/1.0/package/ntp/Config.in
    branches/1.0/package/samba/Config.in

Modified: branches/1.0/package/autoconf/Config.in
===================================================================
--- branches/1.0/package/autoconf/Config.in	2012-12-24 21:08:37 UTC (rev 5834)
+++ branches/1.0/package/autoconf/Config.in	2012-12-24 21:44:09 UTC (rev 5835)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_AUTOCONF
 	bool "autoconf"
-	select BR2_PACKAGE_MICROPERL
+	select BR2_PACKAGE_PERL
 	help
 	  Extensible program for developing configure scripts.  These
 	  scripts handle all the mundane system/feature detection.

Modified: branches/1.0/package/autoconf/autoconf.mk
===================================================================
--- branches/1.0/package/autoconf/autoconf.mk	2012-12-24 21:08:37 UTC (rev 5834)
+++ branches/1.0/package/autoconf/autoconf.mk	2012-12-24 21:44:09 UTC (rev 5835)
@@ -10,7 +10,7 @@
 AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
 		    ac_cv_prog_gnu_m4_gnu=no
 
-AUTOCONF_DEPENDENCIES = microperl host-m4
+AUTOCONF_DEPENDENCIES = perl host-m4
 
 HOST_AUTOCONF_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
 			ac_cv_prog_gnu_m4_gnu=no

Modified: branches/1.0/package/automake/Config.in
===================================================================
--- branches/1.0/package/automake/Config.in	2012-12-24 21:08:37 UTC (rev 5834)
+++ branches/1.0/package/automake/Config.in	2012-12-24 21:44:09 UTC (rev 5835)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_AUTOMAKE
 	bool "automake"
 	select BR2_PACKAGE_AUTOCONF
-	select BR2_PACKAGE_MICROPERL
+	select BR2_PACKAGE_PERL
 	help
 	  Tool for automatically generating Makefile's for input to
 	  configure scripts (made by autoconf).

Modified: branches/1.0/package/automake/automake.mk
===================================================================
--- branches/1.0/package/automake/automake.mk	2012-12-24 21:08:37 UTC (rev 5834)
+++ branches/1.0/package/automake/automake.mk	2012-12-24 21:44:09 UTC (rev 5835)
@@ -7,7 +7,7 @@
 AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.bz2
 AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
 
-AUTOMAKE_DEPENDENCIES = host-autoconf autoconf microperl
+AUTOMAKE_DEPENDENCIES = host-autoconf autoconf perl
 
 HOST_AUTOMAKE_DEPENDENCIES = host-autoconf
 

Modified: branches/1.0/package/cups/cups.mk
===================================================================
--- branches/1.0/package/cups/cups.mk	2012-12-24 21:08:37 UTC (rev 5834)
+++ branches/1.0/package/cups/cups.mk	2012-12-24 21:44:09 UTC (rev 5835)
@@ -27,10 +27,10 @@
 CUPS_CFLAGS = $(TARGET_CFLAGS)
 
 
-ifeq ($(BR2_PACKAGE_PERL),disabled)	# We do not provide perl (yet)
+ifeq ($(BR2_PACKAGE_PERL),y)
 	CUPS_CONF_ENV +=	ac_cv_path_perl=$(STAGING_DIR)/usr/bin/perl
 	CUPS_CONF_OPT +=	--with-perl
-	CUPS_DEPENDENCIES +=	microperl
+	CUPS_DEPENDENCIES +=	perl
 else
 	CUPS_CONF_OPT +=	--disable-perl
 endif

Modified: branches/1.0/package/ntp/Config.in
===================================================================
--- branches/1.0/package/ntp/Config.in	2012-12-24 21:08:37 UTC (rev 5834)
+++ branches/1.0/package/ntp/Config.in	2012-12-24 21:44:09 UTC (rev 5835)
@@ -20,7 +20,7 @@
 
 config BR2_PACKAGE_NTP_NTP_WAIT
 	bool "ntp-wait"
-	depends on BR2_PACKAGE_MICROPERL
+	depends on BR2_PACKAGE_PERL || BR2_PACKAGE_MICROPERL
 	depends on BR2_PACKAGE_NTP
 	help
 	  ntp-wait waits until the locally running ntpd is in state 4
@@ -59,7 +59,7 @@
 
 config BR2_PACKAGE_NTP_NTPTRACE
 	bool "ntptrace"
-	depends on BR2_PACKAGE_MICROPERL
+	depends on BR2_PACKAGE_PERL || BR2_PACKAGE_MICROPERL
 	depends on BR2_PACKAGE_NTP
 	help
 	  ntptrace is a perl script that uses the ntpq utility program to

Modified: branches/1.0/package/samba/Config.in
===================================================================
--- branches/1.0/package/samba/Config.in	2012-12-24 21:08:37 UTC (rev 5834)
+++ branches/1.0/package/samba/Config.in	2012-12-24 21:44:09 UTC (rev 5835)
@@ -33,12 +33,12 @@
 	default y
 	depends on BR2_PACKAGE_SAMBA_SMBCLIENT
 	depends on BR2_PACKAGE_SAMBA_NMBLOOKUP
-	depends on BR2_PACKAGE_MICROPERL
+	depends on BR2_PACKAGE_PERL || BR2_PACKAGE_MICROPERL
 	help
 	  Script to browse network
 
 comment "findsmb       - disabled (requires nmblookup, smbclient and perl)"
-	depends on !BR2_PACKAGE_SAMBA_SMBCLIENT || !BR2_PACKAGE_SAMBA_NMBLOOKUP || !BR2_PACKAGE_MICROPERL
+	depends on !BR2_PACKAGE_SAMBA_SMBCLIENT || !BR2_PACKAGE_SAMBA_NMBLOOKUP || !(BR2_PACKAGE_PERL || BR2_PACKAGE_MICROPERL)
 
 config BR2_PACKAGE_SAMBA_NET
 	bool "net"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.