[GNUnet-SVN] r3437 - in GNUnet: . src/setup/text

[grothoff]

Author: grothoff
Date: 2006-10-03 08:26:17 -0700 (Tue, 03 Oct 2006)
New Revision: 3437

Modified:
   GNUnet/configure.ac
   GNUnet/src/setup/text/conf.c
Log:
mantis 1141 patches

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2006-10-02 20:20:47 UTC (rev 3436)
+++ GNUnet/configure.ac 2006-10-03 15:26:17 UTC (rev 3437)
@@ -161,7 +161,6 @@
 # will be more selective!
 SAVE_LIBS=$LIBS
 
-AC_CHECK_LIB(gmp, __gmpz_import,, AC_MSG_ERROR([GNUnet requires the GNU MP 
library (libgmp)]))
 
 # pthread_t is a struct since 11/2004
 AC_CHECK_MEMBER(pthread_t.p, AC_DEFINE(HAVE_NEW_PTHREAD_T, 1,
@@ -221,6 +220,39 @@
  AC_MSG_ERROR([GNUnet requires libextractor])
 fi
 
+# test for libgmp
+gmp=0
+AC_MSG_CHECKING(for libgmp)
+AC_ARG_WITH(gmp,
+   [  --with-gmp=PFX    Base of libgmp installation],
+   [AC_MSG_RESULT([$with_gmp])
+    case $with_gmp in
+      no)
+        ;;
+      yes)
+        AC_CHECK_HEADERS(gmp.h,
+          AC_CHECK_LIB([gmp], [GMP_loadDefaultLibraries],
+            gmp=1))
+        ;;
+      *)
+        LDFLAGS="-L$with_gmp/lib $LDFLAGS"
+        CPPFLAGS="-I$with_gmp/include $CPPFLAGS"
+        AC_CHECK_HEADERS(gmp.h,
+          AC_CHECK_LIB([gmp], [GMP_loadDefaultLibraries],
+            EXT_LIB_PATH="-L$with_gmp/lib $EXT_LIB_PATH"
+            gmp=1))
+        ;;
+    esac
+   ],
+   [AC_MSG_RESULT([--with-gmp not specified])
+    AC_CHECK_HEADERS(gmp.h,
+     AC_CHECK_LIB([gmp], [GMP_loadDefaultLibraries],
+      gmp=1))])
+if test "$gmp" != 1
+then
+ AC_MSG_ERROR([GNUnet requires libgmp])
+fi
+
 SAVE_LDFLAGS=$LDFLAGS
 SAVE_CPPFLAGS=$CPPFLAGS
 

Modified: GNUnet/src/setup/text/conf.c
===================================================================
--- GNUnet/src/setup/text/conf.c        2006-10-02 20:20:47 UTC (rev 3436)
+++ GNUnet/src/setup/text/conf.c        2006-10-03 15:26:17 UTC (rev 3437)
@@ -529,6 +529,10 @@
   char c;
   int ret;
 
+#if defined(OSX)
+#  define TCGETS TIOCGETA
+#  define TCSETS TIOCSETA
+#endif
   ioctl(0, TCGETS, &oldT);
   newT = oldT;
   newT.c_lflag &= ~ECHO;