-no binding for daemons

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 443e27321e3341df7a45874b55a87f2c36d8d1ea..8eb437757460a04856a1dc936f22d09ba1f4b82e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,8 +13,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNUnet; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 #
 #
 # Process this file with autoconf to produce a configure script.
@@ -368,31 +368,31 @@ fi        # $build = $target
 # check for bluetooth library
 bluetooth=0
 AC_CHECK_LIB(bluetooth, ba2str,[AC_CHECK_HEADER([bluetooth/bluetooth.h],bluetooth=1)])
-if test "$bluetooth" = 1
-then
-  AM_CONDITIONAL(HAVE_LIBBLUETOOTH, true)
-  AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library])
-else
-  AM_CONDITIONAL(HAVE_LIBBLUETOOTH, false)
-fi
 if test "$build_target" = "mingw"
 then
   bluetooth=1
 fi
+AM_CONDITIONAL(HAVE_LIBBLUETOOTH, [test "$bluetooth" = 1])
+if test "$bluetooth" = 1         
+then
+  AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library])
+else
+  AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library])
+fi
 
 
 # check for libpulse(audio) library
 pulse=0
 AC_CHECK_LIB(pulse,pa_stream_peek,
   [AC_CHECK_HEADER([pulse/simple.h],pulse=1)])
-if test "$pulse" = 1
-then
-  AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library])
-fi
 if test "$build_target" = "mingw"
 then
   pulse=0
 fi
+if test "$pulse" = 1
+then
+  AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library])
+fi
 
 # check for libopus(audio) library
 opus=0
@@ -442,9 +442,9 @@ then
   AM_CONDITIONAL(BUILD_PULSE_HELPERS, false)
   AM_CONDITIONAL(BUILD_GST_HELPERS, false)
  else
-  conversation_backend=gst
-  AM_CONDITIONAL(BUILD_PULSE_HELPERS, false)
-  AM_CONDITIONAL(BUILD_GST_HELPERS, true)
+   conversation_backend=gst
+   AM_CONDITIONAL(BUILD_PULSE_HELPERS, false)
+   AM_CONDITIONAL(BUILD_GST_HELPERS, true)
  fi
 else
  conversation_backend=pulse
@@ -460,6 +460,7 @@ then
        AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl])
 else
        AM_CONDITIONAL(HAVE_LIBGNURL, false)
+       AC_DEFINE([HAVE_LIBGNURL],[0],[Lacking libgnurl])
 fi
 
 SAVE_CPPFLAGS=$CPPFLAGS
@@ -777,10 +778,14 @@ AC_SUBST(SQLITE_LDFLAGS)
 postgres=false
 AX_LIB_POSTGRESQL([])
 if test "$found_postgresql" = "yes"; then
-  postgres=true
+  CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
+  AC_CHECK_HEADERS([libpq-fe.h], 
+    postgres=true)
 fi
+
 AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue)
 
+
 LDFLAGS=$SAVE_LDFLAGS
 CPPFLAGS=$SAVE_CPPFLAGS