[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-1/scripts
From:       Aurélien Gâteau <aurelien.gateau () free ! fr>
Date:       2004-12-21 21:43:15
Message-ID: 20041221214315.0F2B61BBEC () office ! kde ! org
[Download RAW message or body]

CVS commit by gateau: 

Correctly merge #MIN_CONFIG lines when merging the module and app
configure.in.in files.


  M +16 -0     cvsExtract.sh   1.28


--- kdeextragear-1/scripts/cvsExtract.sh  #1.27:1.28
@@ -467,6 +467,22 @@
         cat $1/configure.in.in > $2/configure.in.in.in
         if [ -f "$2/configure.in.in" ] ; then
+            # Get the app MIN_CONFIG line, if there's one
+            local app_min_config_line=""
+            if grep -q '^#MIN_CONFIG' "$2/configure.in.in" ; then
+                app_min_config_line=$(grep '^#MIN_CONFIG' $2/configure.in.in)
+            fi
+
+            # Append app file at the end  of the module file
             cat $2/configure.in.in >> $2/configure.in.in.in
             rm -f $2/configure.in.in
+
+            # Place the app MIN_CONFIG line at the top of the file and make
+            # sure it's the only one
+            if [ -n "$app_min_config_line" ] ; then
+                local tmp=$2/configure.in.in.in.tmp
+                grep -v '^#MIN_CONFIG' $2/configure.in.in.in > $tmp
+                (echo $app_min_config_line ; cat $tmp) > $2/configure.in.in.in
+                rm $tmp
+            fi
         fi
         mv -f $2/configure.in.in.in $2/configure.in.in


[prev in list] [next in list] [prev in thread] [next in thread]