The most recent version copied. Do not modify this instance (RW in ./org.glite.lb).

diff --git a/org.glite.lbjp-common.log/configure b/org.glite.lbjp-common.log/configure
index 76e67f9..3258454 100755 (executable)
--- a/org.glite.lbjp-common.log/configure
+++ b/org.glite.lbjp-common.log/configure
@@ -127,18 +127,19 @@ my %externs = (
        },
        postgresql => {
                prefix=> '/usr'
-       }
+       },
        activemq => {
-               prefix=>'/opt/activemq-cpp-library'
-       }
+               prefix=>'/opt/activemq-cpp-library',
+               pkg => 'activemq-cpp'
+       },
        apr => {
                prefix=>'/opt/apr',
                pkg => 'apr-1'
-       }
+       },
        aprutil => {
                prefix=>'/opt/apr-util',
                pkg => 'apr-util-1'
-       }
+       },
 );
 
 my %jar = (
@@ -827,9 +828,6 @@ sub mode_etics {
 # XXX: gridsite hack
                $conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : 
                        "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; }
-       if ($emi) {
-               $age = "${age}emi";
-       } 
 
        my $file = $output ? $output : "$conf.ini";
        open C,">$file" or die "$file: $!\n";

diff --git a/org.glite.lbjp-common.maildir/configure b/org.glite.lbjp-common.maildir/configure
index 76e67f9..3258454 100755 (executable)
--- a/org.glite.lbjp-common.maildir/configure
+++ b/org.glite.lbjp-common.maildir/configure
@@ -127,18 +127,19 @@ my %externs = (
        },
        postgresql => {
                prefix=> '/usr'
-       }
+       },
        activemq => {
-               prefix=>'/opt/activemq-cpp-library'
-       }
+               prefix=>'/opt/activemq-cpp-library',
+               pkg => 'activemq-cpp'
+       },
        apr => {
                prefix=>'/opt/apr',
                pkg => 'apr-1'
-       }
+       },
        aprutil => {
                prefix=>'/opt/apr-util',
                pkg => 'apr-util-1'
-       }
+       },
 );
 
 my %jar = (
@@ -827,9 +828,6 @@ sub mode_etics {
 # XXX: gridsite hack
                $conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : 
                        "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; }
-       if ($emi) {
-               $age = "${age}emi";
-       } 
 
        my $file = $output ? $output : "$conf.ini";
        open C,">$file" or die "$file: $!\n";

diff --git a/org.glite.lbjp-common.server-bones/configure b/org.glite.lbjp-common.server-bones/configure
index 76e67f9..3258454 100755 (executable)
--- a/org.glite.lbjp-common.server-bones/configure
+++ b/org.glite.lbjp-common.server-bones/configure
@@ -127,18 +127,19 @@ my %externs = (
        },
        postgresql => {
                prefix=> '/usr'
-       }
+       },
        activemq => {
-               prefix=>'/opt/activemq-cpp-library'
-       }
+               prefix=>'/opt/activemq-cpp-library',
+               pkg => 'activemq-cpp'
+       },
        apr => {
                prefix=>'/opt/apr',
                pkg => 'apr-1'
-       }
+       },
        aprutil => {
                prefix=>'/opt/apr-util',
                pkg => 'apr-util-1'
-       }
+       },
 );
 
 my %jar = (
@@ -827,9 +828,6 @@ sub mode_etics {
 # XXX: gridsite hack
                $conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : 
                        "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; }
-       if ($emi) {
-               $age = "${age}emi";
-       } 
 
        my $file = $output ? $output : "$conf.ini";
        open C,">$file" or die "$file: $!\n";

diff --git a/org.glite.lbjp-common.trio/configure b/org.glite.lbjp-common.trio/configure
index 76e67f9..3258454 100755 (executable)
--- a/org.glite.lbjp-common.trio/configure
+++ b/org.glite.lbjp-common.trio/configure
@@ -127,18 +127,19 @@ my %externs = (
        },
        postgresql => {
                prefix=> '/usr'
-       }
+       },
        activemq => {
-               prefix=>'/opt/activemq-cpp-library'
-       }
+               prefix=>'/opt/activemq-cpp-library',
+               pkg => 'activemq-cpp'
+       },
        apr => {
                prefix=>'/opt/apr',
                pkg => 'apr-1'
-       }
+       },
        aprutil => {
                prefix=>'/opt/apr-util',
                pkg => 'apr-util-1'
-       }
+       },
 );
 
 my %jar = (
@@ -827,9 +828,6 @@ sub mode_etics {
 # XXX: gridsite hack
                $conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : 
                        "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; }
-       if ($emi) {
-               $age = "${age}emi";
-       } 
 
        my $file = $output ? $output : "$conf.ini";
        open C,">$file" or die "$file: $!\n";