[GNUnet-SVN] r842 - in Extractor: . src/main

[durner]

Author: durner
Date: 2005-06-01 22:39:28 -0700 (Wed, 01 Jun 2005)
New Revision: 842

Modified:
   Extractor/configure.ac
   Extractor/src/main/Makefile.am
Log:
- fix build if python is not installed
- fix build on MinGW (no -ldl)

Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2005-06-01 19:24:57 UTC (rev 841)
+++ Extractor/configure.ac      2005-06-02 05:39:28 UTC (rev 842)
@@ -151,6 +151,16 @@
 
 AC_PYTHON_DEVEL
 
+AC_MSG_CHECKING(for python)
+if test -z "$python_path";
+then
+  AC_MSG_RESULT(yes)
+  AM_CONDITIONAL(HAVE_PYTHON,false)
+else
+  AC_MSG_RESULT(no)
+  AM_CONDITIONAL(HAVE_PYTHON,true)
+fi
+
 AC_CHECK_HEADERS([vorbis/vorbisfile.h])
 
 # Checks for typedefs, structures, and compiler characteristics.

Modified: Extractor/src/main/Makefile.am
===================================================================
--- Extractor/src/main/Makefile.am      2005-06-01 19:24:57 UTC (rev 841)
+++ Extractor/src/main/Makefile.am      2005-06-02 05:39:28 UTC (rev 842)
@@ -26,7 +26,7 @@
 libextractor_la_LDFLAGS = \
   -export-dynamic -version-info 1:1:0 $(LIBICONV)
 libextractor_la_LIBADD = \
-  $(LIBLTDL) -ldl
+  $(LIBLTDL)
 libextractor_la_DEPENDENCIES = \
   $(LIBLTDL) 
 
@@ -54,6 +54,8 @@
   getopt.h \
   getopt1.c 
 
+if HAVE_PYTHON
 install-exec-local:
        python libextractor_python_setup.py $(libdir) build
        python libextractor_python_setup.py $(libdir) install 
--prefix=$(PYTHON_PREFIX)
+endif