1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
diff -ur libquicktime-0.9.7/configure.ac libquicktime-0.9.7.patch/configure.ac
--- libquicktime-0.9.7/configure.ac 2006-08-17 01:34:50.000000000 -0400
+++ libquicktime-0.9.7.patch/configure.ac 2006-08-17 01:36:08.000000000 -0400
@@ -248,13 +248,16 @@
dnl Check for gtk
dnl This is neccesary for the utils/gtk subdirectory
dnl
-GTK_REQUIRED="2.4.0"
-AM_PATH_GTK_2_0($GTK_REQUIRED, have_gtk=true, have_gtk=false)
-AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xtrue)
-AC_SUBST(GTK_REQUIRED)
+dnl GTK_REQUIRED="2.4.0"
+dnl AM_PATH_GTK_2_0($GTK_REQUIRED, have_gtk=true, have_gtk=false)
+dnl AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xtrue)
+dnl AC_SUBST(GTK_REQUIRED)
+AH_TEMPLATE([HAVE_GTK], [Do we have gtk installed?])
+AC_DEFINE(HAVE_GTK, "false")
+AM_CONDITIONAL(HAVE_GTK, test "true" = "false")
dnl Always be in sync with the newest gtk
-GTK_CFLAGS="$GTK_CFLAGS -DGTK_DISABLE_DEPRECATED"
+dnl GTK_CFLAGS="$GTK_CFLAGS -DGTK_DISABLE_DEPRECATED"
dnl
dnl Check for libdv
@@ -610,8 +613,8 @@
UTIL_LIBADD=../src/libquicktime.la
AC_SUBST(UTIL_LIBADD)
-GTKUTIL_LIBADD=../../src/libquicktime.la
-AC_SUBST(GTKUTIL_LIBADD)
+dnl GTKUTIL_LIBADD=../../src/libquicktime.la
+dnl AC_SUBST(GTKUTIL_LIBADD)
dnl Define flags for application to use.
diff -ur libquicktime-0.9.7/utils/Makefile.in libquicktime-0.9.7.patch/utils/Makefile.in
--- libquicktime-0.9.7/utils/Makefile.in 2005-05-26 21:57:34.000000000 -0400
+++ libquicktime-0.9.7.patch/utils/Makefile.in 2006-08-17 01:35:39.000000000 -0400
@@ -126,7 +126,9 @@
MANS = $(man1_MANS)
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = gtk
+@HAVE_GTK_FALSE@dist_gtk_subdirs =
+@HAVE_GTK_TRUE@dist_gtk_subdirs = gtk
+DIST_SUBDIRS = $(dist_gtk_subdirs)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
|
GitWeb
