# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
#
GTK_MAJOR_VERSION=1
-GTK_MINOR_VERSION=1
-GTK_MICRO_VERSION=15
-GTK_INTERFACE_AGE=1
-GTK_BINARY_AGE=1
+GTK_MINOR_VERSION=3
+GTK_MICRO_VERSION=0
+GTK_INTERFACE_AGE=0
+GTK_BINARY_AGE=0
GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
dnl
AC_DIVERT_POP()dnl
, enable_xim="yes")
AC_ARG_ENABLE(xim_inst, [ --disable-xim-inst does not use xim instantiate callback],
, enable_xim_inst="maybe")
+AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,enable_rebuilds=yes)
AC_ARG_WITH(locale, [ --with-locale=LOCALE locale name you want to use ])
AC_ARG_WITH(xinput, [ --with-xinput=[no/gxi/xfree] support XInput ])
fi
changequote([,])dnl
+# Honor aclocal flags
+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
# define a MAINT-like variable REBUILD which is set if Perl
# and awk are found, so autogenerated sources can be rebuilt
AC_CHECK_PROG(INDENT, indent, indent)
REBUILD=\#
-if test -n "$PERL" && perl -v | grep 'version 5.' > /dev/null ; then
- if test -n "$AWK" ; then
- REBUILD=
- fi
+if test "x$enable_rebuilds" = "xyes" && \
+ test -n "$PERL" && \
+ $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \
+ test -n "$AWK" ; then
+ REBUILD=
fi
AC_SUBST(REBUILD)
+AC_CHECK_FUNCS(lstat)
+
+AC_MSG_CHECKING(whether make is GNU Make)
+STRIP_BEGIN=
+STRIP_END=
+if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
+ STRIP_BEGIN='$(strip'
+ STRIP_END=')'
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+AC_SUBST(STRIP_BEGIN)
+AC_SUBST(STRIP_END)
+
# i18n stuff
-ALL_LINGUAS="cs de es fr it ja ko nl no pl pt ru sv"
+ALL_LINGUAS="ca cs da de el es et eu fi fr ga gl hr hu it ja ko nl no pl pt pt_BR ru sk sl sv uk wa zh_TW.Big5"
AM_GTK_GNU_GETTEXT
-AC_CHECK_FUNC(gettext,
- ,
- AC_CHECK_LIB(intl, gettext)
-)
+LIBS="$LIBS $INTLLIBS"
+
# AM_GTK_GNU_GETTEXT above substs $DATADIRNAME
# this is the directory where the *.{mo,gmo} files are installed
gtklocaledir='${prefix}/${DATADIRNAME}/locale'
AC_MSG_RESULT()
CFLAGS=$gtk_save_CFLAGS
AC_MSG_WARN(
- [No ANSI prototypes found in library. (-std1 didn't work.)])
- )
+ [No ANSI prototypes found in library. (-std1 didn't work.)]),
+ true
+ ),
+ AC_MSG_RESULT(none needed)
)
LIBS=$gtk_save_LIBS
+MATH_LIB=-lm
+GTK_LIBS_EXTRA=
+AC_MSG_CHECKING(for the BeOS)
+case $host in
+ *-*-beos*)
+ AC_MSG_RESULT(yes)
+ GTK_LIBS_EXTRA="-L\$(top_builddir_full)/gdk/.libs -lgdk"
+ MATH_LIB=
+ ;;
+ *)
+ AC_MSG_RESULT(no)
+ ;;
+esac
+AC_SUBST(MATH_LIB)
+AC_SUBST(GTK_LIBS_EXTRA)
+
dnl NeXTStep cc seems to need this
AC_MSG_CHECKING([for extra flags for POSIX compliance])
AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
if test x$with_glib = x ; then
# Look for separately installed glib
- AM_PATH_GLIB(1.1.15,,
+ AM_PATH_GLIB(1.3.0,,
AC_MSG_ERROR([
-*** GLIB 1.1.15 or better is required. The latest version of GLIB
-*** is always available from ftp://ftp.gtk.org.]),
+*** GLIB 1.3.0 or better is required. The latest version of GLIB
+*** is always available from ftp://ftp.gtk.org/.]),
gmodule gthread)
# we do not want to make all gtk progs to link to thread libraries.
esac
GLIB_CFLAGS="-I$glib_dir -I$glib_dir/gmodule"
- GLIB_LIBS="$glib_dir/libglib.la $glib_dir/gmodule.la"
+ GLIB_LIBS="$glib_dir/libglib.la $glib_dir/gmodule/libgmodule.la"
GLIB_DEPLIBS=
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(glib_thread_libs)
AC_SUBST(GLIB_DEPLIBS)
+AC_CHECK_HEADERS(dirent.h, AC_DEFINE(HAVE_DIRENT_H))
+AC_CHECK_HEADERS(pwd.h, AC_DEFINE(HAVE_PWD_H))
+AC_CHECK_HEADERS(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H))
+
# Find the X11 include and library directories
AC_PATH_X
AC_PATH_XTRA
AC_DEFINE(XINPUT_NONE)
fi
+AM_CONDITIONAL(XINPUT_GXI, test x$with_xinput = xgxi)
+AM_CONDITIONAL(XINPUT_XFREE, test x$with_xinput = xxfree)
+
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
return setlocale (LC_ALL, "${with_locale}") == NULL;
}],
need_x_locale=no,
-need_x_locale=yes)
+need_x_locale=yes,
+need_x_locale=no)
AC_MSG_RESULT($need_x_locale)
if test $need_x_locale = yes; then
- GTK_LOCALE_CFLAGS="-DX_LOCALE"
+ GTK_LOCALE_FLAGS="-DX_LOCALE"
fi
# Checks for header files.
fi
fi
-# Duplicate `widechar' tests from `glib'.
-# Check for wchar.h
-if test x = y; then
- # will not be executed
- # hack so as not to update `acconfig.h'
- AC_CHECK_HEADERS(wchar.h wctype.h)
- AC_CHECK_FUNCS(broken_wctype)
-fi
-
+# `widechar' tests for gdki18n.h
AC_MSG_CHECKING(for wchar.h)
-AC_TRY_CPP([#include <wchar.h>], gtk_ok=yes, gtk_ok=no)
-if test $gtk_ok = yes; then
- ac_kludge=HAVE_WCHAR_H
- AC_DEFINE($ac_kludge)
+AC_TRY_CPP([#include <wchar.h>], gdk_wchar_h=yes, gdk_wchar_h=no)
+if test $gdk_wchar_h = yes; then
+ AC_DEFINE(HAVE_WCHAR_H,1,[Have wchar.h include file])
fi
-AC_MSG_RESULT($gtk_ok)
+AC_MSG_RESULT($gdk_wchar_h)
# Check for wctype.h (for iswalnum)
-
AC_MSG_CHECKING(for wctype.h)
-AC_TRY_CPP([#include <wctype.h>], gtk_ok=yes, gtk_ok=no)
-if test $gtk_ok = yes; then
- ac_kludge=HAVE_WCTYPE_H
- AC_DEFINE($ac_kludge)
+AC_TRY_CPP([#include <wctype.h>], gdk_wctype_h=yes, gdk_wctype_h=no)
+if test $gdk_wctype_h = yes; then
+ AC_DEFINE(HAVE_WCTYPE_H,1,[Have wctype.h include file])
fi
-AC_MSG_RESULT($gtk_ok)
+AC_MSG_RESULT($gdk_wctype_h)
# in Solaris 2.5, `iswalnum' is in -lw
GDK_WLIBS=
AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS=-lw)])
-# The following is necessary for Linux libc-5.4.38
oLIBS="$LIBS"
LIBS="$LIBS $GDK_WLIBS"
+# The following is necessary for Linux libc-5.4.38
AC_MSG_CHECKING(if iswalnum() and friends are properly defined)
AC_TRY_LINK([#include <stdlib.h>],[
#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
#endif
iswalnum((wchar_t) 0);
-], gtk_ok=yes, gtk_ok=no)
+], gdk_working_wctype=yes, gdk_working_wctype=no)
LIBS="$oLIBS"
-if test $gtk_ok = no; then
- ac_kludge=HAVE_BROKEN_WCTYPE
- AC_DEFINE($ac_kludge)
+if test $gdk_working_wctype = no; then
+ AC_DEFINE(HAVE_BROKEN_WCTYPE,1,[Is the wctype implementation broken])
GDK_WLIBS=
fi
-AC_MSG_RESULT($gtk_ok)
+AC_MSG_RESULT($gdk_working_wctype)
AC_SUBST(GDK_WLIBS)
AC_SUBST(GTK_DEBUG_FLAGS)
AC_SUBST(GTK_XIM_FLAGS)
AC_SUBST(GTK_LOCALE_FLAGS)
+AC_OUTPUT_COMMANDS([
+
+## Generate `gdk/gdkconfig.h' in two cases
+## 1. `config.status' is run either explicitly, or via configure.
+## Esp. not when it is run in `Makefile' to generate makefiles and
+## config.h
+## 2. CONFIG_OTHER is set explicitly
+##
+## Case 1 is difficult. We know that `automake' sets one of
+## CONFIG_FILES or CONFIG_HEADERS to empty. This heuristic works
+## only when AM_CONFIG_HEADER is set, however.
+
+if test -n "${CONFIG_FILES}" && test -n "${CONFIG_HEADERS}"; then
+ # Both CONFIG_FILES and CONFIG_HEADERS are non-empty ==> Case 1
+ CONFIG_OTHER=${CONFIG_OTHER:-gdk/gdkconfig.h}
+fi
+case "$CONFIG_OTHER" in
+*gdk/gdkconfig.h*)
+ echo creating gdk/gdkconfig.h
+ outfile=gdkconfig.h-tmp
+ cat > $outfile <<\_______EOF
+/* gdkconfig.h
+ *
+ * This is a generated file. Please modify `configure.in'
+ */
+
+#ifndef GDKCONFIG_H
+#define GDKCONFIG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+_______EOF
+
+ cat >>$outfile <<_______EOF
+$gdk_windowing
+$gdk_wc
+_______EOF
+
+ cat >>$outfile <<_______EOF
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* GDKCONFIG_H */
+_______EOF
+
+
+ if cmp -s $outfile gdk/gdkconfig.h; then
+ echo gdk/gdkconfig.h is unchanged
+ rm -f $outfile
+ else
+ mv $outfile gdk/gdkconfig.h
+ fi ;;
+esac
+],[
+# Currently we always use X11 on those systems where we run configure...
+gdk_windowing='
+#define GDK_WINDOWING_X11'
+if test x$gdk_wchar_h = xyes; then
+ gdk_wc='
+#define GDK_HAVE_WCHAR_H 1'
+fi
+if test x$gdk_wctype_h = xyes; then
+ gdk_wc="\$gdk_wc
+#define GDK_HAVE_WCTYPE_H 1"
+fi
+if test x$gdk_working_wctype = xno; then
+ gdk_wc="\$gdk_wc
+#define GDK_HAVE_BROKEN_WCTYPE 1"
+fi
+
+
+])
+
AC_OUTPUT([
+gtk+.spec
+docs/gtk-config.1
Makefile
gtk-config
po/Makefile.in
docs/Makefile
gdk/Makefile
+gdk/x11/Makefile
gtk/Makefile
gtk/gtkfeatures.h
+gtk/gtkcompat.h
], [chmod +x gtk-config])
projects / ~andy / gtk / blobdiff