Mercurial > vim

comparison src/configure.in @ 29:ac33b7c03fac v7.0018

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0018
author vimboss
date Mon, 11 Oct 2004 10:16:09 +0000
parents 293621502c4d
children 41f9fd58cf13
comparison
equal deleted inserted replaced
28:726bdc53fa49 29:ac33b7c03fac
1584 1584
1585 dnl define an autoconf function to check for a specified version of GTK, and 1585 dnl define an autoconf function to check for a specified version of GTK, and
1586 dnl try to compile/link a GTK program. this gets used once for GTK 1.1.16. 1586 dnl try to compile/link a GTK program. this gets used once for GTK 1.1.16.
1587 dnl 1587 dnl
1588 dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) 1588 dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
1589 dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS 1589 dnl Test for GTK, and define GTK_CFLAGS, GTK_LIBDIR and GTK_LIBS
1590 dnl 1590 dnl
1591 AC_DEFUN(AM_PATH_GTK, 1591 AC_DEFUN(AM_PATH_GTK,
1592 [ 1592 [
1593 if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then 1593 if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then
1594 { 1594 {
1600 { 1600 {
1601 dnl We should be using PKG_CHECK_MODULES() instead of this hack. 1601 dnl We should be using PKG_CHECK_MODULES() instead of this hack.
1602 dnl But I guess the dependency on pkgconfig.m4 is not wanted or 1602 dnl But I guess the dependency on pkgconfig.m4 is not wanted or
1603 dnl something like that. 1603 dnl something like that.
1604 GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` 1604 GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
1605 GTK_LIBDIR=`$PKG_CONFIG --libs-only-L gtk+-2.0`
1605 GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0` 1606 GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
1606 gtk_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ 1607 gtk_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
1607 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` 1608 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
1608 gtk_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ 1609 gtk_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
1609 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` 1610 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
1611 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` 1612 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
1612 } 1613 }
1613 elif test "X$GTK_CONFIG" != "Xno"; then 1614 elif test "X$GTK_CONFIG" != "Xno"; then
1614 { 1615 {
1615 GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` 1616 GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
1617 GTK_LIBDIR=
1616 GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` 1618 GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
1617 gtk_major_version=`$GTK_CONFIG $gtk_config_args --version | \ 1619 gtk_major_version=`$GTK_CONFIG $gtk_config_args --version | \
1618 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` 1620 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
1619 gtk_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ 1621 gtk_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
1620 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` 1622 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
1852 if test "x$GTK_CONFIG:$PKG_CONFIG" != "xno:no"; then 1854 if test "x$GTK_CONFIG:$PKG_CONFIG" != "xno:no"; then
1853 dnl First try finding version 2.2.0 or later. The 2.0.x series has 1855 dnl First try finding version 2.2.0 or later. The 2.0.x series has
1854 dnl problems (bold fonts, --remote doesn't work). 1856 dnl problems (bold fonts, --remote doesn't work).
1855 if test "X$SKIP_GTK2" != "XYES"; then 1857 if test "X$SKIP_GTK2" != "XYES"; then
1856 AM_PATH_GTK(2.2.0, 1858 AM_PATH_GTK(2.2.0,
1857 [GTK_LIBNAME="$GTK_LIBS" 1859 [GUI_LIB_LOC="$GTK_LIBDIR"
1860 GTK_LIBNAME="$GTK_LIBS"
1858 GUI_INC_LOC="$GTK_CFLAGS"], ) 1861 GUI_INC_LOC="$GTK_CFLAGS"], )
1859 if test "x$GTK_CFLAGS" != "x"; then 1862 if test "x$GTK_CFLAGS" != "x"; then
1860 SKIP_ATHENA=YES 1863 SKIP_ATHENA=YES
1861 SKIP_NEXTAW=YES 1864 SKIP_NEXTAW=YES
1862 SKIP_MOTIF=YES 1865 SKIP_MOTIF=YES