[Mldonkey-commits] mldonkey config/Makefile.config.in config/Makef...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/02/11 19:52:57

Modified files:
        config         : Makefile.config.in Makefile.in configure.in 
        distrib        : ChangeLog 

Log message:
        patch #4883

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/Makefile.config.in.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/Makefile.in.diff?tr1=1.149&tr2=1.150&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/configure.in.diff?tr1=1.255&tr2=1.256&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.732&tr2=1.733&r1=text&r2=text

Patches:
Index: mldonkey/config/Makefile.config.in
diff -u mldonkey/config/Makefile.config.in:1.57 
mldonkey/config/Makefile.config.in:1.58
--- mldonkey/config/Makefile.config.in:1.57     Sun Feb  5 13:20:30 2006
+++ mldonkey/config/Makefile.config.in  Sat Feb 11 19:52:57 2006
@@ -5,6 +5,7 @@
 address@hidden@
 address@hidden@
 address@hidden@
address@hidden@
 address@hidden@
 
 address@hidden@
Index: mldonkey/config/Makefile.in
diff -u mldonkey/config/Makefile.in:1.149 mldonkey/config/Makefile.in:1.150
--- mldonkey/config/Makefile.in:1.149   Sat Feb 11 14:49:51 2006
+++ mldonkey/config/Makefile.in Sat Feb 11 19:52:57 2006
@@ -2018,7 +2018,7 @@
        $(OCAMLC) $(OFLAGS) $(INCLUDES) -c $<
 
 .mlcpp.ml:
-       cpp $< > $@
+       cpp -P $< $(FIX_BROKEN_CPP) > $@
 
 .mll.ml :
        $(OCAMLLEX) $<
Index: mldonkey/config/configure.in
diff -u mldonkey/config/configure.in:1.255 mldonkey/config/configure.in:1.256
--- mldonkey/config/configure.in:1.255  Fri Feb 10 17:08:50 2006
+++ mldonkey/config/configure.in        Sat Feb 11 19:52:57 2006
@@ -22,6 +22,7 @@
 OS_FILES=unix
 OS_FILES2=unix
 SYSTEM=unknown
+FIX_BROKEN_CPP=
 case $host in
   *mingw*)
     SYSTEM=mingw
@@ -73,6 +74,18 @@
     ;;
   *darwin*|*rhapsody*|*macosx*)
     SYSTEM=macosx
+    AC_CHECK_PROG(SED, sed, sed)
+    if test "$ac_cv_prog_SED" = "sed"; then
+      FIX_BROKEN_CPP="| sed -n '/^\#pragma/!p'"
+    else
+      AC_CHECK_PROG(GREP, grep, grep)
+      if test "$ac_cv_prog_GREP" = "grep"; then
+        FIX_BROKEN_CPP="| grep -v '^\#pragma'"
+      fi
+    fi
+    if test "xFIX_BROKEN_CPP" = "x"; then
+      AC_MSG_FAILURE([Apple cpp produces broken files, your system lacks sed 
or grep to fix it])
+    fi
     ;;
 esac
 if test "x$SYSTEM" = "xunknown"; then
@@ -99,7 +112,7 @@
       AC_CHECK_PROG(CUT, cut, cut)
       if test "$ac_cv_prog_CUT" = "cut"; then
         SUB_VERSION3="CVS"
-       if [ test "$SYSTEM" = "freebsd"] || [ test "$SYSTEM" = "darwin"] || [ 
test "$SYSTEM" = "netbsd"]; then
+       if [ test "$SYSTEM" = "freebsd"] || [ test "$SYSTEM" = "macosx"] || [ 
test "$SYSTEM" = "netbsd"]; then
          SCM_VERSION=`$STAT -f "%Sm" ./CVS/Entries | $SED -e 's/\(.*\) \(.*\) 
\(.*\) \(.*\)/\4-\1-\2 \3/'`
        else
          if [ test "$SYSTEM" = "openbsd"]; then
@@ -1149,6 +1162,7 @@
 AC_SUBST(CC)
 AC_SUBST(CPP)
 AC_SUBST(CXX)
+AC_SUBST(FIX_BROKEN_CPP)
 AC_SUBST(CONFIG_INCLUDES)
 
 AC_SUBST(EXTRA_DIRS)
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.732 mldonkey/distrib/ChangeLog:1.733
--- mldonkey/distrib/ChangeLog:1.732    Sat Feb 11 14:52:45 2006
+++ mldonkey/distrib/ChangeLog  Sat Feb 11 19:52:57 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/02/11
+4883: Mac OS X: Fix for broken Apple cpp-3.3
 4902: EDK: Stub respond to directory browsing requests (sam_dennis)
 4905: Update for patch 4823: add another -fno-fomit-frame-pointer
       in config/Makefile.in to avoid breaking CryptoPP (mikeX)