Author: durner
Date: 2006-06-25 12:41:04 -0700 (Sun, 25 Jun 2006)
New Revision: 3055
Modified:
Extractor/configure.ac
Extractor/src/plugins/Makefile.am
Extractor/src/plugins/thumbnail/Makefile.am
Log:
Rename GTK based thumbnail extractor and create a symlink to the prefered one
Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac 2006-06-25 10:56:00 UTC (rev 3054)
+++ Extractor/configure.ac 2006-06-25 19:41:04 UTC (rev 3055)
@@ -26,24 +26,28 @@
AM_CONDITIONAL(HAVE_GNU_LD, true)
AM_CONDITIONAL(SOMEBSD, false)
XTRA_CPPLIBS=-lstdc++
+ LIBEXT=.so
;;
freebsd*)
AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
AC_CHECK_LIB(c_r, pthread_create)
AM_CONDITIONAL(HAVE_GNU_LD, true)
AM_CONDITIONAL(SOMEBSD, true)
+ LIBEXT=.so
;;
openbsd*)
AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
AC_CHECK_LIB(c_r, pthread_create)
AM_CONDITIONAL(HAVE_GNU_LD, true)
AM_CONDITIONAL(SOMEBSD, true)
+ LIBEXT=.so
;;
netbsd*)
AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
AC_CHECK_LIB(c_r, pthread_create)
AM_CONDITIONAL(HAVE_GNU_LD, true)
AM_CONDITIONAL(SOMEBSD, true)
+ LIBEXT=.so
;;
*solaris*)
AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system])
@@ -52,17 +56,20 @@
AM_CONDITIONAL(HAVE_GNU_LD, false)
AM_CONDITIONAL(SOMEBSD, false)
CFLAGS="-D_POSIX_PTHREAD_SEMANTICS $CFLAGS"
+ LIBEXT=.so
;;
darwin*)
AC_DEFINE_UNQUOTED(DARWIN,1,[This is a Darwin system])
AM_CONDITIONAL(HAVE_GNU_LD, false)
AM_CONDITIONAL(SOMEBSD, false)
+ LIBEXT=.dylib
;;
cygwin*)
AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a CYGWIN system])
LDFLAGS="$LDFLAGS -no-undefined"
AM_CONDITIONAL(SOMEBSD, false)
AM_CONDITIONAL(HAVE_GNU_LD, false)
+ LIBEXT=.dll
;;
mingw*)
AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system])
@@ -73,6 +80,7 @@
LDFLAGS="$LDFLAGS -no-undefined -Wl,--export-all-symbols"
AM_CONDITIONAL(HAVE_GNU_LD, true)
AM_CONDITIONAL(SOMEBSD, false)
+ LIBEXT=.dll
;;
*)
AC_MSG_RESULT(Unrecognised OS $host_os)
@@ -80,6 +88,7 @@
AC_MSG_RESULT(otheros)
AM_CONDITIONAL(HAVE_GNU_LD, false)
AM_CONDITIONAL(SOMEBSD, false)
+ LIBEXT=.so
;;
esac
@@ -385,6 +394,7 @@
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
AC_SUBST(XTRA_CPPLIBS)
+AC_SUBST(LIBEXT)
AC_CONFIG_FILES([Makefile po/Makefile.in m4/Makefile
doc/Makefile
@@ -430,9 +440,9 @@
AC_MSG_NOTICE([NOTICE: libgsf not found, no OLE2 (MS Office) support])
fi
-if test "x$without_gtk" = "xtrue"
+if test "x$without_gtk" = "xtrue" -a "x$qt" = "x0"
then
- AC_MSG_NOTICE([NOTICE: gtk not found, no thumbnail support])
+ AC_MSG_NOTICE([NOTICE: neither gtk nor Qt not found, no thumbnail support])
fi
if test "x$HAVE_VORBISFILE_TRUE" = "x#"
Modified: Extractor/src/plugins/Makefile.am
===================================================================
--- Extractor/src/plugins/Makefile.am 2006-06-25 10:56:00 UTC (rev 3054)
+++ Extractor/src/plugins/Makefile.am 2006-06-25 19:41:04 UTC (rev 3055)
@@ -1,5 +1,7 @@
include Makefile-plugins.am
+LIBEXT = @LIBEXT@
+
if HAVE_GLIB
if WITH_GSF
oledir=ole2
@@ -306,3 +308,19 @@
libextractor_thumbnailqt_la_LDFLAGS = \
$(PLUGINFLAGS) $(retaincommand) -lQtCore4 -lQtGui4 $(svgflags)
+install-exec-hook:
+ rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
+ rm -f $(DESTDIR)$(plugindir)/libextractor_thumbnail.la; \
+ if test "$(thumbdir)" != ""; then \
+ if test "$(thumbqt)" != ""; then \
+ $(LN_S)
$(DESTDIR)$(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
+
$(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
+ else \
+ $(LN_S)
$(DESTDIR)$(plugindir)/libextractor_thumbnailgtk$(LIBEXT) \
+
$(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT); \
+ fi; \
+ else \
+ $(LN_S)
$(DESTDIR)$(plugindir)/libextractor_thumbnailqt$(LIBEXT) \
+ $(DESTDIR)$(plugindir)/libextractor_thumbnail$(LIBEXT);
\
+ fi;
+
Modified: Extractor/src/plugins/thumbnail/Makefile.am
===================================================================
--- Extractor/src/plugins/thumbnail/Makefile.am 2006-06-25 10:56:00 UTC (rev
3054)
+++ Extractor/src/plugins/thumbnail/Makefile.am 2006-06-25 19:41:04 UTC (rev
3055)
@@ -1,16 +1,16 @@
include ../Makefile-plugins.am
plugin_LTLIBRARIES = \
- libextractor_thumbnail.la
+ libextractor_thumbnailgtk.la
AM_CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS)
-libextractor_thumbnail_la_CFLAGS = \
+libextractor_thumbnailgtk_la_CFLAGS = \
$(GLIB_CFLAGS) $(GTK_CFLAGS)
-libextractor_thumbnail_la_LIBADD = \
+libextractor_thumbnailgtk_la_LIBADD = \
$(LIBADD) -lgobject-2.0 @GTK_LIBS@ \
$(top_builddir)/src/main/libextractor.la
-libextractor_thumbnail_la_LDFLAGS = \
+libextractor_thumbnailgtk_la_LDFLAGS = \
$(PLUGINFLAGS) $(retaincommand)
-libextractor_thumbnail_la_SOURCES = \
+libextractor_thumbnailgtk_la_SOURCES = \
thumbnailextractor.c
_______________________________________________
GNUnet-SVN mailing list
GNUnet-SVN@gnu.org
http://lists.gnu.org/mailman/listinfo/gnunet-svn
