Lines 16-23
Link Here
|
16 |
|
16 |
|
17 |
dnl You should have received a copy of the GNU Library General Public License |
17 |
dnl You should have received a copy of the GNU Library General Public License |
18 |
dnl along with this library; see the file COPYING.LIB. If not, write to |
18 |
dnl along with this library; see the file COPYING.LIB. If not, write to |
19 |
dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
19 |
dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
20 |
dnl Boston, MA 02111-1307, USA. |
20 |
dnl Boston, MA 02110-1301, USA. |
21 |
|
21 |
|
22 |
dnl IMPORTANT NOTE: |
22 |
dnl IMPORTANT NOTE: |
23 |
dnl Please do not modify this file unless you expect your modifications to be |
23 |
dnl Please do not modify this file unless you expect your modifications to be |
Lines 96-102
Link Here
|
96 |
# Don't add to $LIBS permanently. |
96 |
# Don't add to $LIBS permanently. |
97 |
ac_save_LIBS="$LIBS" |
97 |
ac_save_LIBS="$LIBS" |
98 |
LIBS="-l$x_direct_test_library $LIBS" |
98 |
LIBS="-l$x_direct_test_library $LIBS" |
99 |
AC_TRY_LINK(, [${x_direct_test_function}()], |
99 |
AC_TRY_LINK([#include <X11/Intrinsic.h>], [${x_direct_test_function}(1)], |
100 |
[LIBS="$ac_save_LIBS" |
100 |
[LIBS="$ac_save_LIBS" |
101 |
# We can link X programs with no special library path. |
101 |
# We can link X programs with no special library path. |
102 |
ac_x_libraries=], |
102 |
ac_x_libraries=], |
Lines 561-588
Link Here
|
561 |
AC_DEFUN([KDE_SUBST_PROGRAMS], |
561 |
AC_DEFUN([KDE_SUBST_PROGRAMS], |
562 |
[ |
562 |
[ |
563 |
AC_ARG_WITH(arts, |
563 |
AC_ARG_WITH(arts, |
564 |
AC_HELP_STRING([--without-arts],[build without aRts [default=yes]]), |
564 |
AC_HELP_STRING([--without-arts],[build without aRts [default=no]]), |
565 |
[build_arts=$withval], |
565 |
[build_arts=$withval], |
566 |
[build_arts=yes] |
566 |
[build_arts=yes] |
567 |
) |
567 |
) |
568 |
AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no") |
568 |
AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no") |
|
|
569 |
if test "$build_arts" = "no"; then |
570 |
AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts]) |
571 |
fi |
569 |
|
572 |
|
570 |
KDE_SET_DEFAULT_BINDIRS |
573 |
KDE_SET_DEFAULT_BINDIRS |
571 |
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs" |
574 |
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs" |
572 |
KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)]) |
575 |
KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)]) |
573 |
KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)]) |
576 |
KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)]) |
574 |
if test "$build_arts" != "no"; then |
577 |
if test "$build_arts" '!=' "no"; then |
575 |
KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) |
578 |
KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) |
576 |
KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) |
579 |
KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) |
577 |
fi |
580 |
fi |
578 |
KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) |
581 |
KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) |
579 |
|
582 |
|
580 |
kde32ornewer=1 |
583 |
kde32ornewer=1 |
|
|
584 |
kde33ornewer=1 |
581 |
if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then |
585 |
if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then |
582 |
kde32ornewer= |
586 |
kde32ornewer= |
|
|
587 |
kde33ornewer= |
583 |
else |
588 |
else |
584 |
if test "$kde_qtver" = "3" && test "$kde_qtsubver" -le 1; then |
589 |
if test "$kde_qtver" = "3"; then |
|
|
590 |
if test "$kde_qtsubver" -le 1; then |
585 |
kde32ornewer= |
591 |
kde32ornewer= |
|
|
592 |
fi |
593 |
if test "$kde_qtsubver" -le 2; then |
594 |
kde33ornewer= |
595 |
fi |
596 |
if test "$KDECONFIG" != "compiled"; then |
597 |
if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then |
598 |
kde33ornewer= |
599 |
fi |
600 |
fi |
586 |
fi |
601 |
fi |
587 |
fi |
602 |
fi |
588 |
|
603 |
|
Lines 590-598
Link Here
|
590 |
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) |
605 |
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) |
591 |
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) |
606 |
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) |
592 |
fi |
607 |
fi |
593 |
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""]) |
608 |
if test -n "$kde33ornewer"; then |
|
|
609 |
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) |
610 |
AC_SUBST(MAKEKDEWIDGETS) |
611 |
fi |
612 |
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) |
594 |
|
613 |
|
595 |
if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then |
614 |
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then |
596 |
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" |
615 |
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" |
597 |
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" |
616 |
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" |
598 |
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) |
617 |
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) |
Lines 759-768
Link Here
|
759 |
# darwin requires a poll emulation library |
778 |
# darwin requires a poll emulation library |
760 |
AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll") |
779 |
AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll") |
761 |
|
780 |
|
|
|
781 |
# for some image handling on Mac OS X |
782 |
AC_CHECK_HEADERS(Carbon/Carbon.h) |
783 |
|
762 |
# CoreAudio framework |
784 |
# CoreAudio framework |
763 |
AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [ |
785 |
AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [ |
764 |
AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API]) |
786 |
AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API]) |
765 |
FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio" |
787 |
FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio" |
766 |
]) |
788 |
]) |
767 |
|
789 |
|
768 |
AC_CHECK_RES_INIT |
790 |
AC_CHECK_RES_INIT |
Lines 786-791
Link Here
|
786 |
KDE_CHECK_TYPES |
808 |
KDE_CHECK_TYPES |
787 |
KDE_CHECK_LIBDL |
809 |
KDE_CHECK_LIBDL |
788 |
KDE_CHECK_STRLCPY |
810 |
KDE_CHECK_STRLCPY |
|
|
811 |
KDE_CHECK_PIE_SUPPORT |
789 |
|
812 |
|
790 |
# darwin needs this to initialize the environment |
813 |
# darwin needs this to initialize the environment |
791 |
AC_CHECK_HEADERS(crt_externs.h) |
814 |
AC_CHECK_HEADERS(crt_externs.h) |
Lines 870-875
Link Here
|
870 |
kde_use_qt_mac=no |
893 |
kde_use_qt_mac=no |
871 |
) |
894 |
) |
872 |
|
895 |
|
|
|
896 |
# used to disable x11-specific stuff on special platforms |
897 |
AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no") |
898 |
|
873 |
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then |
899 |
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then |
874 |
|
900 |
|
875 |
AC_MSG_CHECKING(for X) |
901 |
AC_MSG_CHECKING(for X) |
Lines 957-963
Link Here
|
957 |
X_INCLUDES="-I$x_includes" |
983 |
X_INCLUDES="-I$x_includes" |
958 |
fi |
984 |
fi |
959 |
|
985 |
|
960 |
if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then |
986 |
if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then |
961 |
X_LDFLAGS="" |
987 |
X_LDFLAGS="" |
962 |
x_libraries="/usr/lib"; dnl better than nothing :- |
988 |
x_libraries="/usr/lib"; dnl better than nothing :- |
963 |
else |
989 |
else |
Lines 965-971
Link Here
|
965 |
X_LDFLAGS="-L$x_libraries" |
991 |
X_LDFLAGS="-L$x_libraries" |
966 |
fi |
992 |
fi |
967 |
all_includes="$X_INCLUDES" |
993 |
all_includes="$X_INCLUDES" |
968 |
all_libraries="$X_LDFLAGS" |
994 |
all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS" |
969 |
|
995 |
|
970 |
# Check for libraries that X11R6 Xt/Xaw programs need. |
996 |
# Check for libraries that X11R6 Xt/Xaw programs need. |
971 |
ac_save_LDFLAGS="$LDFLAGS" |
997 |
ac_save_LDFLAGS="$LDFLAGS" |
Lines 1127-1135
Link Here
|
1127 |
AC_DEFUN([KDE_USE_QT], |
1153 |
AC_DEFUN([KDE_USE_QT], |
1128 |
[ |
1154 |
[ |
1129 |
if test -z "$1"; then |
1155 |
if test -z "$1"; then |
1130 |
# Current default Qt version: 3.2 |
1156 |
# Current default Qt version: 3.3 |
1131 |
kde_qtver=3 |
1157 |
kde_qtver=3 |
1132 |
kde_qtsubver=2 |
1158 |
kde_qtsubver=3 |
1133 |
else |
1159 |
else |
1134 |
kde_qtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'` |
1160 |
kde_qtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'` |
1135 |
# following is the check if subversion isnt found in passed argument |
1161 |
# following is the check if subversion isnt found in passed argument |
Lines 1153-1164
Link Here
|
1153 |
if test "$kde_qtver" = "3"; then |
1179 |
if test "$kde_qtver" = "3"; then |
1154 |
if test $kde_qtsubver -gt 0; then |
1180 |
if test $kde_qtsubver -gt 0; then |
1155 |
if test $kde_qtsubver -gt 1; then |
1181 |
if test $kde_qtsubver -gt 1; then |
1156 |
kde_qt_minversion=">= Qt 3.2" |
1182 |
if test $kde_qtsubver -gt 2; then |
|
|
1183 |
kde_qt_minversion=">= Qt 3.3 and < 4.0" |
1184 |
else |
1185 |
kde_qt_minversion=">= Qt 3.2 and < 4.0" |
1186 |
fi |
1157 |
else |
1187 |
else |
1158 |
kde_qt_minversion=">= Qt 3.1 (20021021)" |
1188 |
kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0" |
1159 |
fi |
1189 |
fi |
1160 |
else |
1190 |
else |
1161 |
kde_qt_minversion=">= Qt 3.0" |
1191 |
kde_qt_minversion=">= Qt 3.0 and < 4.0" |
1162 |
fi |
1192 |
fi |
1163 |
fi |
1193 |
fi |
1164 |
if test "$kde_qtver" = "1"; then |
1194 |
if test "$kde_qtver" = "1"; then |
Lines 1171-1181
Link Here
|
1171 |
if test -z "$3"; then |
1201 |
if test -z "$3"; then |
1172 |
if test $kde_qtver = 3; then |
1202 |
if test $kde_qtver = 3; then |
1173 |
if test $kde_qtsubver -gt 0; then |
1203 |
if test $kde_qtsubver -gt 0; then |
1174 |
kde_qt_verstring="QT_VERSION >= 0x03@VER@00" |
1204 |
kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000" |
1175 |
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` |
1205 |
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` |
1176 |
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` |
1206 |
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` |
1177 |
else |
1207 |
else |
1178 |
kde_qt_verstring="QT_VERSION >= 300" |
1208 |
kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000" |
1179 |
fi |
1209 |
fi |
1180 |
fi |
1210 |
fi |
1181 |
if test $kde_qtver = 2; then |
1211 |
if test $kde_qtver = 2; then |
Lines 1192-1199
Link Here
|
1192 |
kde_qt_verstring="$3" |
1222 |
kde_qt_verstring="$3" |
1193 |
fi |
1223 |
fi |
1194 |
|
1224 |
|
|
|
1225 |
if test $kde_qtver = 4; then |
1226 |
kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4" |
1227 |
fi |
1195 |
if test $kde_qtver = 3; then |
1228 |
if test $kde_qtver = 3; then |
1196 |
kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" |
1229 |
kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3" |
|
|
1230 |
if test -z "$PKG_CONFIG"; then |
1231 |
AC_PATH_PROG(PKG_CONFIG, pkg-config, no) |
1232 |
fi |
1233 |
if test "$PKG_CONFIG" != "no" ; then |
1234 |
if $PKG_CONFIG --exists qt-mt ; then |
1235 |
kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`" |
1236 |
fi |
1237 |
fi |
1197 |
fi |
1238 |
fi |
1198 |
if test $kde_qtver = 2; then |
1239 |
if test $kde_qtver = 2; then |
1199 |
kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt" |
1240 |
kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt" |
Lines 1323-1344
Link Here
|
1323 |
fi |
1364 |
fi |
1324 |
fi |
1365 |
fi |
1325 |
|
1366 |
|
1326 |
if test -z "$LIBQT"; then |
|
|
1327 |
dnl ------------------------------------------------------------ |
1367 |
dnl ------------------------------------------------------------ |
1328 |
dnl If we got --enable-embedded then adjust the Qt library name. |
1368 |
dnl If we got --enable-embedded then adjust the Qt library name. |
1329 |
dnl ------------------------------------------------------------ |
1369 |
dnl ------------------------------------------------------------ |
1330 |
if test "x$kde_use_qt_emb" = "xyes"; then |
1370 |
if test "x$kde_use_qt_emb" = "xyes"; then |
1331 |
qtlib="qte" |
1371 |
qtlib="qte" |
1332 |
else |
|
|
1333 |
qtlib="qt" |
1334 |
fi |
1335 |
|
1336 |
kde_int_qt="-l$qtlib" |
1337 |
else |
1372 |
else |
1338 |
kde_int_qt="$LIBQT" |
1373 |
qtlib="qt" |
1339 |
kde_lib_qt_set=yes |
|
|
1340 |
fi |
1374 |
fi |
1341 |
|
1375 |
|
|
|
1376 |
kde_int_qt="-l$qtlib" |
1377 |
|
1342 |
if test -z "$LIBQPE"; then |
1378 |
if test -z "$LIBQPE"; then |
1343 |
dnl ------------------------------------------------------------ |
1379 |
dnl ------------------------------------------------------------ |
1344 |
dnl If we got --enable-palmtop then add -lqpe to the link line |
1380 |
dnl If we got --enable-palmtop then add -lqpe to the link line |
Lines 1359-1371
Link Here
|
1359 |
dnl ------------------------------------------------------------------------ |
1395 |
dnl ------------------------------------------------------------------------ |
1360 |
|
1396 |
|
1361 |
if test "x$kde_use_qt_mt" = "xyes"; then |
1397 |
if test "x$kde_use_qt_mt" = "xyes"; then |
1362 |
if test -z "$LIBQT"; then |
1398 |
LIBQT="-l$qtlib-mt" |
1363 |
LIBQT="-l$qtlib-mt" |
1399 |
kde_int_qt="-l$qtlib-mt" |
1364 |
kde_int_qt="-l$qtlib-mt" |
|
|
1365 |
else |
1366 |
LIBQT="$qtlib-mt" |
1367 |
kde_int_qt="$qtlib-mt" |
1368 |
fi |
1369 |
LIBQT_GLOB="lib$qtlib-mt.*" |
1400 |
LIBQT_GLOB="lib$qtlib-mt.*" |
1370 |
USING_QT_MT="using -mt" |
1401 |
USING_QT_MT="using -mt" |
1371 |
else |
1402 |
else |
Lines 1420-1425
Link Here
|
1420 |
for dir in $kde_qt_dirs; do |
1451 |
for dir in $kde_qt_dirs; do |
1421 |
qt_incdirs="$qt_incdirs $dir/include $dir" |
1452 |
qt_incdirs="$qt_incdirs $dir/include $dir" |
1422 |
done |
1453 |
done |
|
|
1454 |
if test -z "$PKG_CONFIG"; then |
1455 |
AC_PATH_PROG(PKG_CONFIG, pkg-config, no) |
1456 |
fi |
1457 |
if test "$PKG_CONFIG" != "no" ; then |
1458 |
if $PKG_CONFIG --exists qt-mt ; then |
1459 |
qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`" |
1460 |
fi |
1461 |
fi |
1423 |
qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes" |
1462 |
qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes" |
1424 |
if test ! "$ac_qt_includes" = "NO"; then |
1463 |
if test ! "$ac_qt_includes" = "NO"; then |
1425 |
qt_incdirs="$ac_qt_includes $qt_incdirs" |
1464 |
qt_incdirs="$ac_qt_includes $qt_incdirs" |
Lines 1436-1443
Link Here
|
1436 |
|
1475 |
|
1437 |
qt_libdirs="" |
1476 |
qt_libdirs="" |
1438 |
for dir in $kde_qt_dirs; do |
1477 |
for dir in $kde_qt_dirs; do |
1439 |
qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" |
1478 |
qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir" |
1440 |
done |
1479 |
done |
|
|
1480 |
if test -z "$PKG_CONFIG"; then |
1481 |
AC_PATH_PROG(PKG_CONFIG, pkg-config, no) |
1482 |
fi |
1483 |
if test "$PKG_CONFIG" != "no" ; then |
1484 |
if $PKG_CONFIG --exists qt-mt ; then |
1485 |
qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`" |
1486 |
fi |
1487 |
fi |
1441 |
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" |
1488 |
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" |
1442 |
if test ! "$ac_qt_libraries" = "NO"; then |
1489 |
if test ! "$ac_qt_libraries" = "NO"; then |
1443 |
qt_libdir=$ac_qt_libraries |
1490 |
qt_libdir=$ac_qt_libraries |
Lines 1543-1549
Link Here
|
1543 |
QT_LDFLAGS="" |
1590 |
QT_LDFLAGS="" |
1544 |
else |
1591 |
else |
1545 |
QT_LDFLAGS="-L$qt_libraries" |
1592 |
QT_LDFLAGS="-L$qt_libraries" |
1546 |
all_libraries="$all_libraries $QT_LDFLAGS" |
1593 |
all_libraries="$QT_LDFLAGS $all_libraries" |
1547 |
fi |
1594 |
fi |
1548 |
test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS" |
1595 |
test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS" |
1549 |
|
1596 |
|
Lines 1620-1626
Link Here
|
1620 |
|
1667 |
|
1621 |
AC_MSG_RESULT([$kde_cv_uic_plugins]) |
1668 |
AC_MSG_RESULT([$kde_cv_uic_plugins]) |
1622 |
if test "$kde_cv_uic_plugins" != yes; then |
1669 |
if test "$kde_cv_uic_plugins" != yes; then |
1623 |
AC_MSG_ERROR([you need to install kdelibs first.]) |
1670 |
AC_MSG_ERROR([ |
|
|
1671 |
you need to install kdelibs first. |
1672 |
|
1673 |
If you did install kdelibs, then the Qt version that is picked up by |
1674 |
this configure is not the same version you used to compile kdelibs. |
1675 |
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the |
1676 |
_same Qt version_, compiled with the _same compiler_ and the same Qt |
1677 |
configuration settings. |
1678 |
]) |
1624 |
fi |
1679 |
fi |
1625 |
fi |
1680 |
fi |
1626 |
]) |
1681 |
]) |
Lines 1673-1678
Link Here
|
1673 |
AC_SUBST(KDE_NO_UNDEFINED) |
1728 |
AC_SUBST(KDE_NO_UNDEFINED) |
1674 |
]) |
1729 |
]) |
1675 |
|
1730 |
|
|
|
1731 |
dnl Check if the linker supports --enable-new-dtags and --as-needed |
1732 |
AC_DEFUN([KDE_CHECK_NEW_LDFLAGS], |
1733 |
[ |
1734 |
AC_ARG_ENABLE(new_ldflags, |
1735 |
AC_HELP_STRING([--enable-new-ldflags], |
1736 |
[enable the new linker flags]), |
1737 |
kde_use_new_ldflags=$enableval, |
1738 |
kde_use_new_ldflags=no) |
1739 |
|
1740 |
LDFLAGS_AS_NEEDED="" |
1741 |
LDFLAGS_NEW_DTAGS="" |
1742 |
if test "x$kde_use_new_ldflags" = "xyes"; then |
1743 |
LDFLAGS_NEW_DTAGS="" |
1744 |
KDE_CHECK_COMPILER_FLAG([Wl,--enable-new-dtags], |
1745 |
[LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"],) |
1746 |
|
1747 |
KDE_CHECK_COMPILER_FLAG([Wl,--as-needed], |
1748 |
[LDFLAGS_AS_NEEDED="-Wl,--as-needed"],) |
1749 |
fi |
1750 |
AC_SUBST(LDFLAGS_AS_NEEDED) |
1751 |
AC_SUBST(LDFLAGS_NEW_DTAGS) |
1752 |
]) |
1753 |
|
1676 |
AC_DEFUN([KDE_CHECK_NMCHECK], |
1754 |
AC_DEFUN([KDE_CHECK_NMCHECK], |
1677 |
[ |
1755 |
[ |
1678 |
AC_ARG_ENABLE(nmcheck,AC_HELP_STRING([--enable-nmcheck],[enable automatic namespace cleanness check]), |
1756 |
AC_ARG_ENABLE(nmcheck,AC_HELP_STRING([--enable-nmcheck],[enable automatic namespace cleanness check]), |
Lines 1833-1839
Link Here
|
1833 |
|
1911 |
|
1834 |
KDE_LDFLAGS="-L$kde_libraries" |
1912 |
KDE_LDFLAGS="-L$kde_libraries" |
1835 |
if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then |
1913 |
if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then |
1836 |
all_libraries="$all_libraries $KDE_LDFLAGS" |
1914 |
all_libraries="$KDE_LDFLAGS $all_libraries" |
1837 |
fi |
1915 |
fi |
1838 |
|
1916 |
|
1839 |
AC_SUBST(KDE_LDFLAGS) |
1917 |
AC_SUBST(KDE_LDFLAGS) |
Lines 2009-2017
Link Here
|
2009 |
AC_REQUIRE([K_PATH_X]) |
2087 |
AC_REQUIRE([K_PATH_X]) |
2010 |
|
2088 |
|
2011 |
if test $kde_qtver = 3; then |
2089 |
if test $kde_qtver = 3; then |
|
|
2090 |
case $host in |
2091 |
*cygwin*) lib_kded="-lkdeinit_kded" ;; |
2092 |
*) lib_kded="" ;; |
2093 |
esac |
2094 |
AC_SUBST(LIB_KDED, $lib_kded) |
2012 |
AC_SUBST(LIB_KDECORE, "-lkdecore") |
2095 |
AC_SUBST(LIB_KDECORE, "-lkdecore") |
2013 |
AC_SUBST(LIB_KDEUI, "-lkdeui") |
2096 |
AC_SUBST(LIB_KDEUI, "-lkdeui") |
2014 |
AC_SUBST(LIB_KIO, "-lkio") |
2097 |
AC_SUBST(LIB_KIO, "-lkio") |
|
|
2098 |
AC_SUBST(LIB_KJS, "-lkjs") |
2015 |
AC_SUBST(LIB_SMB, "-lsmb") |
2099 |
AC_SUBST(LIB_SMB, "-lsmb") |
2016 |
AC_SUBST(LIB_KAB, "-lkab") |
2100 |
AC_SUBST(LIB_KAB, "-lkab") |
2017 |
AC_SUBST(LIB_KABC, "-lkabc") |
2101 |
AC_SUBST(LIB_KABC, "-lkabc") |
Lines 2021-2026
Link Here
|
2021 |
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") |
2105 |
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") |
2022 |
AC_SUBST(LIB_KUTILS, "-lkutils") |
2106 |
AC_SUBST(LIB_KUTILS, "-lkutils") |
2023 |
AC_SUBST(LIB_KDEPIM, "-lkdepim") |
2107 |
AC_SUBST(LIB_KDEPIM, "-lkdepim") |
|
|
2108 |
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") |
2109 |
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") |
2110 |
AC_SUBST(LIB_KDNSSD, "-lkdnssd") |
2111 |
AC_SUBST(LIB_KUNITTEST, "-lkunittest") |
2024 |
# these are for backward compatibility |
2112 |
# these are for backward compatibility |
2025 |
AC_SUBST(LIB_KSYCOCA, "-lkio") |
2113 |
AC_SUBST(LIB_KSYCOCA, "-lkio") |
2026 |
AC_SUBST(LIB_KFILE, "-lkio") |
2114 |
AC_SUBST(LIB_KFILE, "-lkio") |
Lines 2274-2279
Link Here
|
2274 |
[MKSTEMPS]) |
2362 |
[MKSTEMPS]) |
2275 |
]) |
2363 |
]) |
2276 |
|
2364 |
|
|
|
2365 |
AC_DEFUN([AC_CHECK_MKSTEMP], |
2366 |
[ |
2367 |
KDE_CHECK_FUNC_EXT(mkstemp, [ |
2368 |
#include <stdlib.h> |
2369 |
#include <unistd.h> |
2370 |
], |
2371 |
[ |
2372 |
mkstemp("/tmp/aaaXXXXXX"); |
2373 |
], |
2374 |
[int mkstemp(char *)], |
2375 |
[MKSTEMP]) |
2376 |
]) |
2377 |
|
2277 |
AC_DEFUN([AC_CHECK_MKDTEMP], |
2378 |
AC_DEFUN([AC_CHECK_MKDTEMP], |
2278 |
[ |
2379 |
[ |
2279 |
KDE_CHECK_FUNC_EXT(mkdtemp, [ |
2380 |
KDE_CHECK_FUNC_EXT(mkdtemp, [ |
Lines 2313-2335
Link Here
|
2313 |
LIBS=$kde_libs_safe |
2414 |
LIBS=$kde_libs_safe |
2314 |
AC_SUBST(LIBRESOLV) |
2415 |
AC_SUBST(LIBRESOLV) |
2315 |
|
2416 |
|
2316 |
AC_MSG_CHECKING([if res_init is available]) |
2417 |
KDE_CHECK_FUNC_EXT(res_init, |
2317 |
AC_TRY_COMPILE( |
|
|
2318 |
[ |
2418 |
[ |
2319 |
#include <sys/types.h> |
2419 |
#include <sys/types.h> |
2320 |
#include <netinet/in.h> |
2420 |
#include <netinet/in.h> |
2321 |
#include <arpa/nameser.h> |
2421 |
#include <arpa/nameser.h> |
2322 |
#include <resolv.h> |
2422 |
#include <resolv.h> |
2323 |
], |
2423 |
], |
2324 |
[ |
2424 |
[res_init()], |
2325 |
res_init(); |
2425 |
[int res_init(void)], |
2326 |
], |
2426 |
[RES_INIT]) |
2327 |
[ |
|
|
2328 |
AC_MSG_RESULT(yes) |
2329 |
AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function]) |
2330 |
], |
2331 |
[ AC_MSG_RESULT(no) ] |
2332 |
) |
2333 |
]) |
2427 |
]) |
2334 |
|
2428 |
|
2335 |
AC_DEFUN([AC_CHECK_STRLCPY], |
2429 |
AC_DEFUN([AC_CHECK_STRLCPY], |
Lines 2357-2362
Link Here
|
2357 |
[STRLCAT]) |
2451 |
[STRLCAT]) |
2358 |
]) |
2452 |
]) |
2359 |
|
2453 |
|
|
|
2454 |
AC_DEFUN([AC_CHECK_RES_QUERY], |
2455 |
[ |
2456 |
KDE_CHECK_FUNC_EXT(res_query, [ |
2457 |
#include <sys/types.h> |
2458 |
#include <netinet/in.h> |
2459 |
#include <arpa/nameser.h> |
2460 |
#include <resolv.h> |
2461 |
#include <netdb.h> |
2462 |
], |
2463 |
[ |
2464 |
res_query(NULL, 0, 0, NULL, 0); |
2465 |
], |
2466 |
[int res_query(const char *, int, int, unsigned char *, int)], |
2467 |
[RES_QUERY]) |
2468 |
]) |
2469 |
|
2470 |
AC_DEFUN([AC_CHECK_DN_SKIPNAME], |
2471 |
[ |
2472 |
KDE_CHECK_FUNC_EXT(dn_skipname, [ |
2473 |
#include <sys/types.h> |
2474 |
#include <netinet/in.h> |
2475 |
#include <arpa/nameser.h> |
2476 |
#include <resolv.h> |
2477 |
], |
2478 |
[ |
2479 |
dn_skipname (NULL, NULL); |
2480 |
], |
2481 |
[int dn_skipname (unsigned char *, unsigned char *)], |
2482 |
[DN_SKIPNAME]) |
2483 |
]) |
2484 |
|
2485 |
|
2360 |
AC_DEFUN([AC_FIND_GIF], |
2486 |
AC_DEFUN([AC_FIND_GIF], |
2361 |
[AC_MSG_CHECKING([for giflib]) |
2487 |
[AC_MSG_CHECKING([for giflib]) |
2362 |
AC_CACHE_VAL(ac_cv_lib_gif, |
2488 |
AC_CACHE_VAL(ac_cv_lib_gif, |
Lines 2401-2422
Link Here
|
2401 |
ac_save_CFLAGS="$CFLAGS" |
2527 |
ac_save_CFLAGS="$CFLAGS" |
2402 |
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" |
2528 |
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" |
2403 |
AC_TRY_LINK( |
2529 |
AC_TRY_LINK( |
2404 |
[/* Override any gcc2 internal prototype to avoid an error. */ |
2530 |
[ |
2405 |
struct jpeg_decompress_struct; |
|
|
2406 |
typedef struct jpeg_decompress_struct * j_decompress_ptr; |
2407 |
typedef int size_t; |
2408 |
#ifdef __cplusplus |
2531 |
#ifdef __cplusplus |
2409 |
extern "C" { |
2532 |
extern "C" { |
2410 |
#endif |
2533 |
#endif |
2411 |
void jpeg_CreateDecompress(j_decompress_ptr cinfo, |
2534 |
void jpeg_CreateDecompress(); |
2412 |
int version, size_t structsize); |
|
|
2413 |
#ifdef __cplusplus |
2535 |
#ifdef __cplusplus |
2414 |
} |
2536 |
} |
2415 |
#endif |
2537 |
#endif |
2416 |
/* We use char because int might match the return type of a gcc2 |
|
|
2417 |
builtin and then its argument prototype would still apply. */ |
2418 |
], |
2538 |
], |
2419 |
[jpeg_CreateDecompress(0L, 0, 0);], |
2539 |
[jpeg_CreateDecompress();], |
2420 |
eval "ac_cv_lib_jpeg_$1=-ljpeg$2", |
2540 |
eval "ac_cv_lib_jpeg_$1=-ljpeg$2", |
2421 |
eval "ac_cv_lib_jpeg_$1=no") |
2541 |
eval "ac_cv_lib_jpeg_$1=no") |
2422 |
LIBS="$ac_save_LIBS" |
2542 |
LIBS="$ac_save_LIBS" |
Lines 2535-2540
Link Here
|
2535 |
AC_TRY_LINK(dnl |
2655 |
AC_TRY_LINK(dnl |
2536 |
[ |
2656 |
[ |
2537 |
#include<zlib.h> |
2657 |
#include<zlib.h> |
|
|
2658 |
#include<string.h> |
2538 |
], |
2659 |
], |
2539 |
[ |
2660 |
[ |
2540 |
char buf[42]; |
2661 |
char buf[42]; |
Lines 2542-2548
Link Here
|
2542 |
/* this would segfault.. but we only link, don't run */ |
2663 |
/* this would segfault.. but we only link, don't run */ |
2543 |
(void) gzgets(f, buf, sizeof(buf)); |
2664 |
(void) gzgets(f, buf, sizeof(buf)); |
2544 |
|
2665 |
|
2545 |
return (zlibVersion() == ZLIB_VERSION); |
2666 |
return (strcmp(zlibVersion(), ZLIB_VERSION) == 0); |
2546 |
], |
2667 |
], |
2547 |
eval "ac_cv_lib_z='-lz'", |
2668 |
eval "ac_cv_lib_z='-lz'", |
2548 |
eval "ac_cv_lib_z=no") |
2669 |
eval "ac_cv_lib_z=no") |
Lines 2623-2628
Link Here
|
2623 |
AC_SUBST(LIBTIFF) |
2744 |
AC_SUBST(LIBTIFF) |
2624 |
]) |
2745 |
]) |
2625 |
|
2746 |
|
|
|
2747 |
AC_DEFUN([KDE_FIND_LIBEXR], |
2748 |
[ |
2749 |
AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) |
2750 |
AC_REQUIRE([AC_FIND_ZLIB]) |
2751 |
AC_CACHE_VAL(ac_cv_libexr, |
2752 |
[ |
2753 |
if test -z "$PKG_CONFIG"; then |
2754 |
AC_PATH_PROG(PKG_CONFIG, pkg-config, no) |
2755 |
fi |
2756 |
|
2757 |
AC_MSG_CHECKING([for OpenEXR libraries]) |
2758 |
|
2759 |
if test "$PKG_CONFIG" = "no" ; then |
2760 |
AC_MSG_RESULT(no) |
2761 |
echo "*** The pkg-config script could not be found. Make sure it is" |
2762 |
echo "*** in your path, or set the PKG_CONFIG environment variable" |
2763 |
echo "*** to the full path to pkg-config." |
2764 |
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." |
2765 |
else |
2766 |
if ! $PKG_CONFIG --exists OpenEXR ; then |
2767 |
AC_MSG_RESULT(no) |
2768 |
EXRSTATUS=no |
2769 |
else |
2770 |
if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then |
2771 |
AC_MSG_RESULT(no) |
2772 |
EXRSTATUS=old |
2773 |
else |
2774 |
kde_save_LIBS="$LIBS" |
2775 |
LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ" |
2776 |
AC_LANG_SAVE |
2777 |
AC_LANG_CPLUSPLUS |
2778 |
kde_save_CXXFLAGS="$CXXFLAGS" |
2779 |
EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR` |
2780 |
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS" |
2781 |
|
2782 |
AC_TRY_LINK(dnl |
2783 |
[ |
2784 |
#include <ImfRgbaFile.h> |
2785 |
], |
2786 |
[ |
2787 |
using namespace Imf; |
2788 |
RgbaInputFile file ("dummy"); |
2789 |
return 0; |
2790 |
], |
2791 |
eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'", |
2792 |
eval "ac_cv_libexr=no" |
2793 |
) |
2794 |
LIBS="$kde_save_LIBS" |
2795 |
CXXFLAGS="$kde_save_CXXFLAGS" |
2796 |
AC_LANG_RESTORE |
2797 |
])dnl |
2798 |
if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then |
2799 |
AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR]) |
2800 |
LIB_EXR="$ac_cv_libexr" |
2801 |
AC_MSG_RESULT($ac_cv_libexr) |
2802 |
else |
2803 |
AC_MSG_RESULT(no) |
2804 |
LIB_EXR="" |
2805 |
fi |
2806 |
fi |
2807 |
fi |
2808 |
fi |
2809 |
AC_SUBST(LIB_EXR) |
2810 |
AC_SUBST(EXR_FLAGS) |
2811 |
]) |
2812 |
|
2813 |
|
2626 |
|
2814 |
|
2627 |
AC_DEFUN([AC_FIND_PNG], |
2815 |
AC_DEFUN([AC_FIND_PNG], |
2628 |
[ |
2816 |
[ |
Lines 2811-2816
Link Here
|
2811 |
fi |
2999 |
fi |
2812 |
]) |
3000 |
]) |
2813 |
|
3001 |
|
|
|
3002 |
|
3003 |
AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER], |
3004 |
[ |
3005 |
AC_MSG_CHECKING([whether $CC is blacklisted]) |
3006 |
|
3007 |
dnl In theory we have tu run this test against $CC and $CXX |
3008 |
dnl in C and in C++ mode, because its perfectly legal for |
3009 |
dnl the user to mix compiler versions, since C has a defined |
3010 |
dnl ABI. |
3011 |
dnl |
3012 |
dnl For now, we assume the user is not on crack. |
3013 |
|
3014 |
AC_TRY_COMPILE([ |
3015 |
#ifdef __GNUC__ |
3016 |
#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0 |
3017 |
choke me |
3018 |
#endif |
3019 |
#endif |
3020 |
], , |
3021 |
kde_bad_compiler=no, |
3022 |
kde_bad_compiler=yes |
3023 |
) |
3024 |
|
3025 |
AC_MSG_RESULT($kde_bad_compiler) |
3026 |
|
3027 |
if test "$kde_bad_compiler" = "yes"; then |
3028 |
AC_MSG_ERROR([ |
3029 |
|
3030 |
This particular compiler version is blacklisted because it |
3031 |
is known to miscompile KDE. Please use a newer version, or |
3032 |
if that is not yet available, choose an older version. |
3033 |
|
3034 |
Please do not report a bug or bother us reporting this |
3035 |
configure error. We know about it, and we introduced |
3036 |
it by intention to avoid untraceable bugs or crashes in KDE. |
3037 |
|
3038 |
]) |
3039 |
fi |
3040 |
|
3041 |
]) |
3042 |
|
3043 |
|
3044 |
AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH], |
3045 |
[ |
3046 |
AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline], |
3047 |
kde_cv_opt_noinline_match, |
3048 |
[ |
3049 |
kde_cv_opt_noinline_match=irrelevant |
3050 |
dnl if we don't use both -O2 and -fno-inline, this check is moot |
3051 |
if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \ |
3052 |
&& echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then |
3053 |
|
3054 |
ac_cflags_save="$CFLAGS" |
3055 |
CFLAGS="$CFLAGS -D_USE_GNU" |
3056 |
|
3057 |
AC_TRY_LINK([ |
3058 |
#include <string.h> |
3059 |
], [ const char *pt, *et; |
3060 |
et = __extension__ ({ char __a0, __a1, __a2; (__builtin_constant_p ( ";," ) && ((size_t)(const void *)(( ";," )+ 1) - (size_t)(const void *)( ";," ) == 1) ? ((__a0 =((__const char *) ( ";," ))[0], __a0 == '\0') ? ((void) ( pt ),((void *)0) ) : ((__a1 = ((__const char *) ( ";," ))[1], __a1== '\0') ? (__extension__ (__builtin_constant_p ( __a0 ) && ( __a0 ) == '\0' ? (char *) __rawmemchr ( pt , __a0) : strchr( pt , __a0 ))) : ((__a2 = ((__const char *) ( ";," ))[2], __a2 == '\0') ? __strpbrk_c2 ( pt , __a0, __a1) :(((__const char *) ( ";," ))[3] == '\0' ? __strpbrk_c3 ( pt ,__a0, __a1, __a2): strpbrk ( pt , ";," ))))) : strpbrk ( pt , ";," )); }) ; |
3061 |
], |
3062 |
kde_cv_opt_noinline_match=yes, |
3063 |
kde_cv_opt_noinline_match=no |
3064 |
) |
3065 |
|
3066 |
CFLAGS="$ac_cflags_save" |
3067 |
fi |
3068 |
]) |
3069 |
]) |
3070 |
|
3071 |
|
2814 |
dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given |
3072 |
dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given |
2815 |
AC_DEFUN([AC_VALIDIFY_CXXFLAGS], |
3073 |
AC_DEFUN([AC_VALIDIFY_CXXFLAGS], |
2816 |
[dnl |
3074 |
[dnl |
Lines 2864-2870
Link Here
|
2864 |
fi |
3122 |
fi |
2865 |
], [kde_use_strict_options="no"]) |
3123 |
], [kde_use_strict_options="no"]) |
2866 |
|
3124 |
|
2867 |
AC_ARG_ENABLE(warnings,AC_HELP_STRING([--disable-warnings],[disables compilation with -Wall and similiar]), |
3125 |
AC_ARG_ENABLE(warnings,AC_HELP_STRING([--disable-warnings],[disables compilation with -Wall and similar]), |
2868 |
[ |
3126 |
[ |
2869 |
if test $enableval = "no"; then |
3127 |
if test $enableval = "no"; then |
2870 |
kde_use_warnings="no" |
3128 |
kde_use_warnings="no" |
Lines 2895-2901
Link Here
|
2895 |
if test $kde_use_debug_code = "full"; then |
3153 |
if test $kde_use_debug_code = "full"; then |
2896 |
CFLAGS="-g3 -fno-inline $CFLAGS" |
3154 |
CFLAGS="-g3 -fno-inline $CFLAGS" |
2897 |
else |
3155 |
else |
2898 |
CFLAGS="-g -O2 $CFLAGS" |
3156 |
CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS" |
2899 |
fi |
3157 |
fi |
2900 |
else |
3158 |
else |
2901 |
CFLAGS="-O2 $CFLAGS" |
3159 |
CFLAGS="-O2 $CFLAGS" |
Lines 2920-2925
Link Here
|
2920 |
|
3178 |
|
2921 |
AC_PROG_CXX |
3179 |
AC_PROG_CXX |
2922 |
|
3180 |
|
|
|
3181 |
KDE_CHECK_FOR_BAD_COMPILER |
3182 |
|
2923 |
if test "$GXX" = "yes" || test "$CXX" = "KCC"; then |
3183 |
if test "$GXX" = "yes" || test "$CXX" = "KCC"; then |
2924 |
if test "$kde_use_debug_code" != "no"; then |
3184 |
if test "$kde_use_debug_code" != "no"; then |
2925 |
if test "$CXX" = "KCC"; then |
3185 |
if test "$CXX" = "KCC"; then |
Lines 2928-2934
Link Here
|
2928 |
if test "$kde_use_debug_code" = "full"; then |
3188 |
if test "$kde_use_debug_code" = "full"; then |
2929 |
CXXFLAGS="-g3 -fno-inline $CXXFLAGS" |
3189 |
CXXFLAGS="-g3 -fno-inline $CXXFLAGS" |
2930 |
else |
3190 |
else |
2931 |
CXXFLAGS="-g -O2 $CXXFLAGS" |
3191 |
CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS" |
2932 |
fi |
3192 |
fi |
2933 |
fi |
3193 |
fi |
2934 |
KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"]) |
3194 |
KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"]) |
Lines 2941-2947
Link Here
|
2941 |
CXXFLAGS="+K3 $CXXFLAGS" |
3201 |
CXXFLAGS="+K3 $CXXFLAGS" |
2942 |
else |
3202 |
else |
2943 |
CXXFLAGS="-O2 $CXXFLAGS" |
3203 |
CXXFLAGS="-O2 $CXXFLAGS" |
2944 |
fi |
3204 |
fi |
2945 |
fi |
3205 |
fi |
2946 |
fi |
3206 |
fi |
2947 |
|
3207 |
|
Lines 2959-3002
Link Here
|
2959 |
|
3219 |
|
2960 |
if test "$kde_use_warnings" = "yes"; then |
3220 |
if test "$kde_use_warnings" = "yes"; then |
2961 |
if test "$GCC" = "yes"; then |
3221 |
if test "$GCC" = "yes"; then |
2962 |
CXXFLAGS="-Wall -W -Wpointer-arith -Wwrite-strings $CXXFLAGS" |
3222 |
CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS" |
2963 |
case $host in |
3223 |
case $host in |
2964 |
*-*-linux-gnu) |
3224 |
*-*-linux-gnu) |
2965 |
CFLAGS="-ansi -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS" |
3225 |
CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS" |
2966 |
CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS" |
3226 |
CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS" |
2967 |
KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"]) |
3227 |
KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"]) |
2968 |
KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"]) |
3228 |
KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"]) |
2969 |
;; |
3229 |
;; |
2970 |
esac |
3230 |
esac |
2971 |
KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"]) |
3231 |
KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"]) |
2972 |
KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"]) |
3232 |
KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"]) |
2973 |
KDE_CHECK_COMPILER_FLAG(Wnon-virtual-dtor,[CXXFLAGS="-Wnon-virtual-dtor $CXXFLAGS"]) |
3233 |
dnl ### FIXME: revert for KDE 4 |
|
|
3234 |
KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"]) |
2974 |
fi |
3235 |
fi |
2975 |
fi |
3236 |
fi |
2976 |
|
3237 |
|
2977 |
if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then |
3238 |
if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then |
2978 |
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS" |
3239 |
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS" |
2979 |
fi |
3240 |
fi |
2980 |
|
3241 |
|
|
|
3242 |
AC_ARG_ENABLE(pch, |
3243 |
AC_HELP_STRING([--enable-pch], |
3244 |
[enables precompiled header support (currently only KCC or gcc >=3.4+unsermake) [default=no]]), |
3245 |
[ kde_use_pch=$enableval ],[ kde_use_pch=no ]) |
3246 |
|
3247 |
HAVE_GCC_VISIBILITY=0 |
3248 |
AC_SUBST([HAVE_GCC_VISIBILITY]) |
3249 |
|
2981 |
if test "$GXX" = "yes"; then |
3250 |
if test "$GXX" = "yes"; then |
|
|
3251 |
gcc_no_reorder_blocks=NO |
3252 |
KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES]) |
3253 |
if test $kde_use_debug_code != "no" && \ |
3254 |
test $kde_use_debug_code != "full" && \ |
3255 |
test "YES" = "$gcc_no_reorder_blocks" ; then |
3256 |
CXXFLAGS="$CXXFLAGS -fno-reorder-blocks" |
3257 |
CFLAGS="$CFLAGS -fno-reorder-blocks" |
3258 |
fi |
2982 |
KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"]) |
3259 |
KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"]) |
2983 |
KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"]) |
3260 |
KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"]) |
2984 |
KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"]) |
3261 |
KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"]) |
2985 |
KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS= ) |
3262 |
KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS= ) |
|
|
3263 |
ENABLE_PERMISSIVE_FLAG="-fpermissive" |
3264 |
|
3265 |
if test "$kde_use_pch" = "yes"; then |
3266 |
AC_MSG_CHECKING(whether gcc supports precompiling c header files) |
3267 |
echo >conftest.h |
3268 |
if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then |
3269 |
kde_gcc_supports_pch=yes |
3270 |
AC_MSG_RESULT(yes) |
3271 |
else |
3272 |
kde_gcc_supports_pch=no |
3273 |
AC_MSG_RESULT(no) |
3274 |
fi |
3275 |
if test "$kde_gcc_supports_pch" = "yes"; then |
3276 |
AC_MSG_CHECKING(whether gcc supports precompiling c++ header files) |
3277 |
if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then |
3278 |
kde_gcc_supports_pch=yes |
3279 |
AC_MSG_RESULT(yes) |
3280 |
else |
3281 |
kde_gcc_supports_pch=no |
3282 |
AC_MSG_RESULT(no) |
3283 |
fi |
3284 |
fi |
3285 |
rm -f conftest.h conftest.h.gch |
3286 |
fi |
3287 |
|
3288 |
KDE_CHECK_FOR_OPT_NOINLINE_MATCH |
3289 |
if test "x$kde_cv_opt_noinline_match" = "xno" ; then |
3290 |
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`" |
3291 |
fi |
2986 |
fi |
3292 |
fi |
|
|
3293 |
AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes") |
2987 |
if test "$CXX" = "KCC"; then |
3294 |
if test "$CXX" = "KCC"; then |
2988 |
dnl unfortunately we currently cannot disable exception support in KCC |
3295 |
dnl unfortunately we currently cannot disable exception support in KCC |
2989 |
dnl because doing so is binary incompatible and Qt by default links with exceptions :-( |
3296 |
dnl because doing so is binary incompatible and Qt by default links with exceptions :-( |
2990 |
dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"]) |
3297 |
dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"]) |
2991 |
dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS= ) |
3298 |
dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS= ) |
2992 |
|
3299 |
|
2993 |
AC_ARG_ENABLE(pch, |
|
|
2994 |
AC_HELP_STRING([--enable-pch], |
2995 |
[enables precompiled header support (currently only KCC) [default=no]]), |
2996 |
[ |
2997 |
kde_use_pch=$enableval |
2998 |
],[kde_use_pch=no]) |
2999 |
|
3000 |
if test "$kde_use_pch" = "yes"; then |
3300 |
if test "$kde_use_pch" = "yes"; then |
3001 |
dnl TODO: support --pch-dir! |
3301 |
dnl TODO: support --pch-dir! |
3002 |
KDE_CHECK_COMPILER_FLAG(-pch,[CXXFLAGS="$CXXFLAGS --pch"]) |
3302 |
KDE_CHECK_COMPILER_FLAG(-pch,[CXXFLAGS="$CXXFLAGS --pch"]) |
Lines 3051-3059
Link Here
|
3051 |
fi |
3351 |
fi |
3052 |
KDE_CHECK_COMPILER_FLAG(O0,[NOOPT_CXXFLAGS=-O0]) |
3352 |
KDE_CHECK_COMPILER_FLAG(O0,[NOOPT_CXXFLAGS=-O0]) |
3053 |
|
3353 |
|
|
|
3354 |
AC_ARG_ENABLE(coverage, |
3355 |
AC_HELP_STRING([--enable-coverage],[use gcc coverage testing]), [ |
3356 |
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then |
3357 |
ac_coverage_compiler="-fprofile-arcs -ftest-coverage" |
3358 |
ac_coverage_linker="-lgcc" |
3359 |
elif test "$am_cv_CC_dependencies_compiler_type" = "gcc"; then |
3360 |
ac_coverage_compiler="-fprofile-arcs -ftest-coverage" |
3361 |
ac_coverage_linker="" |
3362 |
else |
3363 |
AC_MSG_ERROR([coverage with your compiler is not supported]) |
3364 |
fi |
3365 |
CFLAGS="$CFLAGS $ac_coverage_compiler" |
3366 |
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler" |
3367 |
LDFLAGS="$LDFLAGS $ac_coverage_linker" |
3368 |
]) |
3369 |
|
3054 |
AC_SUBST(NOOPT_CXXFLAGS) |
3370 |
AC_SUBST(NOOPT_CXXFLAGS) |
3055 |
AC_SUBST(NOOPT_CFLAGS) |
3371 |
AC_SUBST(NOOPT_CFLAGS) |
|
|
3372 |
AC_SUBST(ENABLE_PERMISSIVE_FLAG) |
3056 |
|
3373 |
|
|
|
3374 |
KDE_CHECK_NEW_LDFLAGS |
3057 |
KDE_CHECK_FINAL |
3375 |
KDE_CHECK_FINAL |
3058 |
KDE_CHECK_CLOSURE |
3376 |
KDE_CHECK_CLOSURE |
3059 |
KDE_CHECK_NMCHECK |
3377 |
KDE_CHECK_NMCHECK |
Lines 3061-3066
Link Here
|
3061 |
ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), []) |
3379 |
ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), []) |
3062 |
]) |
3380 |
]) |
3063 |
|
3381 |
|
|
|
3382 |
AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG], |
3383 |
[ |
3384 |
AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug, |
3385 |
[ |
3386 |
AC_LANG_SAVE |
3387 |
AC_LANG_CPLUSPLUS |
3388 |
|
3389 |
safe_CXXFLAGS=$CXXFLAGS |
3390 |
safe_LDFLAGS=$LDFLAGS |
3391 |
CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0" |
3392 |
LDFLAGS="$LDFLAGS -shared -fPIC" |
3393 |
|
3394 |
AC_TRY_LINK( |
3395 |
[ |
3396 |
/* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */ |
3397 |
#include <string> |
3398 |
int some_function( void ) __attribute__ ((visibility("default"))); |
3399 |
int some_function( void ) |
3400 |
{ |
3401 |
std::string s("blafasel"); |
3402 |
return 0; |
3403 |
} |
3404 |
], [/* elvis is alive */], |
3405 |
kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes) |
3406 |
|
3407 |
CXXFLAGS=$safe_CXXFLAGS |
3408 |
LDFLAGS=$safe_LDFLAGS |
3409 |
AC_LANG_RESTORE |
3410 |
] |
3411 |
) |
3412 |
|
3413 |
if test x$kde_cv_val_gcc_visibility_bug = xno; then |
3414 |
CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden" |
3415 |
fi |
3416 |
] |
3417 |
) |
3418 |
|
3419 |
AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY], |
3420 |
[ |
3421 |
AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY]) |
3422 |
|
3423 |
AC_MSG_CHECKING([grepping for visibility push/pop in headers]) |
3424 |
|
3425 |
if test "x$GXX" = "xyes"; then |
3426 |
AC_LANG_SAVE |
3427 |
AC_LANG_CPLUSPLUS |
3428 |
AC_EGREP_CPP( |
3429 |
[GCC visibility push], |
3430 |
[ #include <exception> |
3431 |
], |
3432 |
[ |
3433 |
AC_MSG_RESULT(yes) |
3434 |
kde_stdc_visibility_patched=yes ], |
3435 |
[ |
3436 |
AC_MSG_RESULT(no) |
3437 |
AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for |
3438 |
visibility support. Disabling -fvisibility=hidden]) |
3439 |
|
3440 |
kde_stdc_visibility_patched=no ]) |
3441 |
|
3442 |
AC_LANG_RESTORE |
3443 |
|
3444 |
kde_have_gcc_visibility=no |
3445 |
KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, |
3446 |
[ |
3447 |
kde_have_gcc_visibility=yes |
3448 |
dnl the whole toolchain is just a mess, gcc is just too buggy |
3449 |
dnl to handle STL with visibility enabled. Lets reconsider |
3450 |
dnl when gcc 4.2 is out or when things get fixed in the compiler. |
3451 |
dnl Contact mueller@kde.org for details. |
3452 |
AC_ARG_ENABLE(gcc-hidden-visibility, |
3453 |
AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]), |
3454 |
[kde_have_gcc_visibility=$enableval], |
3455 |
[kde_have_gcc_visibility=no]) |
3456 |
|
3457 |
AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched, |
3458 |
[ |
3459 |
AC_LANG_SAVE |
3460 |
AC_LANG_CPLUSPLUS |
3461 |
|
3462 |
safe_CXXFLAGS=$CXXFLAGS |
3463 |
CXXFLAGS="$CXXFLAGS $all_includes" |
3464 |
|
3465 |
AC_TRY_COMPILE( |
3466 |
[ |
3467 |
#include <qglobal.h> |
3468 |
#if Q_EXPORT - 0 != 0 |
3469 |
/* if this compiles, then Q_EXPORT is undefined */ |
3470 |
/* if Q_EXPORT is nonempty, this will break compilation */ |
3471 |
#endif |
3472 |
], [/* elvis is alive */], |
3473 |
kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes) |
3474 |
|
3475 |
CXXFLAGS=$safe_CXXFLAGS |
3476 |
AC_LANG_RESTORE |
3477 |
] |
3478 |
) |
3479 |
|
3480 |
if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then |
3481 |
CXXFLAGS="$CXXFLAGS -fvisibility=hidden" |
3482 |
KDE_CHECK_VISIBILITY_GCC_BUG |
3483 |
HAVE_GCC_VISIBILITY=1 |
3484 |
AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported]) |
3485 |
fi |
3486 |
]) |
3487 |
fi |
3488 |
]) |
3489 |
|
3064 |
AC_DEFUN([KDE_ADD_DEPENDENCIES], |
3490 |
AC_DEFUN([KDE_ADD_DEPENDENCIES], |
3065 |
[ |
3491 |
[ |
3066 |
[A]M_DEPENDENCIES(CC) |
3492 |
[A]M_DEPENDENCIES(CC) |
Lines 3088-3107
Link Here
|
3088 |
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" |
3514 |
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" |
3089 |
AC_SUBST(KDE_PLUGIN) |
3515 |
AC_SUBST(KDE_PLUGIN) |
3090 |
|
3516 |
|
|
|
3517 |
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. |
3518 |
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" |
3519 |
AC_SUBST(KDE_CHECK_PLUGIN) |
3520 |
|
3091 |
# we patch configure quite some so we better keep that consistent for incremental runs |
3521 |
# we patch configure quite some so we better keep that consistent for incremental runs |
3092 |
AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure') |
3522 |
AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure') |
3093 |
]) |
3523 |
]) |
3094 |
|
3524 |
|
3095 |
AC_DEFUN([KDE_CHECK_LIB64], |
3525 |
AC_DEFUN([KDE_CHECK_LIB64], |
3096 |
[ |
3526 |
[ |
3097 |
kdelibsuff=no |
|
|
3098 |
AC_ARG_ENABLE(libsuffix, |
3527 |
AC_ARG_ENABLE(libsuffix, |
3099 |
AC_HELP_STRING([--enable-libsuffix], |
3528 |
AC_HELP_STRING([--enable-libsuffix], |
3100 |
[/lib directory suffix (64,32,none[=default])]), |
3529 |
[/lib directory suffix (64,32,none,auto[=default])]), |
3101 |
kdelibsuff=$enableval) |
3530 |
kdelibsuff=$enableval, kdelibsuff="auto") |
3102 |
# TODO: add an auto case that compiles a little C app to check |
3531 |
|
3103 |
# where the glibc is |
3532 |
if test "$kdelibsuff" = "auto"; then |
3104 |
if test "$kdelibsuff" = "no"; then |
3533 |
|
|
|
3534 |
cat > conftest.c << EOF |
3535 |
#include <stdio.h> |
3536 |
int main() { |
3537 |
return 0; |
3538 |
} |
3539 |
EOF |
3540 |
kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ |
3541 |
s,.*/lib\([[^\/]]*\)/.*,\1, |
3542 |
p |
3543 |
}'` |
3544 |
rm -rf conftest.* |
3545 |
fi |
3546 |
|
3547 |
if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then |
3105 |
kdelibsuff= |
3548 |
kdelibsuff= |
3106 |
fi |
3549 |
fi |
3107 |
if test -z "$kdelibsuff"; then |
3550 |
if test -z "$kdelibsuff"; then |
Lines 3112-3118
Link Here
|
3112 |
libdir="$libdir${kdelibsuff}" |
3555 |
libdir="$libdir${kdelibsuff}" |
3113 |
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms |
3556 |
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms |
3114 |
fi |
3557 |
fi |
3115 |
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories) |
3558 |
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) |
3116 |
AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) |
3559 |
AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) |
3117 |
fi |
3560 |
fi |
3118 |
]) |
3561 |
]) |
Lines 3147-3153
Link Here
|
3147 |
|
3590 |
|
3148 |
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then |
3591 |
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then |
3149 |
|
3592 |
|
3150 |
KDE_RPATH="-R \$(kde_libraries)" |
3593 |
KDE_RPATH="-R \$(libdir)" |
|
|
3594 |
|
3595 |
if test "$kde_libraries" != "$libdir"; then |
3596 |
KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)" |
3597 |
fi |
3151 |
|
3598 |
|
3152 |
if test -n "$qt_libraries"; then |
3599 |
if test -n "$qt_libraries"; then |
3153 |
KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)" |
3600 |
KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)" |
Lines 3168-3207
Link Here
|
3168 |
]) |
3615 |
]) |
3169 |
|
3616 |
|
3170 |
dnl Check for the type of the third argument of getsockname |
3617 |
dnl Check for the type of the third argument of getsockname |
3171 |
AC_DEFUN([AC_CHECK_SOCKLEN_T], [ |
3618 |
AC_DEFUN([AC_CHECK_SOCKLEN_T], |
3172 |
AC_MSG_CHECKING(for socklen_t) |
3619 |
[ |
3173 |
AC_CACHE_VAL(ac_cv_socklen_t, [ |
3620 |
AC_MSG_CHECKING(for socklen_t) |
3174 |
AC_LANG_SAVE |
3621 |
AC_CACHE_VAL(kde_cv_socklen_t, |
3175 |
AC_LANG_CPLUSPLUS |
3622 |
[ |
3176 |
AC_TRY_COMPILE([ |
3623 |
AC_LANG_PUSH(C++) |
3177 |
#include <sys/types.h> |
3624 |
kde_cv_socklen_t=no |
3178 |
#include <sys/socket.h> |
|
|
3179 |
],[ |
3180 |
socklen_t a=0; |
3181 |
getsockname(0,(struct sockaddr*)0, &a); |
3182 |
], |
3183 |
ac_cv_socklen_t=socklen_t, |
3184 |
AC_TRY_COMPILE([ |
3625 |
AC_TRY_COMPILE([ |
3185 |
#include <sys/types.h> |
3626 |
#include <sys/types.h> |
3186 |
#include <sys/socket.h> |
3627 |
#include <sys/socket.h> |
3187 |
],[ |
3628 |
], |
3188 |
int a=0; |
3629 |
[ |
3189 |
getsockname(0,(struct sockaddr*)0, &a); |
3630 |
socklen_t len; |
3190 |
], |
3631 |
getpeername(0,0,&len); |
3191 |
ac_cv_socklen_t=int, |
3632 |
], |
3192 |
ac_cv_socklen_t=size_t |
3633 |
[ |
3193 |
) |
3634 |
kde_cv_socklen_t=yes |
3194 |
) |
3635 |
kde_cv_socklen_t_equiv=socklen_t |
3195 |
AC_LANG_RESTORE |
3636 |
]) |
3196 |
]) |
3637 |
AC_LANG_POP(C++) |
3197 |
|
3638 |
]) |
3198 |
AC_MSG_RESULT($ac_cv_socklen_t) |
3639 |
AC_MSG_RESULT($kde_cv_socklen_t) |
3199 |
if test "$ac_cv_socklen_t" != "socklen_t"; then |
3640 |
if test $kde_cv_socklen_t = no; then |
3200 |
AC_DEFINE_UNQUOTED(socklen_t, $ac_cv_socklen_t, |
3641 |
AC_MSG_CHECKING([for socklen_t equivalent for socket functions]) |
3201 |
[Define the real type of socklen_t]) |
3642 |
AC_CACHE_VAL(kde_cv_socklen_t_equiv, |
3202 |
fi |
3643 |
[ |
3203 |
AC_DEFINE_UNQUOTED(ksize_t, socklen_t, [Compatibility define]) |
3644 |
kde_cv_socklen_t_equiv=int |
3204 |
|
3645 |
AC_LANG_PUSH(C++) |
|
|
3646 |
for t in int size_t unsigned long "unsigned long"; do |
3647 |
AC_TRY_COMPILE([ |
3648 |
#include <sys/types.h> |
3649 |
#include <sys/socket.h> |
3650 |
], |
3651 |
[ |
3652 |
$t len; |
3653 |
getpeername(0,0,&len); |
3654 |
], |
3655 |
[ |
3656 |
kde_cv_socklen_t_equiv="$t" |
3657 |
break |
3658 |
]) |
3659 |
done |
3660 |
AC_LANG_POP(C++) |
3661 |
]) |
3662 |
AC_MSG_RESULT($kde_cv_socklen_t_equiv) |
3663 |
fi |
3664 |
AC_DEFINE_UNQUOTED(kde_socklen_t, $kde_cv_socklen_t_equiv, |
3665 |
[type to use in place of socklen_t if not defined]) |
3666 |
AC_DEFINE_UNQUOTED(ksize_t, $kde_cv_socklen_t_equiv, |
3667 |
[type to use in place of socklen_t if not defined (deprecated, use kde_socklen_t)]) |
3205 |
]) |
3668 |
]) |
3206 |
|
3669 |
|
3207 |
dnl This is a merge of some macros out of the gettext aclocal.m4 |
3670 |
dnl This is a merge of some macros out of the gettext aclocal.m4 |
Lines 3493-3499
Link Here
|
3493 |
ac_save_ldflags="$LDFLAGS" |
3956 |
ac_save_ldflags="$LDFLAGS" |
3494 |
ac_save_cflags="$CFLAGS" |
3957 |
ac_save_cflags="$CFLAGS" |
3495 |
ac_save_libs="$LIBS" |
3958 |
ac_save_libs="$LIBS" |
3496 |
LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET" |
3959 |
LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries" |
|
|
3960 |
LIBS="-lX11 -lXext $LIBSOCKET" |
3497 |
CFLAGS="$CFLAGS $X_INCLUDES" |
3961 |
CFLAGS="$CFLAGS $X_INCLUDES" |
3498 |
test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" |
3962 |
test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" |
3499 |
AC_TRY_LINK([ |
3963 |
AC_TRY_LINK([ |
Lines 3504-3515
Link Here
|
3504 |
int foo_test_dpms() |
3968 |
int foo_test_dpms() |
3505 |
{ return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[], |
3969 |
{ return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[], |
3506 |
ac_cv_have_dpms="yes", [ |
3970 |
ac_cv_have_dpms="yes", [ |
3507 |
LDFLAGS="$ac_save_ldflags" |
3971 |
LIBS="-lXdpms $LIBS" |
3508 |
CFLAGS="$ac_save_cflags" |
|
|
3509 |
LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET" |
3510 |
LIBS="$LIBS -lXdpms" |
3511 |
CFLAGS="$CFLAGS $X_INCLUDES" |
3512 |
test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" |
3513 |
AC_TRY_LINK([ |
3972 |
AC_TRY_LINK([ |
3514 |
#include <X11/Xproto.h> |
3973 |
#include <X11/Xproto.h> |
3515 |
#include <X11/X.h> |
3974 |
#include <X11/X.h> |
Lines 3558-3569
Link Here
|
3558 |
[Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>]) |
4017 |
[Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>]) |
3559 |
AC_CHECK_DECL(DPMSCapable, |
4018 |
AC_CHECK_DECL(DPMSCapable, |
3560 |
AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),, |
4019 |
AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),, |
3561 |
[#include <X11/extensions/dpms.h>]) |
4020 |
[#include <X11/Xlib.h> |
|
|
4021 |
#include <X11/extensions/dpms.h>]) |
3562 |
AH_TEMPLATE(HAVE_DPMSINFO_PROTO, |
4022 |
AH_TEMPLATE(HAVE_DPMSINFO_PROTO, |
3563 |
[Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>]) |
4023 |
[Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>]) |
3564 |
AC_CHECK_DECL(DPMSInfo, |
4024 |
AC_CHECK_DECL(DPMSInfo, |
3565 |
AC_DEFINE(HAVE_DPMSINFO_PROTO),, |
4025 |
AC_DEFINE(HAVE_DPMSINFO_PROTO),, |
3566 |
[#include <X11/extensions/dpms.h>]) |
4026 |
[#include <X11/Xlib.h> |
|
|
4027 |
#include <X11/extensions/dpms.h>]) |
3567 |
CFLAGS="$ac_save_cflags" |
4028 |
CFLAGS="$ac_save_cflags" |
3568 |
AC_SUBST(DPMSINC) |
4029 |
AC_SUBST(DPMSINC) |
3569 |
AC_SUBST(DPMSLIB) |
4030 |
AC_SUBST(DPMSLIB) |
Lines 3589-3619
Link Here
|
3589 |
[ |
4050 |
[ |
3590 |
AC_LANG_SAVE |
4051 |
AC_LANG_SAVE |
3591 |
AC_LANG_CPLUSPLUS |
4052 |
AC_LANG_CPLUSPLUS |
3592 |
ac_save_ldflags="$LDFLAGS" |
4053 |
ac_save_ldflags=$LDFLAGS |
3593 |
ac_save_cxxflags="$CXXFLAGS" |
4054 |
ac_save_cxxflags=$CXXFLAGS |
3594 |
LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lMesaGL -lMesaGLU" |
4055 |
ac_save_libs=$LIBS |
3595 |
test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LDFLAGS="$LDFLAGS -lX11" |
4056 |
LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries" |
3596 |
LDFLAGS="$LDFLAGS $LIB_XEXT -lm $LIBSOCKET" |
4057 |
LIBS="$LIBS -lGL -lGLU" |
|
|
4058 |
test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11" |
4059 |
LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET" |
3597 |
CXXFLAGS="$CFLAGS $X_INCLUDES" |
4060 |
CXXFLAGS="$CFLAGS $X_INCLUDES" |
3598 |
test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS" |
4061 |
test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS" |
3599 |
AC_TRY_LINK([#include <GL/gl.h> |
4062 |
AC_TRY_LINK([#include <GL/gl.h> |
3600 |
#include <GL/glu.h> |
4063 |
#include <GL/glu.h> |
3601 |
], [], |
4064 |
], [], |
3602 |
ac_cv_have_gl="mesa", ac_cv_have_gl="no") |
4065 |
ac_cv_have_gl="yes", ac_cv_have_gl="no") |
3603 |
if test "x$ac_cv_have_gl" = "xno"; then |
|
|
3604 |
LDFLAGS="$ac_save_ldflags $X_LDFLAGS $GL_LDFLAGS $all_libraries -lGLU -lGL" |
3605 |
test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LDFLAGS="$LDFLAGS -lX11" |
3606 |
LDFLAGS="$LDFLAGS $LIB_XEXT -lm $LIBSOCKET" |
3607 |
CXXFLAGS="$ac_save_cflags $X_INCLUDES" |
3608 |
test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS" |
3609 |
AC_TRY_LINK([#include <GL/gl.h> |
3610 |
#include <GL/glu.h> |
3611 |
], [], |
3612 |
ac_cv_have_gl="yes", ac_cv_have_gl="no") |
3613 |
fi |
3614 |
AC_LANG_RESTORE |
4066 |
AC_LANG_RESTORE |
3615 |
LDFLAGS="$ac_save_ldflags" |
4067 |
LDFLAGS=$ac_save_ldflags |
3616 |
CXXFLAGS="$ac_save_cxxflags" |
4068 |
CXXFLAGS=$ac_save_cxxflags |
|
|
4069 |
LIBS=$ac_save_libs |
3617 |
])dnl |
4070 |
])dnl |
3618 |
|
4071 |
|
3619 |
if test "$ac_cv_have_gl" = "no"; then |
4072 |
if test "$ac_cv_have_gl" = "no"; then |
Lines 3624-3640
Link Here
|
3624 |
else |
4077 |
else |
3625 |
AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)]) |
4078 |
AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)]) |
3626 |
if test "$GL_LDFLAGS" = ""; then |
4079 |
if test "$GL_LDFLAGS" = ""; then |
3627 |
if test "$ac_cv_have_gl" = "mesa"; then |
4080 |
GLLIB='-lGLU -lGL $(LIB_X11)' |
3628 |
GLLIB='-lMesaGLU -lMesaGL $(LIB_X11)' |
|
|
3629 |
else |
3630 |
GLLIB='-lGLU -lGL $(LIB_X11)' |
3631 |
fi |
3632 |
else |
4081 |
else |
3633 |
if test "$ac_cv_have_gl" = "mesa"; then |
4082 |
GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)' |
3634 |
GLLIB="$GL_LDFLAGS -lMesaGLU -lMesaGL "'$(LIB_X11)' |
|
|
3635 |
else |
3636 |
GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)' |
3637 |
fi |
3638 |
fi |
4083 |
fi |
3639 |
if test "$GL_INCLUDE" = ""; then |
4084 |
if test "$GL_INCLUDE" = ""; then |
3640 |
GLINC="" |
4085 |
GLINC="" |
Lines 3933-3949
Link Here
|
3933 |
|
4378 |
|
3934 |
AC_DEFUN([KDE_CHECK_LIBPTHREAD], |
4379 |
AC_DEFUN([KDE_CHECK_LIBPTHREAD], |
3935 |
[ |
4380 |
[ |
|
|
4381 |
dnl This code is here specifically to handle the |
4382 |
dnl various flavors of threading library on FreeBSD |
4383 |
dnl 4-, 5-, and 6-, and the (weird) rules around it. |
4384 |
dnl There may be an environment PTHREAD_LIBS that |
4385 |
dnl specifies what to use; otherwise, search for it. |
4386 |
dnl -pthread is special cased and unsets LIBPTHREAD |
4387 |
dnl below if found. |
3936 |
LIBPTHREAD="" |
4388 |
LIBPTHREAD="" |
3937 |
|
4389 |
|
3938 |
if test -n "$PTHREAD_LIBS"; then |
4390 |
if test -n "$PTHREAD_LIBS"; then |
3939 |
PTHREAD_LIBS_save="$PTHREAD_LIBS" |
4391 |
if test "x$PTHREAD_LIBS" = "x-pthread" ; then |
3940 |
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'` |
4392 |
LIBPTHREAD="PTHREAD" |
3941 |
KDE_CHECK_LIB($PTHREAD_LIBS, pthread_create, [LIBPTHREAD="$PTHREAD_LIBS_save"] ) |
4393 |
else |
3942 |
PTHREAD_LIBS="$PTHREAD_LIBS_save" |
4394 |
PTHREAD_LIBS_save="$PTHREAD_LIBS" |
|
|
4395 |
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'` |
4396 |
AC_MSG_CHECKING([for pthread_create in $PTHREAD_LIBS]) |
4397 |
KDE_CHECK_LIB($PTHREAD_LIBS, pthread_create, [ |
4398 |
LIBPTHREAD="$PTHREAD_LIBS_save"]) |
4399 |
PTHREAD_LIBS="$PTHREAD_LIBS_save" |
4400 |
fi |
3943 |
fi |
4401 |
fi |
3944 |
|
4402 |
|
|
|
4403 |
dnl Is this test really needed, in the face of the Tru64 test below? |
3945 |
if test -z "$LIBPTHREAD"; then |
4404 |
if test -z "$LIBPTHREAD"; then |
3946 |
AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"] ) |
4405 |
AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"]) |
|
|
4406 |
fi |
4407 |
|
4408 |
dnl This is a special Tru64 check, see BR 76171 issue #18. |
4409 |
if test -z "$LIBPTHREAD" ; then |
4410 |
AC_MSG_CHECKING([for pthread_create in -lpthread]) |
4411 |
kde_safe_libs=$LIBS |
4412 |
LIBS="$LIBS -lpthread" |
4413 |
AC_TRY_LINK([#include <pthread.h>],[(void)pthread_create(0,0,0,0);],[ |
4414 |
AC_MSG_RESULT(yes) |
4415 |
LIBPTHREAD="-lpthread"],[ |
4416 |
AC_MSG_RESULT(no)]) |
4417 |
LIBS=$kde_safe_libs |
4418 |
fi |
4419 |
|
4420 |
dnl Un-special-case for FreeBSD. |
4421 |
if test "x$LIBPTHREAD" = "xPTHREAD" ; then |
4422 |
LIBPTHREAD="" |
3947 |
fi |
4423 |
fi |
3948 |
|
4424 |
|
3949 |
AC_SUBST(LIBPTHREAD) |
4425 |
AC_SUBST(LIBPTHREAD) |
Lines 4173-4186
Link Here
|
4173 |
|
4649 |
|
4174 |
AC_DEFUN([KDE_CHECK_PYTHON], |
4650 |
AC_DEFUN([KDE_CHECK_PYTHON], |
4175 |
[ |
4651 |
[ |
4176 |
KDE_CHECK_PYTHON_INTERN("2.3", |
4652 |
KDE_CHECK_PYTHON_INTERN("2.5", |
4177 |
[KDE_CHECK_PYTHON_INTERN("2.2", |
4653 |
[KDE_CHECK_PYTHON_INTERN("2.4", |
4178 |
[KDE_CHECK_PYTHON_INTERN("2.1", |
4654 |
[KDE_CHECK_PYTHON_INTERN("2.3", |
4179 |
[KDE_CHECK_PYTHON_INTERN("2.0", |
4655 |
[KDE_CHECK_PYTHON_INTERN("2.2", |
4180 |
[KDE_CHECK_PYTHON_INTERN($1, $2) ]) |
4656 |
[KDE_CHECK_PYTHON_INTERN("2.1", |
|
|
4657 |
[KDE_CHECK_PYTHON_INTERN("2.0", |
4658 |
[KDE_CHECK_PYTHON_INTERN($1, $2) ]) |
4659 |
]) |
4660 |
]) |
4181 |
]) |
4661 |
]) |
4182 |
]) |
4662 |
]) |
4183 |
]) |
4663 |
]) |
4184 |
]) |
4664 |
]) |
4185 |
|
4665 |
|
4186 |
AC_DEFUN([KDE_CHECK_STL], |
4666 |
AC_DEFUN([KDE_CHECK_STL], |
Lines 4212-4218
Link Here
|
4212 |
else |
4692 |
else |
4213 |
AC_MSG_ERROR([Your Installation isn't able to compile simple C++ programs. |
4693 |
AC_MSG_ERROR([Your Installation isn't able to compile simple C++ programs. |
4214 |
Check config.log for details - if you're using a Linux distribution you might miss |
4694 |
Check config.log for details - if you're using a Linux distribution you might miss |
4215 |
a package named similiar to libstd++-dev.]) |
4695 |
a package named similar to libstdc++-dev.]) |
4216 |
fi |
4696 |
fi |
4217 |
|
4697 |
|
4218 |
CXXFLAGS="$ac_save_CXXFLAGS" |
4698 |
CXXFLAGS="$ac_save_CXXFLAGS" |
Lines 4304-4313
Link Here
|
4304 |
[ |
4784 |
[ |
4305 |
|
4785 |
|
4306 |
DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin" |
4786 |
DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin" |
|
|
4787 |
TOPSUBDIRS="" |
4307 |
|
4788 |
|
4308 |
if test ! -s $srcdir/subdirs; then |
4789 |
if test ! -s $srcdir/subdirs; then |
4309 |
dnl Note: Makefile.common creates subdirs, so this is just a fallback |
4790 |
dnl Note: Makefile.common creates subdirs, so this is just a fallback |
4310 |
TOPSUBDIRS="" |
|
|
4311 |
files=`cd $srcdir && ls -1` |
4791 |
files=`cd $srcdir && ls -1` |
4312 |
dirs=`for i in $files; do if test -d $i; then echo $i; fi; done` |
4792 |
dirs=`for i in $files; do if test -d $i; then echo $i; fi; done` |
4313 |
for i in $dirs; do |
4793 |
for i in $dirs; do |
Lines 4448-4460
Link Here
|
4448 |
|
4928 |
|
4449 |
AC_DEFUN([KDE_CHECK_HEADER], |
4929 |
AC_DEFUN([KDE_CHECK_HEADER], |
4450 |
[ |
4930 |
[ |
4451 |
AC_LANG_SAVE |
|
|
4452 |
kde_safe_cppflags=$CPPFLAGS |
4931 |
kde_safe_cppflags=$CPPFLAGS |
4453 |
CPPFLAGS="$CPPFLAGS $all_includes" |
4932 |
CPPFLAGS="$CPPFLAGS $all_includes" |
|
|
4933 |
AC_LANG_SAVE |
4454 |
AC_LANG_CPLUSPLUS |
4934 |
AC_LANG_CPLUSPLUS |
4455 |
AC_CHECK_HEADER([$1], [$2], [$3], [$4]) |
4935 |
AC_CHECK_HEADER([$1], [$2], [$3], [$4]) |
4456 |
CPPFLAGS=$kde_safe_cppflags |
|
|
4457 |
AC_LANG_RESTORE |
4936 |
AC_LANG_RESTORE |
|
|
4937 |
CPPFLAGS=$kde_safe_cppflags |
4458 |
]) |
4938 |
]) |
4459 |
|
4939 |
|
4460 |
AC_DEFUN([KDE_CHECK_HEADERS], |
4940 |
AC_DEFUN([KDE_CHECK_HEADERS], |
Lines 4507-4512
Link Here
|
4507 |
# And delete superfluous '/' to make compares easier |
4987 |
# And delete superfluous '/' to make compares easier |
4508 |
prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` |
4988 |
prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` |
4509 |
exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` |
4989 |
exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'` |
|
|
4990 |
|
4991 |
kde_libs_prefix='$(prefix)' |
4992 |
kde_libs_htmldir='$(kde_htmldir)' |
4993 |
AC_SUBST(kde_libs_prefix) |
4994 |
AC_SUBST(kde_libs_htmldir) |
4510 |
KDE_FAST_CONFIGURE |
4995 |
KDE_FAST_CONFIGURE |
4511 |
KDE_CONF_FILES |
4996 |
KDE_CONF_FILES |
4512 |
]) |
4997 |
]) |
Lines 4755-4763
Link Here
|
4755 |
for dir in $javadirs; do |
5240 |
for dir in $javadirs; do |
4756 |
dnl Check for the java executable |
5241 |
dnl Check for the java executable |
4757 |
if test -x "$dir/java"; then |
5242 |
if test -x "$dir/java"; then |
|
|
5243 |
sane_path=$(cd $dir; /bin/pwd) |
4758 |
dnl And also check for a libjvm.so somewhere under there |
5244 |
dnl And also check for a libjvm.so somewhere under there |
4759 |
dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big. |
5245 |
dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big. |
4760 |
if test "$dir" != "/usr/bin"; then |
5246 |
if test "$sane_path" != "/usr/bin"; then |
4761 |
libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1` |
5247 |
libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1` |
4762 |
if test ! -f $libjvmdir/libjvm.so; then continue; fi |
5248 |
if test ! -f $libjvmdir/libjvm.so; then continue; fi |
4763 |
jredirs="$jredirs $dir" |
5249 |
jredirs="$jredirs $dir" |
Lines 4914-4920
Link Here
|
4914 |
JAVAC=$kde_java_bindir/javac |
5400 |
JAVAC=$kde_java_bindir/javac |
4915 |
JAVAH=$kde_java_bindir/javah |
5401 |
JAVAH=$kde_java_bindir/javah |
4916 |
JAR=$kde_java_bindir/jar |
5402 |
JAR=$kde_java_bindir/jar |
4917 |
JVMLIBS="-Xlinker -framework -Xlinker JavaVM" |
5403 |
JVMLIBS="-Wl,-framework,JavaVM" |
4918 |
|
5404 |
|
4919 |
AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) |
5405 |
AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) |
4920 |
AC_MSG_RESULT([Apple Java Framework]) |
5406 |
AC_MSG_RESULT([Apple Java Framework]) |
Lines 5435-5437
Link Here
|
5435 |
]) |
5921 |
]) |
5436 |
AC_SUBST(PERL) |
5922 |
AC_SUBST(PERL) |
5437 |
]) |
5923 |
]) |
|
|
5924 |
|
5925 |
AC_DEFUN([KDE_CHECK_LARGEFILE], |
5926 |
[ |
5927 |
AC_SYS_LARGEFILE |
5928 |
if test "$ac_cv_sys_file_offset_bits" != no; then |
5929 |
CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" |
5930 |
fi |
5931 |
|
5932 |
if test "x$ac_cv_sys_large_files" != "xno"; then |
5933 |
CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=1" |
5934 |
fi |
5935 |
|
5936 |
]) |
5937 |
|
5938 |
dnl A small extension to PKG_CHECK_MODULES (defined in pkg.m4.in) |
5939 |
dnl which allows to search for libs that get installed into the KDE prefix. |
5940 |
dnl |
5941 |
dnl Syntax: KDE_PKG_CHECK_MODULES(KSTUFF, libkexif >= 0.2 glib = 1.3.4, action-if, action-not) |
5942 |
dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page |
5943 |
dnl also defines KSTUFF_PKG_ERRORS on error |
5944 |
AC_DEFUN([KDE_PKG_CHECK_MODULES], [ |
5945 |
|
5946 |
PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" |
5947 |
if test "$prefix" != "$kde_libs_prefix"; then |
5948 |
PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" |
5949 |
fi |
5950 |
export PKG_CONFIG_PATH |
5951 |
PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) |
5952 |
]) |
5953 |
|
5954 |
|
5955 |
dnl Check for PIE support in the compiler and linker |
5956 |
AC_DEFUN([KDE_CHECK_PIE_SUPPORT], |
5957 |
[ |
5958 |
AC_CACHE_CHECK([for PIE support], kde_cv_val_pie_support, |
5959 |
[ |
5960 |
AC_LANG_SAVE |
5961 |
AC_LANG_CPLUSPLUS |
5962 |
safe_CXXFLAGS=$CXXFLAGS |
5963 |
safe_LDFLAGS=$LDFLAGS |
5964 |
CXXFLAGS="$CXXFLAGS -fPIE" |
5965 |
LDFLAGS="$LDFLAGS -pie" |
5966 |
|
5967 |
AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no]) |
5968 |
|
5969 |
CXXFLAGS=$safe_CXXFLAGS |
5970 |
LDFLAGS=$safe_LDFLAGS |
5971 |
AC_LANG_RESTORE |
5972 |
]) |
5973 |
|
5974 |
AC_MSG_CHECKING(if enabling -pie/fPIE support) |
5975 |
|
5976 |
AC_ARG_ENABLE(pie, |
5977 |
AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]), |
5978 |
[kde_has_pie_support=$enableval], |
5979 |
[kde_has_pie_support=detect]) |
5980 |
|
5981 |
if test "$kde_has_pie_support" = "detect"; then |
5982 |
kde_has_pie_support=$kde_cv_val_pie_support |
5983 |
fi |
5984 |
|
5985 |
AC_MSG_RESULT([$kde_has_pie_support]) |
5986 |
|
5987 |
KDE_USE_FPIE="" |
5988 |
KDE_USE_PIE="" |
5989 |
|
5990 |
AC_SUBST([KDE_USE_FPIE]) |
5991 |
AC_SUBST([KDE_USE_PIE]) |
5992 |
|
5993 |
if test "$kde_has_pie_support" = "yes"; then |
5994 |
KDE_USE_FPIE="-fPIE" |
5995 |
KDE_USE_PIE="-pie" |
5996 |
fi |
5997 |
]) |