File gmerlin-0.4.3-as_needed.patch of Package gmerlin

Overview Repositories Revisions Requests Users Attributes Meta

File gmerlin-0.4.3-as_needed.patch of Package gmerlin (Revision 06a680618c8b71d604e483bc40d303ce)

Currently displaying revision 06a680618c8b71d604e483bc40d303ce , Show latest

Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -237,11 +237,9 @@ if test x$have_x = xtrue; then
 
 OLD_CFLAGS=$CFLAGS
 OLD_LIBS=$LIBS
-OLD_LDFLAGS=$LDFLAGS
-                                                                               
+
 CFLAGS=$X_FLAGS
-LDFLAGS="$X_LIBS $LDFLAGS -lXinerama"
-LIBS=$X_LIBS
+LIBS="$X_LIBS -lXinerama"
 
 AC_MSG_CHECKING(for xinerama)
 AC_TRY_LINK([#include <X11/Xlib.h>
@@ -261,7 +259,6 @@ fi
 AC_SUBST(XINERAMA_LIBS)
 
 CFLAGS=$OLD_CFLAGS
-LDFLAGS=$OLD_LDFLAGS
 LIBS=$OLD_LIBS
 
 fi
@@ -280,11 +277,9 @@ if test x$have_x = xtrue; then
 
 OLD_CFLAGS=$CFLAGS
 OLD_LIBS=$LIBS
-OLD_LDFLAGS=$LDFLAGS
                                                                                
 CFLAGS=$X_FLAGS
-LDFLAGS="$X_LIBS $LDFLAGS -lXtst"
-LIBS=$X_LIBS
+LIBS="$X_LIBS -lXtst"
 
 AC_MSG_CHECKING(for xtest)
 AC_TRY_LINK([#include <X11/Xlib.h>
@@ -304,7 +299,6 @@ fi
 AC_SUBST(XTEST_LIBS)
 
 CFLAGS=$OLD_CFLAGS
-LDFLAGS=$OLD_LDFLAGS
 LIBS=$OLD_LIBS
 
 fi
@@ -325,10 +319,8 @@ if test x$have_x = xtrue; then
 
 OLD_CFLAGS=$CFLAGS
 OLD_LIBS=$LIBS
-OLD_LDFLAGS=$LDFLAGS                                                                               
 CFLAGS=$X_FLAGS
-LIBS=$X_LIBS
-LDFLAGS="$X_LIBS $LDFLAGS -lXv"
+LIBS="$X_LIBS -lXv"
 
 AC_MSG_CHECKING(for xv)
 AC_TRY_LINK([#include <X11/Xlib.h>
@@ -349,7 +341,6 @@ AC_SUBST(XV_LIBS)
 
 CFLAGS=$OLD_CFLAGS
 LIBS=$OLD_LIBS
-LDFLAGS=$OLD_LDFLAGS
 
 fi
 
@@ -369,10 +360,8 @@ if test x$have_x = xtrue; then
 
 OLD_CFLAGS=$CFLAGS
 OLD_LIBS=$LIBS
-OLD_LDFLAGS=$LDFLAGS                                                                               
 CFLAGS=$X_FLAGS
-LIBS=$X_LIBS
-LDFLAGS="$X_LIBS $LDFLAGS -lXext"
+LIBS="$X_LIBS -lXext"
 
 AC_MSG_CHECKING(for x11 dpms)
 AC_TRY_LINK([#include <X11/Xlib.h>
@@ -393,7 +382,6 @@ AC_SUBST(XDPMS_LIBS)
 
 CFLAGS=$OLD_CFLAGS
 LIBS=$OLD_LIBS
-LDFLAGS=$OLD_LDFLAGS
 
 fi
 
@@ -411,10 +399,8 @@ if test x$have_x = xtrue; then
 
 OLD_CFLAGS=$CFLAGS
 OLD_LIBS=$LIBS
-OLD_LDFLAGS=$LDFLAGS                                                                               
 CFLAGS=$X_FLAGS
-LIBS=$X_LIBS
-LDFLAGS="$X_LIBS $LDFLAGS -lXfixes"
+LIBS="$X_LIBS -lXfixes"
 
 AC_MSG_CHECKING(for x11 dpms)
 AC_TRY_LINK([#include <X11/Xlib.h>
@@ -435,7 +421,6 @@ AC_SUBST(XFIXES_LIBS)
 
 CFLAGS=$OLD_CFLAGS
 LIBS=$OLD_LIBS
-LDFLAGS=$OLD_LDFLAGS
 
 fi
 
Index: lib/gtk/Makefile.am
===================================================================
--- lib/gtk/Makefile.am.orig
+++ lib/gtk/Makefile.am
@@ -63,5 +63,5 @@ urllink.c \
 urlselect.c \
 vumeter.c
 
-libgmerlin_gtk_la_LIBADD = @GTK_LIBS@
+libgmerlin_gtk_la_LIBADD = @GTK_LIBS@ $(top_builddir)/lib/libgmerlin.la
 
Index: lib/Makefile.am
===================================================================
--- lib/Makefile.am.orig
+++ lib/Makefile.am
@@ -31,7 +31,7 @@ else
 sem_sources = uthread_sem.c
 endif
 
-SUBDIRS = $(gtk_subdirs) $(x11_subdirs)
+SUBDIRS = $(x11_subdirs) . $(gtk_subdirs)
 
 AM_CFLAGS = \
 @FONTCONFIG_CFLAGS@ \

Places

File gmerlin-0.4.3-as_needed.patch of Package gmerlin (Revision 06a680618c8b71d604e483bc40d303ce)

Places