AC_MSG_RESULT(yes)
else
AC_MSG_ERROR([your system fails at linking a small KDE application!
-Check, if your compiler is installed correctly and if you have used the
+Check if your compiler is installed correctly and if you have used the
same compiler to compile Qt and kdelibs as you did use now])
fi
[#try to guess Qt locations
qt_incdirs="$ac_qt_includes /usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt $x_includes $QTINC"
-test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR $qt_incdirs"
+test -n "$QTDIR" && qt_incdirs="$QTDIR/include/qt $QTDIR/include $QTDIR $qt_incdirs"
AC_FIND_FILE(qmovie.h, $qt_incdirs, qt_incdir)
ac_qt_includes="$qt_incdir"
KDE_CHECK_QT_DIRECT(qt_libraries= ,[])
fi
+dnl should check it's not Qt2, so it will fail now, rather than in KDE check
+
+SAVE_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS -I$qt_includes -L$qt_libraries"
+dnl specify we are definitely C++ compiling first
+AC_LANG_CPLUSPLUS
+AC_TRY_COMPILE([
+#include <qglobal.h>
+],
+[
+#if (QT_VERSION >= 200)
+break_me_(\\\);
+#endif
+],
+ac_qt_ok=yes,
+ac_qt_ok=no
+)
+test "$ac_qt_ok" = no && AC_MSG_ERROR([Found Qt 2 - you must specify the path to the Qt 1 headers and libraries])
+CXXFLAGS="$SAVE_CXXFLAGS"
+
AC_SUBST(qt_libraries)
AC_SUBST(qt_includes)
AC_REQUIRE([AC_PATH_QT])dnl
AC_MSG_CHECKING([for KDE])
+AC_ARG_WITH(kde-dir,
+ [ --with-kde-dir where the KDE root is ],
+ [ export KDEDIR="$withval" ])
+
if test "${prefix}" != NONE; then
kde_includes=${prefix}/include
ac_kde_includes=$prefix/include
kde_includes=""
fi
+if test ! -z "$KDEDIR"; then
+ ac_kde_includes="$KDEDIR/include"
+ kde_includes="$KDEDIR/include"
+ ac_kde_libraries="$KDEDIR/lib"
+ kde_libraries="$KDEDIR/lib"
+fi
+
+AC_ARG_WITH(kde-includes,
+ [ --with-kde-includes where the KDE includes are installed. ],
+ [ ac_kde_includes="$withval" ])
+
+AC_ARG_WITH(kde-libraries,
+ [ --with-kde-libraries where the KDE libraries are installed.],
+ [ ac_kde_libraries="$withval" ])
+
AC_CACHE_VAL(ac_cv_have_kde,
[#try to guess kde locations
if test -z "$1"; then
-kde_incdirs="$ac_kde_includes /usr/lib/kde/include /usr/local/kde/include /usr/kde/include /usr/include/kde /usr/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR $kde_incdirs"
+kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/kde/include /usr/include/kde /usr/include /opt/kde/include $x_includes $qt_includes"
+test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include/kde $KDEDIR/include $KDEDIR $kde_incdirs"
+kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE(ksock.h, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir"
So, check this please and use another prefix!])
fi
-kde_libdirs="$ac_kde_libraries /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/X11R6/lib /opt/kde/lib /usr/X11R6/kde/lib"
+kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/X11R6/lib /opt/kde/lib /usr/X11R6/kde/lib"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib $KDEDIR $kde_libdirs"
+kde_libdirs="$ac_kde_libraries $kde_libdirs"
AC_FIND_FILE(libkdecore.la, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir"
in the prefix, you've chosen $ac_kde_libraries, are no kde libraries installed. This will fail.
So, check this please and use another prefix!])
fi
-ac_kde_libraries="$kde_libdir"
if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO; then
ac_cv_have_kde="have_kde=no"
AC_SUBST(KDE_LDFLAGS)
AC_SUBST(KDE_INCLUDES)
-KDE_CHECK_EXTRA_LIBS
-
AC_SUBST(all_includes)
AC_SUBST(all_libraries)
])
-AC_DEFUN(KDE_CHECK_EXTRA_LIBS,
-[
-AC_MSG_CHECKING(for extra includes)
-AC_ARG_WITH(extra-includes, [ --with-extra-includes adds non standard include paths],
- kde_use_extra_includes="$withval",
- kde_use_extra_includes=NONE
-)
-if test -n "$kde_use_extra_includes" && \
- test "$kde_use_extra_includes" != "NONE"; then
-
- ac_save_ifs=$IFS
- IFS=':'
- for dir in $kde_use_extra_includes; do
- all_includes="$all_includes -I$dir"
- USER_INCLUDES="$USER_INCLUDES -I$dir"
- done
- IFS=$ac_save_ifs
- kde_use_extra_includes="added"
-else
- kde_use_extra_includes="no"
-fi
-
-AC_MSG_RESULT($kde_use_extra_includes)
-
-AC_MSG_CHECKING(for extra libs)
-AC_ARG_WITH(extra-libs, [ --with-extra-libs adds non standard library paths],
- kde_use_extra_libs=$withval,
- kde_use_extra_libs=NONE
-)
-if test -n "$kde_use_extra_libs" && \
- test "$kde_use_extra_libs" != "NONE"; then
-
- ac_save_ifs=$IFS
- IFS=':'
- for dir in $kde_use_extra_libs; do
- all_libraries="$all_libraries -L$dir"
- KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -rpath $dir"
- USER_LDFLAGS="$USER_LDFLAGS -L$dir"
- done
- IFS=$ac_save_ifs
- kde_use_extra_libs="added"
-else
- kde_use_extra_libs="no"
-fi
-
-AC_MSG_RESULT($kde_use_extra_libs)
-
-])
-
AC_DEFUN(KDE_CHECK_KIMGIO,
[
AC_REQUIRE([AC_FIND_TIFF])
[
AC_REQUIRE([KDE_MISC_TESTS])
- KDE_LIBS='-lqt -lkdecore -lkdeui -lkfm -lkfile'
+ KDE_LIBS='-lkfile -lkfm -lkdeui -lkdecore -lqt'
AC_SUBST(KDE_LIBS)
# LIB_X11='-lX11 $(LIBSOCKET)'
# AC_SUBST(LIB_X11)
fi
])
-AC_DEFUN(AC_CHECK_COMPILERS,
-[
- dnl this is somehow a fat lie, but prevents other macros from double checking
- AC_PROVIDE([AC_PROG_CC])
- AC_PROVIDE([AC_PROG_CPP])
- AC_ARG_ENABLE(debug,[ --enable-debug creates debugging code [default=no]],
- [
- if test $enableval = "no"; dnl
- then ac_use_debug_code="no"
- else ac_use_debug_code="yes"
- fi
- ], [ac_use_debug_code="no"])
-
- AC_ARG_ENABLE(strict,[ --enable-strict compiles with strict compiler options (may not work!)],
- [
- if test $enableval = "no"; then
- ac_use_strict_options="no"
- else
- ac_use_strict_options="yes"
- fi
- ], [ac_use_strict_options="no"])
-
-dnl this was AC_PROG_CC. I had to include it manualy, since I had to patch it
- AC_MSG_CHECKING(for a C-Compiler)
- dnl if there is one, print out. if not, don't matter
- AC_MSG_RESULT($CC)
-
- if test -z "$CC"; then AC_CHECK_PROG(CC, gcc, gcc) fi
- if test -z "$CC"; then AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc) fi
- if test -z "$CC"; then AC_CHECK_PROG(CC, xlc, xlc) fi
- test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-
- AC_PROG_CC_WORKS
- AC_PROG_CC_GNU
-
- if test $ac_cv_prog_gcc = yes; then
- GCC=yes
- else
- GCC=
- fi
-
- if test -z "$CFLAGS"; then
- if test "$ac_use_debug_code" = "yes"; then
- AC_PROG_CC_G
- if test $ac_cv_prog_cc_g = yes; then
- CFLAGS="-g"
- fi
- else
- if test "$GCC" = "yes"; then
- CFLAGS="-O2"
- else
- CFLAGS=""
- fi
- fi
-
- if test "$GCC" = "yes"; then
- CFLAGS="$CFLAGS -Wall"
-
- if test "$ac_use_strict_options" = "yes"; then
- CFLAGS="$CFLAGS -W -ansi -pedantic"
- fi
- fi
-
- fi
-
- case "$host" in
- *-*-sysv4.2uw*) CFLAGS="$CFLAGS -D_UNIXWARE";;
- esac
-
- if test -z "$LDFLAGS" && test "$ac_use_debug_code" = "no" && test "$GCC" = "yes"; then
- LDFLAGS="-s"
- fi
-
-
-dnl this is AC_PROG_CPP. I had to include it here, since autoconf checks
-dnl dependecies between AC_PROG_CPP and AC_PROG_CC (or is it automake?)
-
- AC_MSG_CHECKING(how to run the C preprocessor)
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
- fi
- if test -z "$CPP"; then
- AC_CACHE_VAL(ac_cv_prog_CPP,
- [ # This must be in double quotes, not single quotes, because CPP may get
- # substituted into the Makefile and "${CC-cc}" will confuse make.
- CPP="${CC-cc} -E"
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- dnl Use a header file that comes with gcc, so configuring glibc
- dnl with a fresh cross-compiler works.
- AC_TRY_CPP([#include <assert.h>
- Syntax Error], ,
- CPP="${CC-cc} -E -traditional-cpp"
- AC_TRY_CPP([#include <assert.h>
- Syntax Error], , CPP=/lib/cpp))
- ac_cv_prog_CPP="$CPP"])dnl
- CPP="$ac_cv_prog_CPP"
- else
- ac_cv_prog_CPP="$CPP"
- fi
- AC_MSG_RESULT($CPP)
- AC_SUBST(CPP)dnl
-
-
- AC_MSG_CHECKING(for a C++-Compiler)
- dnl if there is one, print out. if not, don't matter
- AC_MSG_RESULT($CXX)
-
- if test -z "$CXX"; then AC_CHECK_PROG(CXX, g++, g++) fi
- if test -z "$CXX"; then AC_CHECK_PROG(CXX, CC, CC) fi
- if test -z "$CXX"; then AC_CHECK_PROG(CXX, xlC, xlC) fi
- if test -z "$CXX"; then AC_CHECK_PROG(CXX, DCC, DCC) fi
- test -z "$CXX" && AC_MSG_ERROR([no acceptable C++-compiler found in \$PATH])
-
- AC_PROG_CXX_WORKS
- AC_PROG_CXX_GNU
-
- if test $ac_cv_prog_gxx = yes; then
- GXX=yes
- else
- AC_MSG_CHECKING(whether we are using SPARC CC)
- GXX=
- cat > conftest.C << EOF
-#ifdef __SUNPRO_CC
- yes;
-#endif
-EOF
-
- ac_try="$CXX -E conftest.C"
- if { (eval echo configure:__online__: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | egrep yes >/dev/null 2>&1; then
- ac_cv_prog_CC=yes
- else
- ac_cv_prog_CC=no
- fi
- AC_MSG_RESULT($ac_cv_prog_CC)
- fi
-
- if test -z "$CXXFLAGS"; then
- if test "$ac_use_debug_code" = "yes"; then
- AC_PROG_CXX_G
- if test $ac_cv_prog_cxx_g = yes; then
- CXXFLAGS="-g"
- fi
- if test "$ac_cv_prog_CC" = "yes"; then
- CXXFLAGS="$CXXFLAGS -pto"
- fi
- else
- if test "$GXX" = "yes"; then
- CXXFLAGS="-O2"
- else
- if test "$ac_cv_prog_CC" = "yes"; then
- CXXFLAGS="-pto -O2"
- else
- CXXFLAGS=""
- fi
- fi
- fi
-
- if test "$GXX" = "yes"; then
- CXXFLAGS="$CXXFLAGS -Wall"
-
- if test "$ac_use_strict_options" = "yes"; then
- CXXFLAGS="$CXXFLAGS -W -ansi -Wtraditional -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Woverloaded-virtual -Wbad-function-cast -Wsynth"
- fi
-
- if test "$kde_very_strict" = "yes"; then
- CXXFLAGS="$CXXFLAGS -Wold-style-cast -Wshadow -Wredundant-decls -Wconversion"
- fi
- fi
- fi
-
- case "$host" in
- *-*-sysv4.2uw*) CXXFLAGS="$CXXFLAGS -D_UNIXWARE";;
- esac
-
-])
-
dnl just a wrapper to clean up configure.in
AC_DEFUN(KDE_PROG_LIBTOOL,
[
[
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
KDE_PROG_LIBTOOL
-AM_KDE_WITH_NLS
AC_PATH_KDE
+AC_PATH_PROG(QTARCH, "qtarch",qtarch-notinstalled)
])
AC_DEFUN(AC_CHECK_RPATH,
AC_MSG_RESULT($USE_RPATH)
])
-dnl This is a merge of some macros out of the gettext aclocal.m4
-dnl since we don't need anything, I took the things we need
-AC_DEFUN(AM_KDE_WITH_NLS,
- [AC_MSG_CHECKING([whether NLS is requested])
- AC_LANG_CPLUSPLUS
- dnl Default is enabled NLS
- AC_ARG_ENABLE(nls,
- [ --disable-nls do not use Native Language Support],
- USE_NLS=$enableval, USE_NLS=yes)
- AC_MSG_RESULT($USE_NLS)
- AC_SUBST(USE_NLS)
-
- dnl If we use NLS figure out what method
- if test "$USE_NLS" = "yes"; then
- AC_DEFINE(ENABLE_NLS)
-
- AM_PATH_PROG_WITH_TEST_KDE(MSGFMT, msgfmt,
- [test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"], msgfmt)
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
- if test -z "`$MSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
- AC_MSG_RESULT([found msgfmt program is not GNU msgfmt; ignore it])
- msgfmt=":"
- fi
- AC_SUBST(MSGFMT)
-
- AM_PATH_PROG_WITH_TEST_KDE(XGETTEXT, xgettext,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-
- dnl Test whether we really found GNU xgettext.
- if test "$XGETTEXT" != ":"; then
- dnl If it is no GNU xgettext we define it as : so that the
- dnl Makefiles still can work.
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- : ;
- else
- AC_MSG_RESULT(
- [found xgettext programs is not GNU xgettext; ignore it])
- XGETTEXT=":"
- fi
- fi
- AC_SUBST(XGETTEXT)
- fi
-
- ])
-
# Search path for a program which passes the given test.
# Ulrich Drepper <drepper@cygnus.com>, 1996.
AC_REQUIRE([AC_TYPE_SIZE_T])dnl
AC_REQUIRE([AC_FUNC_ALLOCA])dnl
AC_REQUIRE([AC_FUNC_MMAP])dnl
- AC_REQUIRE([AM_KDE_WITH_NLS])dnl
AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
unistd.h values.h alloca.h])
AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
projects / lyx.git / blobdiff