libextractor

commit 323b7856c89003a93902c070bd3404a7cbc10352
parent 0e6882e16d76f963b43a9f51f3f3a4e1c3ed1eb7
Author: Nils Durner <durner@gnunet.org>
Date:   Thu,  2 Jun 2005 05:39:28 +0000

- fix build if python is not installed
- fix build on MinGW (no -ldl)

Diffstat:
M
configure.ac
 | 
10
++++++++++
M
src/main/Makefile.am
 | 
4
+++-

2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
@@ -151,6 +151,16 @@ AC_CHECK_HEADERS([jni.h])
 
 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.
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
@@ -26,7 +26,7 @@ extract_LDADD = \
 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 @@ extract_SOURCES = \
   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