callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename configure.in to configure.ac

Browse Source 
In the autoconf manual the recomended name for the autoconf input file
is configure.ac and not configure.in. Follow this recomendation.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=598768
This commit is contained in:
Martin Nordholts 2010-05-07 09:53:03 +02:00 committed by Javier Jardón
parent 3781b24476
commit ccc53b9a45
5 changed files with 89 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
configure.in → configure.ac
View File

@ -58,7 +58,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
# #
# For each of the libraries we build, we define the following # For each of the libraries we build, we define the following
# substituted variables: # substituted variables:
# #
# foo_PACKAGES: pkg-config packages this library requires # foo_PACKAGES: pkg-config packages this library requires
@ -163,10 +162,10 @@ dnl Initialize libtool
AC_PROG_CC AC_PROG_CC
AM_DISABLE_STATIC AM_DISABLE_STATIC
dnl dnl
dnl Check for a working C++ compiler, but do not bail out, if none is found. dnl Check for a working C++ compiler, but do not bail out, if none is found.
dnl We use this for an automated test for C++ header correctness. dnl We use this for an automated test for C++ header correctness.
dnl dnl
AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc) AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc)
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
@ -287,7 +286,7 @@ AC_SUBST(gtktargetlib)
if test "x$enable_debug" = "xyes"; then if test "x$enable_debug" = "xyes"; then
test "$cflags_set" = set || CFLAGS="$CFLAGS -g" test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES" GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES"
else else
if test "x$enable_debug" = "xno"; then if test "x$enable_debug" = "xno"; then
GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS" GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
@ -305,7 +304,7 @@ fi
AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}", AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}",
[Define if debugging is enabled]) [Define if debugging is enabled])
# Build time sanity check... # Build time sanity check...
AM_SANITY_CHECK AM_SANITY_CHECK
@ -377,11 +376,11 @@ fi
# Honor aclocal flags # Honor aclocal flags
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
## Initial sanity check, done here so that users get told they ## Initial sanity check, done here so that users get told they
## have the wrong dependencies as early in the process as possible. ## have the wrong dependencies as early in the process as possible.
## Later on we actually use the cflags/libs from separate pkg-config ## Later on we actually use the cflags/libs from separate pkg-config
## calls. Oh, also the later pkg-config calls don't include ## calls. Oh, also the later pkg-config calls don't include
## the version requirements since those make the module lists ## the version requirements since those make the module lists
## annoying to construct ## annoying to construct
PKG_CHECK_MODULES(BASE_DEPENDENCIES, PKG_CHECK_MODULES(BASE_DEPENDENCIES,
[glib-2.0 >= glib_required_version dnl [glib-2.0 >= glib_required_version dnl
@ -416,7 +415,7 @@ dnl ******************************************************
dnl * See whether to include shared library dependencies * dnl * See whether to include shared library dependencies *
dnl ****************************************************** dnl ******************************************************
AC_ARG_ENABLE(explicit-deps, AC_ARG_ENABLE(explicit-deps,
[AC_HELP_STRING([--enable-explicit-deps=@<:@yes/no/auto@:>@], [AC_HELP_STRING([--enable-explicit-deps=@<:@yes/no/auto@:>@],
[use explicit dependencies in .pc files [default=auto]])],, [use explicit dependencies in .pc files [default=auto]])],,
[enable_explicit_deps=auto]) [enable_explicit_deps=auto])
@ -427,12 +426,12 @@ case $enable_explicit_deps in
export SED export SED
deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
enable_explicit_deps=yes enable_explicit_deps=yes
else else
enable_explicit_deps=no enable_explicit_deps=no
fi fi
;; ;;
yes|no) yes|no)
;; ;;
*) AC_MSG_ERROR([Value given to --enable-explicit-deps must be one of yes, no or auto]) *) AC_MSG_ERROR([Value given to --enable-explicit-deps must be one of yes, no or auto])
;; ;;
@ -507,7 +506,7 @@ if test "$gtk_ok" = "yes"; then
AC_DEFINE([HAVE__NL_PAPER_WIDTH], [1], AC_DEFINE([HAVE__NL_PAPER_WIDTH], [1],
[Define if _NL_PAPER_WIDTH is available]) [Define if _NL_PAPER_WIDTH is available])
fi fi
# sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable # sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable
AC_MSG_CHECKING(for sigsetjmp) AC_MSG_CHECKING(for sigsetjmp)
AC_TRY_LINK([#include <setjmp.h>], [ AC_TRY_LINK([#include <setjmp.h>], [
@ -550,7 +549,7 @@ dnl (End of adapted AM_GLIB_GNU_GETTEXT snippet.)
AM_GLIB_DEFINE_LOCALEDIR(GTK_LOCALEDIR) AM_GLIB_DEFINE_LOCALEDIR(GTK_LOCALEDIR)
dnl The DU4 header files don't provide library prototypes unless dnl The DU4 header files don't provide library prototypes unless
dnl -std1 is given to the native cc. dnl -std1 is given to the native cc.
AC_MSG_CHECKING([for extra flags to get ANSI library prototypes]) AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
@ -614,13 +613,13 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
# #
# Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working # Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working
# #
GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0" GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0"
AM_PATH_GLIB_2_0(glib_required_version, :, AM_PATH_GLIB_2_0(glib_required_version, :,
AC_MSG_ERROR([ AC_MSG_ERROR([
*** GLIB glib_required_version or better is required. The latest version of *** GLIB glib_required_version or better is required. The latest version of
*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]), *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
gobject gmodule-no-export gthread) gobject gmodule-no-export gthread)
@ -795,7 +794,7 @@ if test x$enable_modules = xno; then
else else
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_MSG_CHECKING(whether dynamic modules work) AC_MSG_CHECKING(whether dynamic modules work)
## for loop is to strip newline ## for loop is to strip newline
tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0` tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0`
for I in $tmp; do for I in $tmp; do
dynworks=$I dynworks=$I
@ -867,7 +866,7 @@ if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
if test x$with_libtiff != xno && test -z "$LIBTIFF"; then if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
*** Checks for TIFF loader failed. You can build without it by passing *** Checks for TIFF loader failed. You can build without it by passing
*** --without-libtiff to configure but some programs using GTK+ may *** --without-libtiff to configure but some programs using GTK+ may
*** not work properly]) *** not work properly])
fi fi
@ -893,7 +892,7 @@ if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
AC_MSG_RESULT($jpeg_ok) AC_MSG_RESULT($jpeg_ok)
if test "$jpeg_ok" = yes; then if test "$jpeg_ok" = yes; then
LIBJPEG='-ljpeg' LIBJPEG='-ljpeg'
AC_CHECK_LIB(jpeg, jpeg_simple_progression, AC_CHECK_LIB(jpeg, jpeg_simple_progression,
AC_DEFINE(HAVE_PROGRESSIVE_JPEG, 1, AC_DEFINE(HAVE_PROGRESSIVE_JPEG, 1,
[Define to 1 is libjpeg supports progressive JPEG]), [Define to 1 is libjpeg supports progressive JPEG]),
AC_MSG_WARN(JPEG library does not support progressive saving.)) AC_MSG_WARN(JPEG library does not support progressive saving.))
@ -905,7 +904,7 @@ if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
*** Checks for JPEG loader failed. You can build without it by passing *** Checks for JPEG loader failed. You can build without it by passing
*** --without-libjpeg to configure but some programs using GTK+ may *** --without-libjpeg to configure but some programs using GTK+ may
*** not work properly]) *** not work properly])
fi fi
@ -946,7 +945,7 @@ dnl Test for libpng
if test x$with_libpng != xno && test -z "$LIBPNG"; then if test x$with_libpng != xno && test -z "$LIBPNG"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
*** Checks for PNG loader failed. You can build without it by passing *** Checks for PNG loader failed. You can build without it by passing
*** --without-libpng to configure but many programs using GTK+ will *** --without-libpng to configure but many programs using GTK+ will
*** not work properly. The PNG loader is also needed if you are compiling *** not work properly. The PNG loader is also needed if you are compiling
*** from CVS.]) *** from CVS.])
@ -959,7 +958,7 @@ dnl Test for libjasper
if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
*** Checks for JPEG2000 loader failed. You can build without it by passing *** Checks for JPEG2000 loader failed. You can build without it by passing
*** --without-libjasper to configure]) *** --without-libjasper to configure])
fi fi
@ -983,7 +982,7 @@ AC_ARG_WITH(included_loaders,
[ --with-included-loaders=LOADER1,LOADER2,... [ --with-included-loaders=LOADER1,LOADER2,...
build the specified loaders into gdk-pixbuf]) build the specified loaders into gdk-pixbuf])
if $dynworks; then if $dynworks; then
: :
else else
## if the option was specified, leave it; otherwise disable included loaders ## if the option was specified, leave it; otherwise disable included loaders
@ -1081,21 +1080,21 @@ if test x$gio_can_sniff = x; then
AC_RUN_IFELSE([AC_LANG_SOURCE([[ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <gio/gio.h> #include <gio/gio.h>
static const gsize data_size = 159; static const gsize data_size = 159;
static const guint8 data[] = static const guint8 data[] =
{ {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00,
0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00,
0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74,
0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8, 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8,
0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57,
0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08, 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08,
0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc, 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc,
0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
0x42, 0x60, 0x82 0x42, 0x60, 0x82
}; };
int int
@ -1103,7 +1102,7 @@ if test x$gio_can_sniff = x; then
{ {
char *content_type; char *content_type;
char *image_png; char *image_png;
content_type = g_content_type_guess (NULL, data, data_size, NULL); content_type = g_content_type_guess (NULL, data, data_size, NULL);
image_png = g_content_type_from_mime_type ("image/png"); image_png = g_content_type_from_mime_type ("image/png");
return !!strcmp (content_type, image_png); return !!strcmp (content_type, image_png);
}]])], }]])],
@ -1128,7 +1127,7 @@ AC_ARG_WITH(included_immodules,
[ --with-included-immodules=MODULE1,MODULE2,... [ --with-included-immodules=MODULE1,MODULE2,...
build the specified input methods into gtk]) build the specified input methods into gtk])
if $dynworks; then if $dynworks; then
: :
else else
## if the option was specified, leave it; otherwise disable included immodules ## if the option was specified, leave it; otherwise disable included immodules
@ -1221,7 +1220,7 @@ fi
# support. # support.
# #
AC_CHECK_HEADER(sys/systeminfo.h, AC_CHECK_HEADER(sys/systeminfo.h,
AC_DEFINE(HAVE_SYS_SYSTEMINFO_H, 1, AC_DEFINE(HAVE_SYS_SYSTEMINFO_H, 1,
[Define to 1 if sys/systeminfo.h is available])) [Define to 1 if sys/systeminfo.h is available]))
AC_CHECK_HEADER(sys/sysinfo.h, AC_CHECK_HEADER(sys/sysinfo.h,
AC_DEFINE(HAVE_SYS_SYSINFO_H, 1, AC_DEFINE(HAVE_SYS_SYSINFO_H, 1,
@ -1258,10 +1257,10 @@ AM_CONDITIONAL(USE_MEDIALIB25, test $use_mlib25 = yes)
AC_MSG_CHECKING(for x86 platform) AC_MSG_CHECKING(for x86 platform)
case $host_cpu in case $host_cpu in
i386|i486|i586|i686|i786|k6|k7) i386|i486|i586|i686|i786|k6|k7)
use_x86_asm=yes use_x86_asm=yes
;; ;;
*) *)
use_x86_asm=no use_x86_asm=no
esac esac
AC_MSG_RESULT($use_x86_asm) AC_MSG_RESULT($use_x86_asm)
@ -1269,7 +1268,7 @@ use_mmx_asm=no
if test $use_x86_asm = yes; then if test $use_x86_asm = yes; then
save_ac_ext=$ac_ext save_ac_ext=$ac_ext
ac_ext=S ac_ext=S
AC_MSG_CHECKING(compiler support for MMX) AC_MSG_CHECKING(compiler support for MMX)
cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S
if AC_TRY_EVAL(ac_compile); then if AC_TRY_EVAL(ac_compile); then
@ -1307,11 +1306,11 @@ if test $cross_compiling = yes; then
fi fi
fi fi
if test ! -f $srcdir/gtk/gtkbuiltincache.h && if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
test "x$REBUILD_PNGS" = "x#" ; then test "x$REBUILD_PNGS" = "x#" ; then
AC_MSG_ERROR([ AC_MSG_ERROR([
*** gtkbuiltincache.h is not in the tree, and cannot be built *** gtkbuiltincache.h is not in the tree, and cannot be built
*** because you don't have libpng, or (when cross-compiling) you *** because you don't have libpng, or (when cross-compiling) you
*** don't have a prebuilt gtk-update-icon-cache on the build system.]) *** don't have a prebuilt gtk-update-icon-cache on the build system.])
fi fi
@ -1319,7 +1318,7 @@ AC_SUBST(REBUILD_PNGS)
GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0" GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB" GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
GDK_PIXBUF_EXTRA_CFLAGS= GDK_PIXBUF_EXTRA_CFLAGS=
GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
@ -1330,10 +1329,10 @@ GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $
GDK_PIXBUF_XLIB_PACKAGES= GDK_PIXBUF_XLIB_PACKAGES=
GDK_PIXBUF_XLIB_EXTRA_CFLAGS= GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
GDK_PIXBUF_XLIB_EXTRA_LIBS= GDK_PIXBUF_XLIB_EXTRA_LIBS=
GDK_EXTRA_LIBS="$GDK_WLIBS" GDK_EXTRA_LIBS="$GDK_WLIBS"
GDK_EXTRA_CFLAGS= GDK_EXTRA_CFLAGS=
# GTK+ uses some X calls, so needs to link against X directly # GTK+ uses some X calls, so needs to link against X directly
GTK_DEP_PACKAGES_FOR_X= GTK_DEP_PACKAGES_FOR_X=
GTK_DEP_LIBS_FOR_X= GTK_DEP_LIBS_FOR_X=
@ -1358,17 +1357,17 @@ if test "x$gdktarget" = "xx11"; then
X_PACKAGES="$X_PACKAGES x11 xext xrender" X_PACKAGES="$X_PACKAGES x11 xext xrender"
x_libs="`$PKG_CONFIG --libs x11 xext xrender`" x_libs="`$PKG_CONFIG --libs x11 xext xrender`"
X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`" X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`"
# Strip out any .la files that pkg-config might give us (this happens # Strip out any .la files that pkg-config might give us (this happens
# with -uninstalled.pc files) # with -uninstalled.pc files)
x_libs_for_checks= x_libs_for_checks=
for I in $x_libs ; do for I in $x_libs ; do
case $I in case $I in
*.la) ;; *.la) ;;
*) x_libs_for_checks="$x_libs_for_checks $I" ;; *) x_libs_for_checks="$x_libs_for_checks $I" ;;
esac esac
done done
GDK_PIXBUF_XLIB_PACKAGES="x11" GDK_PIXBUF_XLIB_PACKAGES="x11"
GTK_PACKAGES_FOR_X="x11" GTK_PACKAGES_FOR_X="x11"
else else
@ -1377,7 +1376,7 @@ if test "x$gdktarget" = "xx11"; then
if test x$no_x = xyes ; then if test x$no_x = xyes ; then
AC_MSG_ERROR([X development libraries not found]) AC_MSG_ERROR([X development libraries not found])
fi fi
x_cflags="$X_CFLAGS" x_cflags="$X_CFLAGS"
x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS" x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS"
@ -1394,7 +1393,7 @@ if test "x$gdktarget" = "xx11"; then
gtk_save_LIBS=$LIBS gtk_save_LIBS=$LIBS
LIBS="$x_libs_for_checks $LIBS" LIBS="$x_libs_for_checks $LIBS"
# Sanity check for the X11 and Xext libraries. While everything we need from # Sanity check for the X11 and Xext libraries. While everything we need from
# Xext is optional, the chances a system has *none* of these things is so # Xext is optional, the chances a system has *none* of these things is so
# small that we just unconditionally require it. # small that we just unconditionally require it.
@ -1426,9 +1425,9 @@ if test "x$gdktarget" = "xx11"; then
# Generic X11R6 check needed for XIM support; we could # Generic X11R6 check needed for XIM support; we could
# probably use this to replace the above, but we'll # probably use this to replace the above, but we'll
# leave the separate checks for XConvertCase and XInternAtoms # leave the separate checks for XConvertCase and XInternAtoms
# for clarity # for clarity
have_x11r6=false have_x11r6=false
AC_CHECK_FUNC(XAddConnectionWatch, AC_CHECK_FUNC(XAddConnectionWatch,
have_x11r6=true) have_x11r6=true)
@ -1458,7 +1457,7 @@ if test "x$gdktarget" = "xx11"; then
# X SYNC check # X SYNC check
gtk_save_CFLAGS="$CFLAGS" gtk_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $x_cflags" CFLAGS="$CFLAGS $x_cflags"
AC_CHECK_FUNC(XSyncQueryExtension, AC_CHECK_FUNC(XSyncQueryExtension,
[AC_CHECK_HEADER(X11/extensions/sync.h, [AC_CHECK_HEADER(X11/extensions/sync.h,
AC_DEFINE(HAVE_XSYNC, 1, [Have the SYNC extension library]), AC_DEFINE(HAVE_XSYNC, 1, [Have the SYNC extension library]),
@ -1473,9 +1472,9 @@ if test "x$gdktarget" = "xx11"; then
AC_CHECK_FUNC(XShmAttach, AC_CHECK_FUNC(XShmAttach,
:, :,
# On AIX, it is in XextSam instead # On AIX, it is in XextSam instead
[AC_CHECK_LIB(XextSam, XShmAttach, [AC_CHECK_LIB(XextSam, XShmAttach,
[GTK_ADD_LIB(x_extra_libs,XextSam)])]) [GTK_ADD_LIB(x_extra_libs,XextSam)])])
fi fi
if test "x$enable_shm" = "xyes"; then if test "x$enable_shm" = "xyes"; then
# Check for shared memory # Check for shared memory
@ -1489,7 +1488,7 @@ if test "x$gdktarget" = "xx11"; then
no_sys_shm=yes) no_sys_shm=yes)
# Check for the X shared memory extension header file # Check for the X shared memory extension header file
have_xshm=no have_xshm=no
AC_MSG_CHECKING(X11/extensions/XShm.h) AC_MSG_CHECKING(X11/extensions/XShm.h)
if test "x$no_xext_lib" = "xyes"; then if test "x$no_xext_lib" = "xyes"; then
: :
@ -1518,17 +1517,17 @@ if test "x$gdktarget" = "xx11"; then
# Check for Xinerama extension (Solaris impl or Xfree impl) # Check for Xinerama extension (Solaris impl or Xfree impl)
gtk_save_cppflags="$CPPFLAGS" gtk_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $x_cflags" CPPFLAGS="$CPPFLAGS $x_cflags"
# Check for XFree # Check for XFree
AC_MSG_CHECKING(for Xinerama support on XFree86) AC_MSG_CHECKING(for Xinerama support on XFree86)
have_xfree_xinerama=false have_xfree_xinerama=false
if $PKG_CONFIG --exists xinerama ; then if $PKG_CONFIG --exists xinerama ; then
have_xfree_xinerama=true have_xfree_xinerama=true
X_PACKAGES="$X_PACKAGES xinerama" X_PACKAGES="$X_PACKAGES xinerama"
else else
AC_CHECK_LIB(Xinerama, XineramaQueryExtension, AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
[AC_CHECK_HEADER(X11/extensions/Xinerama.h, [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
[GTK_ADD_LIB(x_extra_libs,Xinerama) [GTK_ADD_LIB(x_extra_libs,Xinerama)
have_xfree_xinerama=true], :, have_xfree_xinerama=true], :,
[#include <X11/Xlib.h>])]) [#include <X11/Xlib.h>])])
@ -1547,13 +1546,13 @@ if test "x$gdktarget" = "xx11"; then
*-*-solaris*) *-*-solaris*)
# Check for solaris # Check for solaris
AC_MSG_CHECKING(for Xinerama support on Solaris) AC_MSG_CHECKING(for Xinerama support on Solaris)
have_solaris_xinerama=false have_solaris_xinerama=false
AC_CHECK_FUNC(XineramaGetInfo, AC_CHECK_FUNC(XineramaGetInfo,
[AC_CHECK_HEADER(X11/extensions/xinerama.h, [AC_CHECK_HEADER(X11/extensions/xinerama.h,
[have_solaris_xinerama=true], :, [have_solaris_xinerama=true], :,
[#include <X11/Xlib.h>])]) [#include <X11/Xlib.h>])])
if $have_solaris_xinerama ; then if $have_solaris_xinerama ; then
AC_DEFINE(HAVE_SOLARIS_XINERAMA, 1, AC_DEFINE(HAVE_SOLARIS_XINERAMA, 1,
[Define to 1 if solaris xinerama is available]) [Define to 1 if solaris xinerama is available])
@ -1569,13 +1568,13 @@ if test "x$gdktarget" = "xx11"; then
esac esac
fi fi
fi fi
# set up things for XInput # set up things for XInput
if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then
AC_DEFINE(XINPUT_XFREE, 1, AC_DEFINE(XINPUT_XFREE, 1,
[Define to 1 if XFree XInput should be used]) [Define to 1 if XFree XInput should be used])
if $PKG_CONFIG --exists xi ; then if $PKG_CONFIG --exists xi ; then
X_PACKAGES="$X_PACKAGES xi" X_PACKAGES="$X_PACKAGES xi"
else else
@ -1594,20 +1593,20 @@ if test "x$gdktarget" = "xx11"; then
X_PACKAGES="$X_PACKAGES xrandr" X_PACKAGES="$X_PACKAGES xrandr"
fi fi
# Checks for Xcursor library # Checks for Xcursor library
if $PKG_CONFIG --exists xcursor ; then if $PKG_CONFIG --exists xcursor ; then
AC_DEFINE(HAVE_XCURSOR, 1, [Have the Xcursor library]) AC_DEFINE(HAVE_XCURSOR, 1, [Have the Xcursor library])
X_PACKAGES="$X_PACKAGES xcursor" X_PACKAGES="$X_PACKAGES xcursor"
fi fi
# Checks for XFixes extension # Checks for XFixes extension
if $PKG_CONFIG --exists xfixes ; then if $PKG_CONFIG --exists xfixes ; then
AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension]) AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
X_PACKAGES="$X_PACKAGES xfixes" X_PACKAGES="$X_PACKAGES xfixes"
GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes" GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes"
fi fi
@ -1778,7 +1777,7 @@ if test "x$gdktarget" = "xx11"; then
GTK_PACKAGES="$GTK_PACKAGES pangoft2" GTK_PACKAGES="$GTK_PACKAGES pangoft2"
fi fi
GTK_EXTRA_LIBS= GTK_EXTRA_LIBS=
GTK_EXTRA_CFLAGS= GTK_EXTRA_CFLAGS=
GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
@ -1832,7 +1831,7 @@ AC_CHECK_MEMBER([struct sockaddr_un.sun_len],
[#include <sys/types.h> [#include <sys/types.h>
#include <sys/un.h>] #include <sys/un.h>]
) )
case $struct_sockaddr_un_sun_len in case $struct_sockaddr_un_sun_len in
true) true)
AC_DEFINE_UNQUOTED(HAVE_SOCKADDR_UN_SUN_LEN, 1, AC_DEFINE_UNQUOTED(HAVE_SOCKADDR_UN_SUN_LEN, 1,
[Have the sockaddr_un.sun_len member]) [Have the sockaddr_un.sun_len member])
@ -1877,7 +1876,7 @@ else
if test $CUPS_API_MAJOR -gt 1 -o \ if test $CUPS_API_MAJOR -gt 1 -o \
$CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
AC_DEFINE(HAVE_CUPS_API_1_2, 1, AC_DEFINE(HAVE_CUPS_API_1_2, 1,
[Define to 1 if CUPS 1.2 API is available]) [Define to 1 if CUPS 1.2 API is available])
fi fi
@ -1942,17 +1941,17 @@ AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
if test "$os_win32" != "yes"; then if test "$os_win32" != "yes"; then
AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([ AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([
*** Can't find cairo-ps.h. You must build Cairo with the *** Can't find cairo-ps.h. You must build Cairo with the
*** postscript backend enabled.])) *** postscript backend enabled.]))
AC_CHECK_HEADER(cairo-svg.h,,AC_MSG_ERROR([ AC_CHECK_HEADER(cairo-svg.h,,AC_MSG_ERROR([
*** Can't find cairo-svg.h. You must build Cairo with the *** Can't find cairo-svg.h. You must build Cairo with the
*** svg backend enabled.])) *** svg backend enabled.]))
fi fi
CPPFLAGS="$gtk_save_cppflags" CPPFLAGS="$gtk_save_cppflags"
AC_ARG_ENABLE(test-print-backend, AC_ARG_ENABLE(test-print-backend,
[AC_HELP_STRING([--enable-test-print-backend], [AC_HELP_STRING([--enable-test-print-backend],
[build test print backend])],, [build test print backend])],,
@ -2030,7 +2029,7 @@ AC_CONFIG_COMMANDS([gdk/gdkconfig.h], [
cat > $outfile <<\_______EOF cat > $outfile <<\_______EOF
/* gdkconfig.h /* gdkconfig.h
* *
* This is a generated file. Please modify `configure.in' * This is a generated file. Please modify `configure.ac'
*/ */
#ifndef GDKCONFIG_H #ifndef GDKCONFIG_H

6
docs/RELEASE-HOWTO
View File

@ -29,9 +29,9 @@ Make sure that gtk-doc is the latest released version.
3) In particular, if this is a major, stable, release, verify that 3) In particular, if this is a major, stable, release, verify that
README.in contains the relevant release notes and that the README.in contains the relevant release notes and that the
required versions of dependencies in INSTALL.in are in sync required versions of dependencies in INSTALL.in are in sync
with configure.in. with configure.ac.
4) Verify that the version in configure.in has been bumped after the last 4) Verify that the version in configure.ac has been bumped after the last
release. (Note that this is critical, a slip-up here will cause the release. (Note that this is critical, a slip-up here will cause the
soname to change). soname to change).
@ -78,7 +78,7 @@ Make sure that gtk-doc is the latest released version.
git push origin refs/tags/2.12.10 git push origin refs/tags/2.12.10
13) Bump the version number in configure.in and commit and push this change 13) Bump the version number in configure.ac and commit and push this change
14) Upload the tarball to master.gnome.org and run install-module to transfer 14) Upload the tarball to master.gnome.org and run install-module to transfer
it to download.gnome.org. If you don't have an account on master.gnome.org, it to download.gnome.org. If you don't have an account on master.gnome.org,

4
docs/faq/gtk-faq.sgml
View File

@ -996,11 +996,11 @@ relevant packages. These are:</para>
or on any GNU mirror.</para> or on any GNU mirror.</para>
<para>In order to use the powerful autoconf/automake scheme, <para>In order to use the powerful autoconf/automake scheme,
you must create a configure.in which may look like:</para> you must create a configure.ac which may look like:</para>
<programlisting role="C"> <programlisting role="C">
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl configure.in for a GTK+ based program dnl configure.ac for a GTK+ based program
AC_INIT(myprg.c) AC_INIT(myprg.c)
AM_INIT_AUTOMAKE(mypkgname, 0.0.1) AM_INIT_AUTOMAKE(mypkgname, 0.0.1)

4
docs/gtk-config.txt
View File

@ -152,10 +152,10 @@ and the AM_PATH_GTK macro. The program used here is the testinput.c
You should first read the introductory portions of the automake You should first read the introductory portions of the automake
Manual, if you are not already familiar with it. Manual, if you are not already familiar with it.
Two files are needed, 'configure.in', which is used to build the Two files are needed, 'configure.ac', which is used to build the
configure script: configure script:
==configure.in=== ==configure.ac===
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_INIT(testinput.c) AC_INIT(testinput.c)

4
sanity_check
View File

@ -37,8 +37,8 @@ else
exit 1 exit 1
fi fi
echo -n "configure.in..." echo -n "configure.ac..."
if [ "x`grep $VERSION gtk+-$VERSION/configure.in | wc -l | awk -F' ' '{print $1}'`" == "x2" ]; then if [ "x`grep $VERSION gtk+-$VERSION/configure.ac | wc -l | awk -F' ' '{print $1}'`" == "x2" ]; then
echo "ok" echo "ok"
else else
echo "failed." echo "failed."