Changeset 867 for libcacaTweet

Timestamp:

Apr 25, 2006, 12:10:38 AM (15 years ago)

Author:

Sam Hocevar

Message:

• Removed my previously introduced --enable-pangoft2 and replaced it with a nicer cross compilation check.

Location:

libcaca/trunk

Files:

• build-win32 (modified) (1 diff)
• configure.ac (modified) (3 diffs)

libcaca/trunk/build-win32

@@ -15 +15 @@
 
 # Build for win32
-./configure --host=i586-mingw32msvc --prefix=/ --bindir=/bin --libdir=/lib --disable-imlib2 --disable-doc --disable-pangoft2
+./configure --host=i586-mingw32msvc --prefix=/ --bindir=/bin --libdir=/lib --disable-imlib2 --disable-doc
 make pkglibdir=/lib pkgdatadir=/data bindir=/bin
 

libcaca/trunk/configure.ac

@@ -31 +31 @@
 AC_EGREP_CPP(yes, foo)
 PKG_PROG_PKG_CONFIG()
+m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
+if test "$build" != "$host" -a "${PKG_CONFIG_LIBDIR}" = ""; then
+  export PKG_CONFIG_LIBDIR=/dev/null
+fi
 
 dnl output driver features
@@ -61 +65 @@
 AC_ARG_ENABLE(doc,
   [  --enable-doc            build documentation (needs doxygen and LaTeX)])
-AC_ARG_ENABLE(pangoft2,
-  [  --enable-pangoft2       build font generator tool (autodetected)])
 
 AC_CHECK_HEADERS(stdio.h stdarg.h signal.h sys/ioctl.h sys/time.h inttypes.h endian.h unistd.h arpa/inet.h netinet/in.h winsock2.h)
@@ -276 +278 @@
 # Build development tools?
 PANGOFT2="no"
-if test "${enable_pangoft2}" != "no"; then
-  PKG_CHECK_MODULES(pangoft2, pangoft2, [PANGOFT2="yes"], [AC_MSG_RESULT(no)])
-fi
+PKG_CHECK_MODULES(pangoft2, pangoft2, [PANGOFT2="yes"], [AC_MSG_RESULT(no)])
 AM_CONDITIONAL(USE_PANGO, test "${PANGOFT2}" != "no")