| blob | f67d7a123ed06b68e8ae8033a0a4e6a53ec0477c |
1 diff --git configure.in configure.in
2 index d2d8406..3a878bb 100644
3 --- configure.in
4 +++ configure.in
5 @@ -269,6 +269,11 @@ AC_ARG_ENABLE(kde,
6 AC_ARG_ENABLE(kdeab,
7 [ --disable-kdeab Disable the KDE address book support
8 ],,if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi)
9 +AC_ARG_ENABLE(kde4,
10 +[ --enable-kde4 Determines whether to use Qt4/KDE4 vclplug on platforms
11 + where Qt4 and KDE4 are available. May be used with --enable-kde
12 + if you want to support both KDE3 and KDE4.
13 +],,)
14 AC_ARG_ENABLE(binfilter,
15 [ --disable-binfilter Disable legacy binary file formats filters
16 ],,if ! test -d ./binfilter; then enable_binfilter=no; fi)
17 @@ -912,6 +916,7 @@ case "$build_os" in
18 test_cairo=yes
19 build_gstreamer=yes
20 test_kde=yes
21 + test_kde4=yes
22 test_cups=yes
23 test_randr=yes
24 test_freetype=yes
25 @@ -941,6 +946,7 @@ case "$build_os" in
26 test_cairo=yes
27 build_gstreamer=yes
28 test_kde=yes
29 + test_kde4=yes
30 test_cups=yes
31 test_randr=yes
32 test_freetype=yes
33 @@ -985,6 +991,7 @@ case "$build_os" in
34 test_cairo=yes
35 build_gstreamer=yes
36 test_kde=yes
37 + test_kde4=yes
38 test_cups=yes
39 test_randr=yes
40 test_freetype=yes
41 @@ -1019,6 +1026,7 @@ case "$build_os" in
42 test_cairo=yes
43 build_gstreamer=yes
44 test_kde=yes
45 + test_kde4=yes
46 test_cups=no
47 test_randr=yes
48 test_freetype=yes
49 @@ -5447,6 +5455,13 @@ if test "x$enable_kde" = "xyes"; then
50 fi
51 AC_SUBST(ENABLE_KDE)
53 +ENABLE_KDE4=""
54 +if test "x$enable_kde4" = "xyes"; then
55 + ENABLE_KDE4="TRUE"
56 + R="$R kde4"
57 +fi
58 +AC_SUBST(ENABLE_KDE4)
59 +
60 if test -z "$R"; then
61 AC_MSG_RESULT([none])
62 else
63 @@ -6018,11 +6033,11 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
64 fi
65 fi
66 if test "$build_cpu" != "x86_64" ; then
67 - kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes"
68 - kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries"
69 + kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes"
70 + kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib $x_libraries"
71 else
72 - kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes"
73 - kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/lib64 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries"
74 + kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes"
75 + kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib64 $x_libraries"
76 fi
77 if test -n "$KDEDIR" ; then
78 kde_incdirs="$KDEDIR/include $kde_incdirs"
79 @@ -6069,12 +6084,13 @@ your Qt installation by exporting QTDIR before running "configure".])
80 your Qt installation by exporting QTDIR before running "configure".])
81 fi
83 + dnl Check for Meta Object Compiler
84 AC_PATH_PROG( MOC, moc, no, [$QTDIR/bin:$PATH] )
85 if test "$MOC" = "no" ; then
86 AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify
87 the root of your Qt installation by exporting QTDIR before running "configure".])
88 - fi
89 -
90 + fi
91 +
92 dnl Check for KDE headers
93 AC_MSG_CHECKING([for KDE headers])
94 kde_incdir="no"
95 @@ -6114,6 +6130,102 @@ AC_SUBST(KDE_LIBS)
96 AC_SUBST(MOC)
98 dnl ===================================================================
99 +dnl KDE4 Integration
100 +dnl ===================================================================
101 +
102 +KDE4_CFLAGS=""
103 +KDE4_LIBS=""
104 +MOC4="moc"
105 +if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
106 + qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
107 + qt_libdirs="$QTLIB /usr/lib $x_libraries"
108 +
109 + kde_incdirs="/usr/include $x_includes"
110 + kde_libdirs="/usr/lib $x_libraries"
111 +
112 + if test "$build_cpu" == "x86_64" ; then
113 + qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
114 + kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
115 + fi
116 +
117 + qt_test_include="Qt/qobject.h"
118 + qt_test_library="libQtCore.so"
119 + kde_test_include="ksharedptr.h"
120 + kde_test_library="libkdeui.so"
121 +
122 + AC_MSG_CHECKING([for Qt4 headers])
123 + qt_header_dir="no"
124 + for inc_dir in $qt_incdirs ; do
125 + if test -r "$inc_dir/$qt_test_include" ; then
126 + qt_header_dir="$inc_dir"
127 + break
128 + fi
129 + done
130 +
131 + AC_MSG_RESULT([$qt_header_dir])
132 + if test "x$qt_header_dir" = "xno" ; then
133 + AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
134 + fi
135 +
136 + AC_MSG_CHECKING([for Qt4 libraries])
137 + qt_lib_dir="no"
138 + for lib_dir in $qt_libdirs ; do
139 + if test -r "$lib_dir/$qt_test_library" ; then
140 + qt_lib_dir="$lib_dir"
141 + break
142 + fi
143 + done
144 +
145 + AC_MSG_RESULT([$qt_lib_dir])
146 +
147 + if test "x$qt_lib_dir" = "xno" ; then
148 + AC_MSG_ERROR([Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
149 + fi
150 +
151 + dnl Check for Meta Object Compiler
152 + AC_PATH_PROG( MOC4, moc, no, [$PATH:$QTDIR/bin] )
153 + if test "$MOC4" = "no" ; then
154 + AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify
155 +the root of your Qt installation by exporting QTDIR before running "configure".])
156 + fi
157 +
158 + dnl Check for KDE4 headers
159 + AC_MSG_CHECKING([for KDE4 headers])
160 + kde_incdir="no"
161 + for kde_check in $kde_incdirs ; do
162 + if test -r "$kde_check/$kde_test_include" ; then
163 + kde_incdir="$kde_check"
164 + break
165 + fi
166 + done
167 + AC_MSG_RESULT([$kde_incdir])
168 + if test "x$kde_incdir" = "xno" ; then
169 + AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
170 + fi
171 +
172 + dnl Check for KDE4 libraries
173 + AC_MSG_CHECKING([for KDE4 libraries])
174 + kde_libdir="no"
175 + for kde_check in $kde_libdirs ; do
176 + if test -r "$kde_check/$kde_test_library" ; then
177 + kde_libdir="$kde_check"
178 + break
179 + fi
180 + done
181 +
182 + AC_MSG_RESULT([$kde_libdir])
183 + if test "x$kde_libdir" = "xno" ; then
184 + AC_MSG_ERROR([KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
185 + fi
186 +
187 + KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
188 + KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkdeui -lkdecore -lQtCore -lQtGui"
189 +fi
190 +AC_SUBST(KDE4_CFLAGS)
191 +AC_SUBST(KDE4_LIBS)
192 +AC_SUBST(MOC4)
193 +
194 +dnl ===================================================================
195 dnl Test for the enabling the lockdown pieces
196 dnl ===================================================================
197 AC_MSG_CHECKING([whether to enable the lockdown pieces])
198 diff --git set_soenv.in set_soenv.in
199 index 9bc71be..e3bc624 100644
200 --- set_soenv.in
201 +++ set_soenv.in
202 @@ -1757,8 +1757,12 @@ ToFile( "ENABLE_GIO", "@ENABLE_GIO@", "e" );
203 ToFile( "ENABLE_KDE", "@ENABLE_KDE@", "e" );
204 ToFile( "KDE_CFLAGS", "@KDE_CFLAGS@", "e" );
205 ToFile( "KDE_LIBS", "@KDE_LIBS@", "e" );
206 -ToFile( "ENABLE_KAB", "@ENABLE_KAB@", "e" );
207 ToFile( "MOC", "@MOC@", "e" );
208 +ToFile( "ENABLE_KDE4", "@ENABLE_KDE4@", "e" );
209 +ToFile( "KDE4_CFLAGS", "@KDE4_CFLAGS@", "e" );
210 +ToFile( "KDE4_LIBS", "@KDE4_LIBS@", "e" );
211 +ToFile( "MOC4", "@MOC4@", "e" );
212 +ToFile( "ENABLE_KAB", "@ENABLE_KAB@", "e" );
213 ToFile( "PSPRINT", "TRUE", "e" );
214 ToFile( "MKDEPENDSOLVER", "TRUE", "e" );
215 #