ws change

[lyx.git] / development / tools / makeLyXsigc.sh

diff --git a/development/tools/makeLyXsigc.sh b/development/tools/makeLyXsigc.sh
index 33b9a82d379c64058fa73354ae28c0f4705a0aea..ba17cde8fb6a179806f15c975ecd9ac408070231 100644 (file)
--- a/development/tools/makeLyXsigc.sh
+++ b/development/tools/makeLyXsigc.sh
@@ -72,8 +72,8 @@ EOF
 )
 
 
-echo "Limiting to Signal2"
-# we only need up to Signal2
+echo "Limiting to Signal3"
+# we only need up to Signal3
 # NOTE: sigc++ needs 2 slots higher than the number of signals (see bind.h)
 # Anyone feeling keen?
 # How would you like to make this a parameter-controlled stripping of
@@ -83,11 +83,11 @@ for i in `ls $package/sigc++/macros/*.h.m4`; do
   case $i in
     $package/sigc++/macros/slot.h.m4)
         sed < $i > $i.tmp \
-               -e '/.*ARGS(P,[56789]).*/d'
+               -e '/.*ARGS(P,[6789]).*/d'
         ;;
     *)
         sed < $i > $i.tmp \
-               -e '/.*ARGS(P,[3456789]).*/d'
+               -e '/.*ARGS(P,[456789]).*/d'
         ;;
   esac
   rm -f $i
@@ -157,6 +157,12 @@ echo "Creating custom sigc++/configure.in"
 #
 # Move sigc++config.h out of the now removed config/.
 #
+#    -e 's/--dis\(able-threads\)/--en\1/' \
+#    -e 's;dis\(ables.*threading\);en\1;' \
+#    -e 's;\(^enable.*threads=\"\)yes;\1no;' \
+#
+# Don't use threads.
+#
 #    -e '/.*\.spec.*/d' \
 #    -e '\%.*sigc++/Makefile.*%d' \
 #    -e '\%.*config/Makefile.*%d'
@@ -231,6 +237,9 @@ done\
 LYX_FIX_MAKEFILE_IN%' \
     -e 's%\(AUX_DIR(\)scripts%\1../config%' \
     -e 's%config/\(sigc++config\.h\)%\1%' \
+    -e 's/--dis\(able-threads\)/--en\1/' \
+    -e 's;dis\(ables.*threading\);en\1;' \
+    -e 's;\(^enable.*threads=\"\)yes;\1no;' \
     -e '/.*\.spec.*/d' \
     -e '\%.*sigc++/Makefile.*%d' \
     -e '\%.*config/Makefile.*%d' \
@@ -303,6 +312,12 @@ echo "Modifying sigc++/Makefile.am"
 #
 # We don't want the extra bits that libsigc++ does.
 #
+#    -e 's/\(libsigc_la_SOURCES=\)\(.*\)/\1 $(BUILT_SOURCES)\2/' \
+#    -e '/%.h:/i\
+#Makefile: $(BUILT_SOURCES)\
+#'
+# Make sure the built sources are built.
+#
 ( cd $package/sigc++;
   sed < Makefile.am > Makefile.tmp \
     -e 's%\(SUBDIRS =\)\(.*\)config\(.*\)%\1\2\3\
@@ -318,7 +333,11 @@ ETAGS_ARGS = --lang=c++%' \
     -e 's/\(LTLIB\)/noinst_\1/' \
     -e '/EXTRA_DIST.*/d' \
     -e 's/-version-info.*ION)//' \
-    -e 's/-release.*EASE)//';
+    -e 's/-release.*EASE)//' \
+    -e 's/\(libsigc_la_SOURCES=\)\(.*\)/\1 $(BUILT_SOURCES)\2/' \
+    -e '/%.h:/i\
+Makefile: $(BUILT_SOURCES)\
+';
   rm -f Makefile.am ;
   mv Makefile.tmp Makefile.am )
 
@@ -360,6 +379,7 @@ sigc-config
 stamp*
 sigc++config.h
 sigc++config.h.in
+acinclude.m4
 EOF
 )