source:
npl/mediabox/ffmpeg/patches/fribidi.patch
@
c5c522c
Last change on this file since c5c522c was c5c522c, checked in by , 8 years ago | |
---|---|
|
|
File size: 2.6 KB |
-
Makefile.am
diff -u fribidi.orig/Makefile.am fribidi/Makefile.am
old new 9 9 ############################################################################## 10 10 11 11 ## The order of subdirs is important, don't change without a reason. 12 SUBDIRS = gen.tab charset lib bin doc test12 SUBDIRS = gen.tab charset lib #bin doc test 13 13 14 14 EXTRA_DIST = bootstrap ChangeLog.old 15 15 -
configure.ac
diff -u fribidi.orig/configure.ac fribidi/configure.ac
old new 165 165 AM_CONDITIONAL(FRIBIDI_CHARSETS, test x$FRIBIDI_CHARSETS = x1) 166 166 167 167 # --with[out]-glib 168 AC_ARG_WITH(glib,169 AC_HELP_STRING([--with-glib=@<:@no/auto/yes@:>@],170 [use Glib @<:@default=auto@:>@]))171 GLIB_PACKAGE=glib-2.0172 GLIB_MINVERSION=2.4168 #AC_ARG_WITH(glib, 169 # AC_HELP_STRING([--with-glib=@<:@no/auto/yes@:>@], 170 # [use Glib @<:@default=auto@:>@])) 171 #GLIB_PACKAGE=glib-2.0 172 #GLIB_MINVERSION=2.4 173 173 GLIB_LIBS= 174 174 GLIB_CFLAGS= 175 if test x$with_glib = xyes; then176 PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION)177 FRIBIDI_USE_GLIB=1178 else179 if test x$with_glib = xno; then175 #if test x$with_glib = xyes; then 176 # PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION) 177 # FRIBIDI_USE_GLIB=1 178 #else 179 #if test x$with_glib = xno; then 180 180 FRIBIDI_USE_GLIB=0 181 else182 PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION,183 FRIBIDI_USE_GLIB=1,184 FRIBIDI_USE_GLIB=0)185 fi186 fi187 if test x$FRIBIDI_USE_GLIB = x0; then181 #else 182 # PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION, 183 # FRIBIDI_USE_GLIB=1, 184 # FRIBIDI_USE_GLIB=0) 185 #fi 186 #fi 187 #if test x$FRIBIDI_USE_GLIB = x0; then 188 188 GLIB_PACKAGE= 189 fi189 #fi 190 190 AC_SUBST(FRIBIDI_USE_GLIB) 191 191 AM_CONDITIONAL(FRIBIDI_USE_GLIB, test x$FRIBIDI_USE_GLIB = x1) 192 192 193 193 194 MISC_CFLAGS="$GLIB_CFLAGS"195 MISC_LIBS="$GLIB_LIBS"196 MISC_PACKAGES="$GLIB_PACKAGE"197 AC_SUBST(MISC_CFLAGS)198 AC_SUBST(MISC_LIBS)199 AC_SUBST(MISC_PACKAGES)194 #MISC_CFLAGS="$GLIB_CFLAGS" 195 #MISC_LIBS="$GLIB_LIBS" 196 #MISC_PACKAGES="$GLIB_PACKAGE" 197 #AC_SUBST(MISC_CFLAGS) 198 #AC_SUBST(MISC_LIBS) 199 #AC_SUBST(MISC_PACKAGES) 200 200 201 201 # Generate output 202 202 AC_CONFIG_FILES([fribidi.pc -
fribidi.pc.in
old new 7 7 8 8 Name: @PACKAGE_NAME@ 9 9 Description: Unicode Bidirectional Algorithm Library 10 Requires: @MISC_PACKAGES@11 10 Version: @VERSION@ 12 11 Libs: -L${libdir} -lfribidi 13 12 Cflags: -I${includedir}/@PACKAGE@
Note: See TracBrowser
for help on using the repository browser.