[GNUnet-SVN] r1874 - in Extractor: . libltdl

[grothoff]

Author: grothoff
Date: 2005-08-23 15:29:23 -0700 (Tue, 23 Aug 2005)
New Revision: 1874

Modified:
   Extractor/configure.ac
   Extractor/libltdl/install-sh
Log:
fixing build on OSX

Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2005-08-23 22:07:03 UTC (rev 1873)
+++ Extractor/configure.ac      2005-08-23 22:29:23 UTC (rev 1874)
@@ -32,6 +32,7 @@
 case "$host_os" in
 linux*)
      AC_DEFINE(LINUX,1,[This is a Linux system])
+     XTRA_CPPLIBS=-lstdc++
      ;;
 freebsd*)
      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
@@ -110,8 +111,6 @@
 
 # Redhat 9, gcc 3.2, libextractor_pdf barfs if we don't check for this
 AC_CHECK_LIB(stdc++, fclose)
-# but: only use for the PDF extractor and NOT for everything else!
-XTRA_CPPLIBS=$LIBS $XTRA_CPPLIBS
 
 AC_CHECK_HEADERS(langinfo.h)
 AC_CHECK_LIB(dl, dlopen)

Modified: Extractor/libltdl/install-sh
===================================================================
--- Extractor/libltdl/install-sh        2005-08-23 22:07:03 UTC (rev 1873)
+++ Extractor/libltdl/install-sh        2005-08-23 22:29:23 UTC (rev 1874)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2004-04-01.17
+scriptversion=2004-02-15.20
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -280,35 +280,26 @@
       && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
       && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
 
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-      || {
-          # The rename failed, perhaps because mv can't rename something else
-          # to itself, or perhaps because mv is so ancient that it does not
-          # support -f.
+    # Now remove or move aside any old file at destination location.  We
+    # try this two ways since rm can't unlink itself on some systems and
+    # the destination file might be busy for other reasons.  In this case,
+    # the final cleanup might fail but the new file should still install
+    # successfully.
+    {
+      if test -f "$dstdir/$dstfile"; then
+        $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+        || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+        || {
+         echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+         (exit 1); exit
+        }
+      else
+        :
+      fi
+    } &&
 
-          # Now remove or move aside any old file at destination location.
-          # We try this two ways since rm can't unlink itself on some
-          # systems and the destination file might be busy for other
-          # reasons.  In this case, the final cleanup might fail but the new
-          # file should still install successfully.
-          {
-            if test -f "$dstdir/$dstfile"; then
-              $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-              || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-              || {
-                echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-                (exit 1); exit
-              }
-            else
-              :
-            fi
-          } &&
-
-          # Now rename the file to the real destination.
-          $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-        }
-    }
+    # Now rename the file to the real destination.
+    $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
   fi || { (exit 1); exit; }
 done