diff options
author | Bram Moolenaar <Bram@vim.org> | 2005-12-06 19:59:18 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2005-12-06 19:59:18 +0000 |
commit | 9372a11ca67d6bdec9c16407a941cb8094eec3b6 (patch) | |
tree | 9633dee37b98fab6fe12d78ee30bc761f2f21a73 /src/configure.in | |
parent | cef9dcc37ef6dce3d98cf1550c3731fff9d451b5 (diff) | |
download | vim-git-9372a11ca67d6bdec9c16407a941cb8094eec3b6.tar.gz |
updated for version 7.0163
Diffstat (limited to 'src/configure.in')
-rw-r--r-- | src/configure.in | 331 |
1 files changed, 8 insertions, 323 deletions
diff --git a/src/configure.in b/src/configure.in index 404fbafd0..04001de21 100644 --- a/src/configure.in +++ b/src/configure.in @@ -468,7 +468,7 @@ if test "$enable_perlinterp" = "yes"; then fi if test "x$MACOSX" = "xyes"; then - dnl Mac OS X 10.2 or 10.3 + dnl Mac OS X 10.2 or later dir=/System/Library/Perl darwindir=$dir/darwin if test -d $darwindir; then @@ -749,7 +749,7 @@ if test "$enable_tclinterp" = "yes"; then TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"` dnl Use $TCL_DEFS for -D_THREAD_SAFE et al. But only use the dnl "-D_ABC" items. Watch out for -DFOO=long\ long. - TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\ /\\X/' | tr ' ' '\012' | sed -e '/^-[[^D]]/d' -e '/-D[[^_]]/d' -e 's/-D_/ -D_/' | tr -d '\012'` + TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^-[[^D]]/d' -e '/-D[[^_]]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'` break fi done @@ -1079,7 +1079,7 @@ test "x$with_x" = xno -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" && enable_gui AC_MSG_CHECKING(--enable-gui argument) AC_ARG_ENABLE(gui, - [ --enable-gui[=OPTS] X11 GUI [default=auto] [OPTS=auto/no/gtk/gtk2/gnome/gnome2/kde/motif/athena/neXtaw/photon/carbon]], , enable_gui="auto") + [ --enable-gui[=OPTS] X11 GUI [default=auto] [OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon]], , enable_gui="auto") dnl Canonicalize the --enable-gui= argument so that it can be easily compared. dnl Do not use character classes for portability with old tools. @@ -1090,7 +1090,6 @@ dnl Skip everything by default. SKIP_GTK=YES SKIP_GTK2=YES SKIP_GNOME=YES -SKIP_KDE=YES SKIP_MOTIF=YES SKIP_ATHENA=YES SKIP_NEXTAW=YES @@ -1134,8 +1133,6 @@ else SKIP_ATHENA= SKIP_NEXTAW= SKIP_CARBON=;; - kde|Kde|KDE) AC_MSG_RESULT(KDE 2.x or 3.x GUI support) - SKIP_KDE=;; gtk) AC_MSG_RESULT(GTK+ 1.x GUI support) SKIP_GTK=;; gtk2) AC_MSG_RESULT(GTK+ 2.x GUI support) @@ -1159,17 +1156,6 @@ else fi -if test "x$SKIP_KDE" != "xYES" -a "$enable_gui_canon" != "kde"; then - AC_MSG_CHECKING(whether or not to look for KDE) - AC_ARG_ENABLE(kde-check, - [ --enable-kde-check If auto-select GUI, check for KDE [default=no]], - ,enable_kde_check="no") - AC_MSG_RESULT($enable_kde_check); - if test "x$enable_kde_check" = "xno"; then - SKIP_KDE=YES - fi -fi - if test "x$SKIP_GTK" != "xYES" -a "$enable_gui_canon" != "gtk" -a "$enable_gui_canon" != "gtk2"; then AC_MSG_CHECKING(whether or not to look for GTK) AC_ARG_ENABLE(gtk-check, @@ -1250,308 +1236,6 @@ if test "x$SKIP_CARBON" != "xYES" -a "$enable_gui_canon" != "carbon"; then fi fi -dnl --------------------------------------------------------------------------- -dnl we use the kde-config script included in KDE since 2.x to check which -dnl version of KDE, we'll use. We'll use additional args in configure to -dnl obtain the QT directory (includes and libs) as qt does not give any -dnl config script ! (shame on the trolls ! ;p) -dnl --------------------------------------------------------------------------- - -if test -z "$SKIP_KDE"; then -dnl ------------------ -dnl now, take care of QT -dnl ----------------- -AC_ARG_WITH(qt-dir, - [ --with-qt-dir=DIR Specify prefix of QT files], - [ - ROOTQT="$withval" - MOC="$withval"/bin/moc - QT_INCLUDES="$withval"/include - QT_LIBS="$withval"/lib - ]) - -if test "x$ROOTQT" = "x"; then - if test -z "$QTDIR"; then - dnl Find the Qt directory by looking for the "moc" program. - dnl It's better than nothing. - AC_PATH_PROG(MOC, moc, no) - if test "x$MOC" = "xno"; then - AC_MSG_ERROR(could not find Qt directory) - else - ROOTQT=`echo $MOC | sed 's+/bin/moc++'` - fi - else - ROOTQT="$QTDIR" - fi -fi -MOC="$ROOTQT"/bin/moc -QT_INCLUDES="$ROOTQT"/include -QT_LIBS="$ROOTQT"/lib - -AC_ARG_WITH(qt-includes, - [ --with-qt-includes=DIR Specify location of Qt headers], - [QT_INCLUDES="$withval"] - ) - -AC_ARG_WITH(qt-libraries, - [ --with-qt-libs=DIR Specify location of Qt libraries], - [QT_LIBS="$withval"] - ) - -if test "x$QT_LIBS" = "x" ; then - QT_LIBS="$ROOTQT"/lib -fi -if test "x$QT_INCLUDES" = "x" ; then - QT_INCLUDES="$ROOTQT"/include -fi -dnl we should get QT's version from here and compare with what kde-config -dnl says - -AC_MSG_CHECKING(whether or not to use a KDE Toolbar in KVim) -AC_ARG_ENABLE(kde-toolbar, - [ --enable-kde-toolbar if KDE GUI is selected, enable a KDE-look toolbar [default=no]], - , enable_kde_toolbar="no") -if test "x$enable_kde_toolbar" != "xno"; then - AC_DEFINE(FEAT_KDETOOLBAR) -fi -AC_MSG_RESULT($enable_kde_toolbar); -fi - -dnl ------------------- -dnl so, first, look up at the kde-config script -dnl ------------------ - -if test -z "$SKIP_KDE"; then -AC_DEFUN([AC_FIND_FILE], -[ - $3=NO - for i in $2; - do - for j in $1; - do - echo "configure: __oline__: $i/$j" >&AC_FD_CC - if test -r "$i/$j"; then - echo "taking that" >&AC_FD_CC - $3=$i - break 2 - fi - done - done -]) - -AC_DEFUN(AM_PATH_KDE, -[ - if test "X$KDE_CONFIG" != "X"; then - min_kde_version=ifelse([$1], ,2.0,[$1]) - AC_MSG_CHECKING(for KDE version >= $min_kde_version) - no_kde="" - if test "$KDE_CONFIG" = "no" ; then - no_kde=yes - else - KDE_PREFIX=`$KDE_CONFIG --prefix` - if test "x$KDE_LIBS" = "x"; then - KDE_LIBS="$KDE_PREFIX/lib" - fi - if test "x$KDE_INCLUDES" = "x"; then - KDE_INCLUDES="$KDE_PREFIX/include" - if test -d "$KDE_INCLUDES/kde"; then - KDE_INCLUDES="$KDE_INCLUDES/kde" - fi - fi - kde_major_version=`$KDE_CONFIG --version | grep KDE | \ -sed 's/KDE:\ //' | sed 's/\([[0-9]]*\).\([[0-9]]*.*\)/\1/'` - kde_minor_version=`$KDE_CONFIG --version | grep KDE | \ -sed 's/KDE:\ //' | sed 's/\([[0-9]]*\).\([[0-9]]*.*\)/\2/'` - - qt_major_version=`$KDE_CONFIG --version | grep Qt | sed -e \ -'s/Qt:\ //' | sed 's/\([[0-9]]*\).\([[0-9]]*.*\)/\1/'` - qt_minor_version=`$KDE_CONFIG --version | grep Qt | sed -e \ -'s/Qt:\ //' | sed 's/\([[0-9]]*\).\([[0-9]]*.*\)/\2/'` - - dnl maybe in a near future we'll get these ones : QT_PREFIX, QT_LIBS, - dnl QT_INCLUDES - dnl but for now we need configure options to get them ... - if test "x$enable-kdetest" = "xyes" ; then - ac_save_LIBS="$LIBS" - LIBS="$LIBS $KDE_LIBS" - - dnl fake test - AC_TRY_RUN([ -#include <stdio.h> -int -main() -{ return 0; } - ],, no_kde=yes,[echo $ac_n "cross compiling KDE ? ? how can i remove that ? :)"]) - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_kde" = x ; then - AC_MSG_RESULT(found KDE $kde_major_version.$kde_minor_version) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - KDE_LIBS="" - ifelse([$3], , :, [$3]) - fi -else - AC_MSG_RESULT(no) - KDE_LIBS="" - ifelse([$3], , :, [$3]) -fi - -AC_SUBST(KDE_LIBS) -AC_SUBST(KDE_INCLUDES) -AC_SUBST(KDE_PREFIX) -]) - -dnl Check all the KDE stuff -AC_MSG_CHECKING(--disable-rpath argument) -AC_ARG_ENABLE(rpath, - [ --disable-rpath Disable rpath.], - , enable_rpath="yes") -if test "$enable_rpath" = "yes"; then - AC_MSG_RESULT(no) -else - AC_MSG_RESULT(yes) -fi - -AC_MSG_CHECKING(--with-kde-prefix argument) -AC_ARG_WITH(kde-prefix,[ --with-kde-prefix=PFX Prefix where KDE is installed (optional)],kde_config_prefix="$withval"; -AC_MSG_RESULT($kde_config_prefix), kde_config_prefix="";AC_MSG_RESULT(no)) - -AC_ARG_WITH(kde-includes, - [ --with-kde-includes=DIR Specify location of KDE headers], - [KDE_INCLUDES="$withval"] - ) - -AC_ARG_WITH(kde-libraries, - [ --with-kde-libs=DIR Specify location of KDE libraries], - [KDE_LIBS="$withval"] - ) - -AC_MSG_CHECKING(--disable-kdetest argument) -AC_ARG_ENABLE(kdetest, - [ --disable-kdetest Do not try to compile and run a test KDE program], - enable_kdetest=yes) - -if test "x$enable_kdetest" = "xyes" ; then - AC_MSG_RESULT(kde test enabled) -else - AC_MSG_RESULT(kde test disabled) -fi - -if test "x$kde_config_prefix" != "x" ; then - KDE_CONFIG=$kde_config_prefix/bin/kde-config -fi - -if test "X$KDE_CONFIG" = "X"; then - AC_PATH_PROG(KDE_CONFIG, kde-config, no) -else - AC_MSG_RESULT(Using KDE configuration program $KDE_CONFIG) -fi - -if test "X$KDE_CONFIG" != "X" ; then - AM_PATH_KDE(2.0.0, - [GUI_LIB_LOC="-L$KDE_LIBS -lkdeui -lkdecore -lDCOP" - GUI_INC_LOC="-I$KDE_INCLUDES" - KDEDIR="$KDE_PREFIX"], ) - if test "x$KDE_PREFIX" != "x"; then - AC_MSG_CHECKING(for QT version $qt_major_version.x) - if test "x$ROOTQT" != "x" ; then - GUI_INC_LOC="-I$QT_INCLUDES $GUI_INC_LOC" - if test $qt_major_version -lt 2; then - AC_MSG_ERROR(Your QT version is prior to 2.0; KDE 2.x and 3.x require at least QT 2) - fi - dnl hack for FreeBSD - if test "`(uname) 2>/dev/null`" = "FreeBSD"; then - CFLAGS="$CFLAGS -D_THREAD_SAFE" - CXXFLAGS="$CXXFLAGS -D_THREAD_SAFE" - GUI_LIB_LOC="$GUI_LIB_LOC -pthread" - LIBS="$LIBS -pthread" - fi - - dnl check the version - if test "x$enable_rpath" = "xyes"; then - if test $qt_major_version = 2; then - GUI_LIB_LOC="-L$KDE_LIBS -lkfile -L$QT_LIBS -lqt $GUI_LIB_LOC \ --Wl,--rpath -Wl,$KDE_LIBS -Wl,--rpath -Wl,$QT_LIBS" - else - GUI_LIB_LOC="-L$KDE_LIBS -lkio -L$QT_LIBS -lqt-mt $GUI_LIB_LOC \ --Wl,--rpath -Wl,$KDE_LIBS -Wl,--rpath -Wl,$QT_LIBS" - fi - else - if test $qt_major_version = 2; then - GUI_LIB_LOC="-L$KDE_LIBS -lkfile -L$QT_LIBS -lqt $GUI_LIB_LOC" - else - GUI_LIB_LOC="-L$KDE_LIBS -lkio -L$QT_LIBS -lqt-mt $GUI_LIB_LOC" - fi - fi - - dnl Remove "-I/usr/include " from GUI_* - GUI_INC_LOC="`echo $GUI_INC_LOC\ | sed 's%-I/usr/include %%'`" -dnl GUI_LIB_LOC="`echo $GUI_LIB_LOC\ | sed 's% -L/usr/lib%%'`" - - AC_MSG_RESULT(found $qt_major_version.$qt_minor_version in $ROOTQT) - - dnl now check the results ... - dnl find the Qt's headers ? - AC_FIND_FILE(qstyle.h,$QT_INCLUDES,qt_incdir) - if test "x$qt_incdir" = "xNO"; then - AC_MSG_ERROR(Could not find Qt headers in $QT_INCLUDES) - fi - AC_FIND_FILE(kapplication.h,$KDE_INCLUDES,kde_incdir) - if test "x$kde_incdir" = "xNO"; then - AC_MSG_ERROR(Could not find KDE headers in $KDE_INCLUDES) - fi - - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_PROG_CXX - ac_save_LIBS="$LIBS" - LIBS="$GUI_LIB_LOC" - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS $GUI_INC_LOC" - AC_MSG_CHECKING(whether Qt libraries are usable) - AC_TRY_LINK( - [#include <qapplication.h>], - [ - int argc; - char** argv; - QApplication app(argc, argv);] - ,AC_MSG_RESULT(yes),AC_MSG_RESULT(no);AC_MSG_ERROR(Qt fails to link a simple application, check your installation and settings)) - - AC_MSG_CHECKING(whether KDE libraries are usable) - AC_TRY_LINK( - [#include <kapplication.h>], - [ - int argc; - char** argv; - KApplication app(argc, argv);] - ,AC_MSG_RESULT(yes),AC_MSG_RESULT(no);AC_MSG_ERROR(KDE fails to link a simple application, check your installation and settings)) - - LIBS="$ac_save_LIBS" - CXXFLAGS="$ac_save_CXXFLAGS" - AC_LANG_RESTORE - - - SKIP_GTK=YES - SKIP_ATHENA=YES - SKIP_MOTIF=YES - GUITYPE=KDE - AC_SUBST(KDE_PREFIX) - AC_SUBST(QT_LIBS) - AC_SUBST(QT_INCLUDES) - AC_SUBST(ROOTQT) - AC_SUBST(MOC) - AC_DEFINE(FEAT_GUI_KDE) - else - AC_MSG_ERROR(Detected QT version mismatched) - fi - else - AC_MSG_ERROR(Could not find KDE installation prefix) - fi -fi -fi if test "x$MACOSX" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then AC_MSG_CHECKING(for Carbon GUI) @@ -2156,10 +1840,6 @@ if test "x$GUITYPE:$enable_fontset" = "xGTK:yes" -a "0$gtk_major_version" -ge 2; AC_MSG_RESULT(GTK+ 2 GUI selected; fontset has been disabled) enable_fontset="no" fi -if test "x$GUITYPE:$enable_fontset" = "xKDE:yes"; then - AC_MSG_RESULT(KDE GUI selected; fontset has been disabled) - enable_fontset="no" -fi if test -z "$SKIP_PHOTON"; then GUITYPE=PHOTONGUI @@ -2261,6 +1941,10 @@ AC_TRY_COMPILE([ AC_MSG_RESULT(no)) AC_CHECK_HEADERS(strings.h) +if test "x$MACOSX" = "xyes"; then + dnl The strings.h file on OS/X contains a warning and nothing useful. + AC_DEFINE(NO_STRINGS_WITH_STRING_H) +else dnl Check if strings.h and string.h can both be included when defined. AC_MSG_CHECKING([if strings.h can be included after string.h]) @@ -2285,6 +1969,7 @@ AC_TRY_COMPILE([ AC_DEFINE(NO_STRINGS_WITH_STRING_H) AC_MSG_RESULT(no)) CPPFLAGS=$cppflags_save +fi dnl Checks for typedefs, structures, and compiler characteristics. AC_PROG_GCC_TRADITIONAL |