This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via 796b557c3a856a627c6fad8de59b26e3d529d08f (commit)
via c7843e3f3be0fe9e5f88ab59829fe2e9ba4511d1 (commit)
via 85a3fb13cc2ac8a32502f452b4f8bcd51b174151 (commit)
via 78690de10361a1e3505a16189a514d10a09845b9 (commit)
via 2c6c7d51c9cfb0760f8c20c2d2cda7d0cb2aaf21 (commit)
via f956609a434c20cdb5b96a4960de50d4b63f02ca (commit)
via 200b0d40981a8a22784c9cfdf2a692b3b50cf680 (commit)
via 99b1e26412163951f00ff3d40f2dfc023e0b1e98 (commit)
from 33d711ce6a66263f32b73b09a8ff52ddfb3d4c0f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/796b557c3a856a627c6fad8de59b26e3d529d08f
commit 796b557c3a856a627c6fad8de59b26e3d529d08f
Author: Christophe CURIS <[email protected]>
Date: Fri Jan 2 10:34:33 2015 +0100
configure: rewrote 2 ARG_WITH for paths to provide better feedback
The 2 options '--with-pixmapdir' and '--with-gnustepdir' did not provide
any feedback to the user if they were not used correctly. The new code now
performs more checks and tell the user about problems.
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/configure.ac b/configure.ac
index 53a39df3..1cb4c4ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -888,43 +888,44 @@ AC_CHECK_HEADERS(stdlib.h)
dnl Support for PIXMAPDIR option
dnl ============================
-AC_ARG_WITH(pixmapdir, AS_HELP_STRING([--with-pixmapdir=PATH], [specify where
pixmaps are located [DATADIR/pixmaps]]))
+AC_ARG_WITH([pixmapdir],
+ [AS_HELP_STRING([--with-pixmapdir=PATH], [specify where pixmaps are
located [DATADIR/pixmaps]])],
+ [AS_CASE([$withval],
+ [yes|no], [AC_MSG_ERROR([bad value '$withval' for --with-pixmapdir,
expected a path]) ],
+ [/*], [], dnl Absolute path, ok
+ [$*], [], dnl Assumes it starts with a reference to $prefix or a
similar variable, ok
+ [AC_MSG_ERROR([bad path '$withval' for pixmapdir, expecting an
absolute path])])],
+ [with_pixmapdir=""])
-if test "x$with_pixmapdir" != "x"; then
- pixmapdir=$with_pixmapdir
-else
- pixmapdir='${datadir}/pixmaps'
-fi
-AC_SUBST(pixmapdir)
+AS_IF([test "x$with_pixmapdir" != "x"],
+ [pixmapdir="$with_pixmapdir"],
+ [pixmapdir='${datadir}/pixmaps'])
+AC_SUBST([pixmapdir])dnl
dnl Support for GNUSTEP_LOCAL_ROOT, for WPrefs.app
dnl ==============================================
-AC_ARG_WITH(gnustepdir, AS_HELP_STRING([--with-gnustepdir=PATH], [specify the
directory for GNUstep applications]))
-
-if test "x`echo $with_gnustepdir | grep ^/`" != "x"; then
- appspath=$with_gnustepdir
-fi
-
-if test "x$appspath$GNUSTEP_LOCAL_ROOT" = "x"; then
- wprefs_base_dir=${prefix}
- wprefs_datadir="${datadir}/WPrefs"
- wprefs_bindir="${bindir}"
-else
- gnustepdir=$appspath
-
- if test "x$GNUSTEP_LOCAL_ROOT" != "x" ; then
- gnustepdir=`echo "$GNUSTEP_LOCAL_ROOT" | sed -e "s|^${prefix}|prefix|"`
- gnustepdir=`echo $gnustepdir | sed -e 's|^prefix|${prefix}|'`
- fi
-
- wprefs_base_dir=$gnustepdir/Applications
- wprefs_datadir=$wprefs_base_dir/WPrefs.app
- wprefs_bindir=$wprefs_base_dir/WPrefs.app
-fi
-
-AC_SUBST(wprefs_datadir)
-AC_SUBST(wprefs_bindir)
+AC_ARG_WITH([gnustepdir],
+ [AS_HELP_STRING([--with-gnustepdir=PATH], [specify the directory for
GNUstep applications])],
+ [AS_CASE([$withval],
+ [yes|no], [AC_MSG_ERROR([bad value '$withval' for --with-gnustepdir,
expected a path]) ],
+ [/*], [], dnl Absolute path, ok
+ [$*], [], dnl Assumes it starts with a reference to $prefix or a
similar variable, ok
+ [AC_MSG_ERROR([bad path '$withval' for gnustepdir, expecting an
absolute path])])],
+ [dnl If no command-line option was given, we use $GNUSTEP_LOCAL_ROOT if it
was set
+ with_gnustepdir="$GNUSTEP_LOCAL_ROOT"])
+
+AS_IF([test "x$with_gnustepdir" = "x"],
+ [dnl No path specified, use default
+ wprefs_base_dir=${prefix}
+ wprefs_datadir="${datadir}/WPrefs"
+ wprefs_bindir="${bindir}"],
+ [dnl User specified base path
+ wprefs_base_dir="$with_gnustepdir/Applications"
+ wprefs_datadir="$wprefs_base_dir/WPrefs.app"
+ wprefs_bindir="$wprefs_base_dir/WPrefs.app"])
+AC_SUBST([wprefs_datadir])dnl
+AC_SUBST([wprefs_bindir])dnl
dnl Enable User Defined Menu thing
http://repo.or.cz/w/wmaker-crm.git/commit/c7843e3f3be0fe9e5f88ab59829fe2e9ba4511d1
commit c7843e3f3be0fe9e5f88ab59829fe2e9ba4511d1
Author: Christophe CURIS <[email protected]>
Date: Fri Jan 2 10:34:32 2015 +0100
configure: rewrote 3 ARG_ENABLEs to get them to behave properly
In addition to proper quoting for M4, the macro would not behave totally as
expected: for example, providing '--disable-modelock' would enable the
feature instead of keeping it disabled as the default.
The definitions now properly behave as expectable, so the user can
explicitly specify how he wants the feature even if it is the default; it
will also fail on improper use which is always a good idea to ease possible
future evolution.
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/configure.ac b/configure.ac
index 8462a73f..53a39df3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -588,8 +588,14 @@ AC_CHECK_LIB([X11], [XConvertCase],
dnl XKB keyboard language status
dnl ============================
-AC_ARG_ENABLE(modelock, AS_HELP_STRING([--enable-modelock], [XKB keyboard
language status support]),
- AC_DEFINE(XKB_MODELOCK, 1, [whether XKB language MODELOCK
should be enabled]))
+AC_ARG_ENABLE([modelock],
+ [AS_HELP_STRING([--enable-modelock], [XKB keyboard language status
support])],
+ [AS_CASE([$enableval],
+ [yes|no], [],
+ [AC_MSG_ERROR([bad value '$enableval' for --enable-modelock])])],
+ [enable_modelock=no])
+AS_IF([test "x$enable_modelock" = "xyes"],
+ [AC_DEFINE([XKB_MODELOCK], [1], [whether XKB language MODELOCK should be
enabled]) ])
dnl XDND Drag-nd-Drop support
@@ -599,10 +605,11 @@ AC_ARG_ENABLE([xdnd],
[AS_CASE(["$enableval"],
[yes|no], [],
[AC_MSG_ERROR([bad value $enableval for --disable-xdnd]) ]) ],
- [enable_xdnd=yes
- supported_xext="$supported_xext XDnD"
- AC_DEFINE(XDND, 1, [whether Drag-nd-Drop support should be enabled])
-])
+ [enable_xdnd=yes])
+AS_IF([test "x$enable_xdnd" = "xyes"],
+ [supported_xext="$supported_xext XDnD"
+ AC_DEFINE([XDND], [1], [whether Drag-nd-Drop support should be enabled])],
+ [unsupported="$unsupported XDnd"])
dnl XShape support
@@ -922,11 +929,15 @@ AC_SUBST(wprefs_bindir)
dnl Enable User Defined Menu thing
dnl ==============================
-AC_ARG_ENABLE(usermenu, AS_HELP_STRING([--enable-usermenu], [user defined
menus for applications]),
-if test "$enableval" = yes; then
- AC_DEFINE(USER_MENU, 1, [define if you want user defined menus for
applications])
-fi
-)
+AC_ARG_ENABLE([usermenu],
+ [AS_HELP_STRING([--enable-usermenu], [user defined menus for
applications])],
+ [AS_CASE([$enableval],
+ [yes|no], [],
+ [AC_MSG_ERROR([bad value '$enableval' for --enable-usermenu])])],
+ [enable_usermenu=no])
+AS_IF([test "x$enable_usermenu" = "xyes"],
+ [AC_DEFINE([USER_MENU], [1],
+ [define if you want user defined menus for applications])])
dnl Support for removing non-public symbols from a library
http://repo.or.cz/w/wmaker-crm.git/commit/85a3fb13cc2ac8a32502f452b4f8bcd51b174151
commit 85a3fb13cc2ac8a32502f452b4f8bcd51b174151
Author: Christophe CURIS <[email protected]>
Date: Fri Jan 2 10:34:31 2015 +0100
configure: minor updates on quoting for consistency with Autoconf's syntax
Using the appropriate quoting (with [xxx]) can spare us some problem, so
for maintainability of the script the proper quoting was added in a few
places to have a consistent file.
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/configure.ac b/configure.ac
index 2d336a02..8462a73f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,12 +35,16 @@ AC_PREREQ([2.69])
dnl Configuration for Autoconf and Automake
dnl =======================================
AC_INIT([WindowMaker],[0.95.6],[[email protected]],[WindowMaker],[http://www.windowmaker.org/])
-AC_CONFIG_SRCDIR(src/WindowMaker.h)
AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.11 silent-rules])
-AH_BOTTOM([#include "config-paths.h"])
+dnl Reference file used by 'configure' to make sure the path to sources is
valid
+AC_CONFIG_SRCDIR([src/WindowMaker.h])
+
+dnl Include at the end of 'config.h', this file is generated by top-level
Makefile
+AH_BOTTOM([@%:@include "config-paths.h"])
+
dnl libtool library versioning
dnl ==========================
@@ -95,7 +99,7 @@ LT_INIT
dnl Debugging Options
dnl =================
-AC_ARG_ENABLE(debug,
+AC_ARG_ENABLE([debug],
[AS_HELP_STRING([--enable-debug], [enable debugging options,
@<:@default=no@:>@])],
[AS_CASE(["$enableval"],
[yes], [debug=yes],
@@ -121,8 +125,8 @@ AS_IF([test "x$debug" = "xyes"],
])
-AX_CFLAGS_GCC_OPTION(-Wall)
-AX_CFLAGS_GCC_OPTION(-Wextra -Wno-sign-compare)
+AX_CFLAGS_GCC_OPTION([-Wall])
+AX_CFLAGS_GCC_OPTION([-Wextra -Wno-sign-compare])
dnl
dnl The use of trampolines cause code that can crash on some secured OS, it is
dnl also known to be a source of crash if not used properly, in a more general
@@ -374,7 +378,8 @@ dnl Check for inotify
dnl =================
dnl It is used by WindowMaker to reload automatically the configuration when
the
dnl user changed it using WPref or wdwrite
-AC_CHECK_HEADERS(sys/inotify.h, AC_DEFINE(HAVE_INOTIFY, 1, Check for inotify))
+AC_CHECK_HEADERS([sys/inotify.h],
+ [AC_DEFINE([HAVE_INOTIFY], [1], [Check for inotify])])
dnl Check for syslog
@@ -403,7 +408,7 @@ WM_TYPE_SIGNAL
dnl pkg-config
dnl ==========
-AC_CHECK_PROG(PKGCONFIG, pkg-config, pkg-config)
+AC_CHECK_PROG([PKGCONFIG], [pkg-config], [pkg-config])
dnl gettext
@@ -535,11 +540,10 @@ dnl ===========================================
AC_PATH_XTRA
-if test $no_x; then
- AC_MSG_ERROR([The path for the X11 files not found!
+AS_IF([test "x$no_x" = "xyes"],
+ [AC_MSG_ERROR([The path for the X11 files not found!
Make sure you have X and it's headers and libraries (the -devel packages
-in Linux) installed.])
-fi
+in Linux) installed.])])
X_LIBRARY_PATH=$x_libraries
XCFLAGS="$X_CFLAGS"
@@ -568,16 +572,18 @@ fi
dnl Check whether XInternAtoms() exist
dnl ==================================
-AC_CHECK_LIB(X11, XInternAtoms,
- AC_DEFINE(HAVE_XINTERNATOMS, 1, [define if your X server has
XInternAtoms() (set by configure)]),,
- $XLFLAGS $XLIBS)
+AC_CHECK_LIB([X11], [XInternAtoms],
+ [AC_DEFINE([HAVE_XINTERNATOMS], [1],
+ [define if your X server has XInternAtoms() (set by configure)])],
+ [], [$XLFLAGS $XLIBS])
dnl Check whether XConvertCase() exist
dnl ==================================
-AC_CHECK_LIB(X11, XConvertCase,
- AC_DEFINE(HAVE_XCONVERTCASE, 1, [define if your X server has
XConvertCase() (set by configure)]),,
- $XLFLAGS $XLIBS)
+AC_CHECK_LIB([X11], [XConvertCase],
+ [AC_DEFINE([HAVE_XCONVERTCASE], [1],
+ [define if your X server has XConvertCase() (set by configure)])],
+ [], [$XLFLAGS $XLIBS])
dnl XKB keyboard language status
http://repo.or.cz/w/wmaker-crm.git/commit/78690de10361a1e3505a16189a514d10a09845b9
commit 78690de10361a1e3505a16189a514d10a09845b9
Author: Christophe CURIS <[email protected]>
Date: Fri Jan 2 10:34:30 2015 +0100
configure: cosmetic improvements on comments
This patch brings more consistency in the presentation of comments,
including:
- 2 line spaces between blocks (M4 macro tend to make the file look quite
bulky, so it is making the file more aerated)
- fixes in the length of underlining
- adding a few comments on the reason of the check to ease maintainance
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/configure.ac b/configure.ac
index cc5db4bd..2d336a02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ AM_INIT_AUTOMAKE([1.11 silent-rules])
AH_BOTTOM([#include "config-paths.h"])
dnl libtool library versioning
-dnl =======================
+dnl ==========================
dnl
dnl current
dnl revision
@@ -84,7 +84,7 @@ WUTIL_VERSION=$WUTIL_CURRENT:$WUTIL_REVISION:$WUTIL_AGE
AC_SUBST(WUTIL_VERSION)
-dnl Checks for programs.
+dnl Checks for programs
dnl ===================
AC_PROG_CC
WM_PROG_CC_C11
@@ -225,7 +225,8 @@ WM_PROG_CC_NESTEDFUNC
dnl Posix thread
-dnl =================
+dnl ============
+dnl they are used by util/wmiv
AX_PTHREAD
@@ -312,7 +313,7 @@ AS_IF([test "x$enable_lcov" != "xno"],
AM_CONDITIONAL([USE_LCOV], [test "x$enable_lcov" != "xno"])
-dnl
+
dnl ============================
dnl Checks for library functions
dnl ============================
@@ -362,22 +363,27 @@ AS_IF([test "x$ac_cv_search_strlcat" = "x-lbsd" -o
"x$ac_cv_search_strlcpy" = "x
)
AC_SUBST(LIBBSD)
+
dnl Check for OpenBSD kernel memory interface - kvm(3)
dnl ==================================================
AS_IF([test "x$WM_OSDEP" = "xbsd"],
AC_SEARCH_LIBS([kvm_openfiles], [kvm]) )
+
dnl Check for inotify
dnl =================
+dnl It is used by WindowMaker to reload automatically the configuration when
the
+dnl user changed it using WPref or wdwrite
AC_CHECK_HEADERS(sys/inotify.h, AC_DEFINE(HAVE_INOTIFY, 1, Check for inotify))
dnl Check for syslog
-dnl =================
+dnl ================
+dnl It is used by WUtil to log the wwarning, werror and wfatal
AC_CHECK_HEADERS([syslog.h], [AC_DEFINE([HAVE_SYSLOG], [1], [Check for
syslog])])
-dnl Checks for header files.
+dnl Checks for header files
dnl =======================
AC_HEADER_SYS_WAIT
AC_HEADER_TIME
@@ -385,8 +391,8 @@ AC_CHECK_HEADERS(fcntl.h limits.h sys/ioctl.h libintl.h
poll.h malloc.h ctype.h
string.h strings.h)
-dnl Checks for typedefs, structures, and compiler characteristics.
-dnl ==============================================================
+dnl Checks for typedefs, structures, and compiler characteristics
+dnl =============================================================
AC_C_CONST
AC_C_INLINE
WM_C_NORETURN
@@ -399,6 +405,7 @@ dnl pkg-config
dnl ==========
AC_CHECK_PROG(PKGCONFIG, pkg-config, pkg-config)
+
dnl gettext
dnl =======
@@ -521,6 +528,7 @@ AC_SUBST(UTILMOFILES)
AC_SUBST(WINGSMOFILES)
AC_SUBST(supported_locales)
+
dnl ===========================================
dnl Stuff that uses X
dnl ===========================================
@@ -543,6 +551,7 @@ inc_search_path="$inc_search_path $XCFLAGS"
AC_SUBST(X_LIBRARY_PATH)
+
dnl Decide which locale function to use, setlocale() or _Xsetlocale()
dnl by MANOME Tomonori
dnl ===========================================
@@ -556,25 +565,29 @@ if test "$use_locale" = yes; then
$XLFLAGS $XLIBS)
fi
+
dnl Check whether XInternAtoms() exist
dnl ==================================
AC_CHECK_LIB(X11, XInternAtoms,
AC_DEFINE(HAVE_XINTERNATOMS, 1, [define if your X server has
XInternAtoms() (set by configure)]),,
$XLFLAGS $XLIBS)
+
dnl Check whether XConvertCase() exist
dnl ==================================
AC_CHECK_LIB(X11, XConvertCase,
AC_DEFINE(HAVE_XCONVERTCASE, 1, [define if your X server has
XConvertCase() (set by configure)]),,
$XLFLAGS $XLIBS)
+
dnl XKB keyboard language status
dnl ============================
AC_ARG_ENABLE(modelock, AS_HELP_STRING([--enable-modelock], [XKB keyboard
language status support]),
AC_DEFINE(XKB_MODELOCK, 1, [whether XKB language MODELOCK
should be enabled]))
+
dnl XDND Drag-nd-Drop support
-dnl ============================
+dnl =========================
AC_ARG_ENABLE([xdnd],
[AS_HELP_STRING([--disable-xdnd], [disable Drag-nd-Drop support])],
[AS_CASE(["$enableval"],
@@ -585,6 +598,7 @@ AC_ARG_ENABLE([xdnd],
AC_DEFINE(XDND, 1, [whether Drag-nd-Drop support should be enabled])
])
+
dnl XShape support
dnl ==============
AC_ARG_ENABLE([shape],
@@ -595,6 +609,7 @@ AC_ARG_ENABLE([shape],
[enable_shape=auto])
WM_XEXT_CHECK_XSHAPE
+
dnl MIT-SHM support
dnl ===============
AC_ARG_ENABLE([shm],
@@ -605,11 +620,13 @@ AC_ARG_ENABLE([shm],
[enable_shm=auto])
WM_XEXT_CHECK_XSHM
+
dnl X Misceleanous Utility
dnl ======================
-# the libXmu is used in WRaster
+dnl the libXmu is used in WRaster
WM_EXT_CHECK_XMU
+
dnl XINERAMA support
dnl ================
AC_ARG_ENABLE([xinerama],
@@ -620,8 +637,9 @@ AC_ARG_ENABLE([xinerama],
[enable_xinerama=auto])
WM_XEXT_CHECK_XINERAMA
+
dnl RandR support
-dnl ==============
+dnl =============
AC_ARG_ENABLE([randr],
[AS_HELP_STRING([--enable-randr], [enable RandR extension support (NOT
recommended, buggy)])],
[AS_CASE(["$enableval"],
@@ -630,15 +648,17 @@ AC_ARG_ENABLE([randr],
[enable_randr=no])
WM_XEXT_CHECK_XRANDR
-dnl
+
+dnl Math library
+dnl ============
dnl libWINGS uses math functions, check whether usage requires linking
dnl against libm
-dnl
WM_CHECK_LIBM
-dnl
+
+dnl FontConfig
+dnl ==========
dnl libWINGS uses FcPatternDel from libfontconfig
-dnl
AC_MSG_CHECKING([for fontconfig library])
FCLIBS=`$PKGCONFIG fontconfig --libs`
if test "x$FCLIBS" = "x" ; then
@@ -745,11 +765,12 @@ dnl End of stuff that uses X
dnl ===============================================
dnl EXIF Support
-dnl ===========
+dnl ============
WM_CHECK_LIBEXIF
AS_IF([test "x$LIBEXIF" != "x"],
[AC_DEFINE(HAVE_EXIF, 1, [Define if EXIF can be used])])
+
dnl PNG Support
dnl ===========
AC_ARG_ENABLE([png],
@@ -795,7 +816,7 @@ WM_IMGFMT_CHECK_TIFF
dnl WEBP Support
-dnl ===========
+dnl ============
AC_ARG_ENABLE([webp],
[AS_HELP_STRING([--disable-webp], [disable WEBP support through libwebp])],
[AS_CASE(["$enableval"],
@@ -805,8 +826,8 @@ AC_ARG_ENABLE([webp],
WM_IMGFMT_CHECK_WEBP
-dnl MAGICK Support
-dnl ===========
+dnl MagicK Support
+dnl ==============
AC_ARG_ENABLE([magick],
[AS_HELP_STRING([--disable-magick], [disable MAGICK support through
libMagickWand])],
[AS_CASE(["$enableval"],
@@ -866,7 +887,6 @@ AC_SUBST(pixmapdir)
dnl Support for GNUSTEP_LOCAL_ROOT, for WPrefs.app
dnl ==============================================
-
AC_ARG_WITH(gnustepdir, AS_HELP_STRING([--with-gnustepdir=PATH], [specify the
directory for GNUstep applications]))
if test "x`echo $with_gnustepdir | grep ^/`" != "x"; then
@@ -902,6 +922,9 @@ if test "$enableval" = yes; then
fi
)
+
+dnl Support for removing non-public symbols from a library
+dnl ======================================================
gl_LD_VERSION_SCRIPT
@@ -913,7 +936,7 @@ WM_CFLAGS_GCC_OPTION_POSTPONED
AC_SUBST(lib_search_path)
AC_SUBST(inc_search_path)
-dnl
+
dnl Spit out the configuration
dnl ==========================
AC_CONFIG_FILES(
@@ -950,6 +973,9 @@ AC_CONFIG_FILES(
AC_OUTPUT
+
+dnl Provide a summary of the config
+dnl ===============================
if test "x$MOFILES" = "x"; then
mof=None
else
@@ -1006,4 +1032,3 @@ dnl ================================================
dnl Local Variables:
dnl compile-command: "autoconf"
dnl End:
-
diff --git a/m4/windowmaker.m4 b/m4/windowmaker.m4
index cb750ca9..ef56af8b 100644
--- a/m4/windowmaker.m4
+++ b/m4/windowmaker.m4
@@ -24,12 +24,11 @@ m4_pattern_forbid([^_?WM_])
m4_pattern_allow([^WM_OSDEP(_[A-Z]*)?$])
-dnl
-dnl WM_CHECK_XFT_VERSION(MIN_VERSION, [ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]])
-dnl
-dnl # $XFTFLAGS should be defined before calling this macro,
-dnl # else it will not be able to find Xft.h
-dnl
+# WM_CHECK_XFT_VERSION(MIN_VERSION, [ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]])
+#
+# $XFTFLAGS should be defined before calling this macro,
+# else it will not be able to find Xft.h
+#
AC_DEFUN([WM_CHECK_XFT_VERSION],
[
CPPFLAGS_old="$CPPFLAGS"
@@ -61,14 +60,14 @@ CPPFLAGS="$CPPFLAGS_old"
])
-dnl _WM_LIB_CHECK_FUNCTS
-dnl -----------------------
-dnl (internal shell functions)
-dnl
-dnl Create 2 shell functions:
-dnl wm_fn_imgfmt_try_link: try to link against library
-dnl wm_fn_imgfmt_try_compile: try to compile against header
-dnl
+# _WM_LIB_CHECK_FUNCTS
+# --------------------
+# (internal shell functions)
+#
+# Create 2 shell functions:
+# wm_fn_imgfmt_try_link: try to link against library
+# wm_fn_imgfmt_try_compile: try to compile against header
+#
AC_DEFUN_ONCE([_WM_LIB_CHECK_FUNCTS],
[@%:@ wm_fn_lib_try_link FUNCTION LFLAGS
@%:@ ----------------------------------
diff --git a/m4/wm_attributes.m4 b/m4/wm_attributes.m4
index 545fe820..3b4c8712 100644
--- a/m4/wm_attributes.m4
+++ b/m4/wm_attributes.m4
@@ -16,6 +16,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
# WM_C_NORETURN
# -------------
#
@@ -61,8 +62,9 @@ AS_CASE([$wm_cv_c_noreturn],
[Defines the attribute to tell the compiler that a function never
returns, if the ISO C11 attribute does not work])])
])
+
# _WM_SHELLFN_FUNCATTRIBUTE
-# ----------------------
+# -------------------------
# (internal shell function only!)
#
# Create a shell function to check if we can compile with special
diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4
index d07e618f..5dd9ec7f 100644
--- a/m4/wm_imgfmt_check.m4
+++ b/m4/wm_imgfmt_check.m4
@@ -16,6 +16,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
# WM_IMGFMT_CHECK_GIF
# -------------------
#
@@ -175,7 +176,7 @@ AC_DEFUN_ONCE([WM_IMGFMT_CHECK_TIFF],
# WM_IMGFMT_CHECK_WEBP
-# -------------------
+# --------------------
#
# Check for WEBP file support through 'libwebp'
# The check depends on variable 'enable_webp' being either:
diff --git a/m4/wm_libexif.m4 b/m4/wm_libexif.m4
index ac501bba..70bc7045 100644
--- a/m4/wm_libexif.m4
+++ b/m4/wm_libexif.m4
@@ -16,8 +16,9 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
# WM_CHECK_LIBEXIF
-# -------------
+# ----------------
#
# Checks the needed library link flags
# Sets variable LIBEXIF with the appropriates flags
diff --git a/m4/wm_libmath.m4 b/m4/wm_libmath.m4
index d21493f7..df2b54fe 100644
--- a/m4/wm_libmath.m4
+++ b/m4/wm_libmath.m4
@@ -16,6 +16,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
# WM_CHECK_LIBM
# -------------
#
diff --git a/m4/wm_prog_cc_c11.m4 b/m4/wm_prog_cc_c11.m4
index cf846998..a841e6ea 100644
--- a/m4/wm_prog_cc_c11.m4
+++ b/m4/wm_prog_cc_c11.m4
@@ -16,8 +16,9 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
# WM_PROG_CC_C11
-# ---------------------
+# --------------
#
# Check if the compiler supports C11 standard natively, or if any
# option may help enabling the support
http://repo.or.cz/w/wmaker-crm.git/commit/2c6c7d51c9cfb0760f8c20c2d2cda7d0cb2aaf21
commit 2c6c7d51c9cfb0760f8c20c2d2cda7d0cb2aaf21
Author: Christophe CURIS <[email protected]>
Date: Fri Jan 2 10:34:29 2015 +0100
configure: add email address for bug reports in AC_INIT
The mail address we use is the developer's mailing list; putting it in the
macro will get Autoconf to place it in a few strategic places where it is a
good idea to have it.
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/configure.ac b/configure.ac
index 0e2c7cc6..cc5db4bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,9 @@ dnl Because the 2.69 was released only a few month later,
let's just ask for it
AC_PREREQ([2.69])
-AC_INIT(WindowMaker, 0.95.6, , WindowMaker, http://www.windowmaker.org/)
+dnl Configuration for Autoconf and Automake
+dnl =======================================
+AC_INIT([WindowMaker],[0.95.6],[[email protected]],[WindowMaker],[http://www.windowmaker.org/])
AC_CONFIG_SRCDIR(src/WindowMaker.h)
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS(config.h)
http://repo.or.cz/w/wmaker-crm.git/commit/f956609a434c20cdb5b96a4960de50d4b63f02ca
commit f956609a434c20cdb5b96a4960de50d4b63f02ca
Author: Christophe CURIS <[email protected]>
Date: Fri Jan 2 10:34:28 2015 +0100
configure: added the copyright notice at the begining of the file
This include using the AC_COPYRIGHT macro so our copyright will also be
placed in the generated configure script.
Took opportunity to update the comment on how the file should be processed
to simplify user's life.
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/configure.ac b/configure.ac
index a23250da..0e2c7cc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,27 @@
+dnl
============================================================================
dnl
-dnl Window Maker autoconf input.
+dnl Window Maker autoconf input
dnl
-dnl Process with:
-dnl aclocal
-dnl autoheader
-dnl autoconf
-dnl libtoolize --force --automake
-dnl automake -a --gnu --include-deps
+AC_COPYRIGHT([Copyright (c) 2001-2015 The Window Maker Team])
dnl
+dnl
============================================================================
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License along
+dnl with this program; see the file COPYING.
+dnl
+dnl
============================================================================
+dnl
+dnl Process with: ./autogen.sh
dnl Due to a bug in Autoconf 2.68 (apparently a regression), we need at least
http://repo.or.cz/w/wmaker-crm.git/commit/200b0d40981a8a22784c9cfdf2a692b3b50cf680
commit 200b0d40981a8a22784c9cfdf2a692b3b50cf680
Author: Christophe CURIS <[email protected]>
Date: Fri Jan 2 10:34:27 2015 +0100
configure: remove a few commented-out stuff that are deprecated
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/configure.ac b/configure.ac
index 689ff00b..a23250da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,10 +68,6 @@ WUTIL_VERSION=$WUTIL_CURRENT:$WUTIL_REVISION:$WUTIL_AGE
AC_SUBST(WUTIL_VERSION)
-dnl Checks for host/os name
-dnl =======================
-dnl AC_CANONICAL_HOST -- already done by AC_PROG_LIBTOOL
-
dnl Checks for programs.
dnl ===================
AC_PROG_CC
@@ -304,7 +300,6 @@ dnl
dnl ============================
dnl Checks for library functions
dnl ============================
-dnl not used anywhere
AC_FUNC_MEMCMP
AC_FUNC_VPRINTF
WM_FUNC_SECURE_GETENV
@@ -386,7 +381,6 @@ WM_TYPE_SIGNAL
dnl pkg-config
dnl ==========
-dnl AC_ARG_VAR(PKGCONFIG, [pkg-config command])
AC_CHECK_PROG(PKGCONFIG, pkg-config, pkg-config)
dnl gettext
@@ -841,7 +835,6 @@ dnl
dnl stdlib.h is checked here, because of conflict in jpeglib.h
AC_CHECK_HEADERS(stdlib.h)
-# AC_PREFIX_PROGRAM(wmaker)
dnl Support for PIXMAPDIR option
dnl ============================
@@ -901,16 +894,6 @@ dnl ======================================
WM_CFLAGS_GCC_OPTION_POSTPONED
-dnl Output some helpful data for compiling wraster and WINGs/WUtil apps
-dnl ===================================================================
-
-dnl echo "WFLAGS="$LIBPL_INC_PATH -I$prefix/include"" > WINGs-flags
-dnl echo "WLIBS="-L$exec_prefix/lib -lWINGs -lwraster $LIBPL_LIBS $GFXLIBS
-lm""-dnl | sed -e 's|$(prefix)|'"$prefix|" >> WINGs-flags
-
-dnl The #lp# and #rp# stuff below is a hack because [ and ] get lost when
-dnl parsed by m4
-
AC_SUBST(lib_search_path)
AC_SUBST(inc_search_path)
@@ -987,8 +970,6 @@ echo
AS_IF([test "x$wm_cv_prog_cc_nestedfunc" != "xyes"],
[AC_MSG_WARN([[Your compiler does not support Nested Function, work-around
enabled]])])
-dnl WM_PRINT_REDCRAP_BUG_STATUS
-
AS_IF([test "x$enable_jpeg" = xno], [dnl
AS_ECHO(["WARNING WARNING WARNING WARNING WARNING WARNING
WARNING"])
AS_ECHO([])
http://repo.or.cz/w/wmaker-crm.git/commit/99b1e26412163951f00ff3d40f2dfc023e0b1e98
commit 99b1e26412163951f00ff3d40f2dfc023e0b1e98
Author: Christophe CURIS <[email protected]>
Date: Fri Jan 2 10:34:26 2015 +0100
configure: updates as reported by 'autoupdate'
Some macros have evolved, so this patch brings the appropriate updates:
- AC_OUTPUT(...) is now split in AC_CONFIG_FILES(...) and AC_OUTPUT, took
the opportunity to sort the list of files so it is easier to maintain
- the macro AC_DECL_SYS_SIGLIST is now replaced by the more generic
AC_CHECK_DECLS([sys_siglist]), but as it turns out that we're not using it,
the check was just removed
- autoconf assumes that AC_TYPE_SIGNAL is deprecated because the type was
fixed since C89, but as we expect to still run on old hardware, we keep the
macro given by autoupdate on our side for when Autoconf will stop providing
the macro
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/configure.ac b/configure.ac
index f98b6f79..689ff00b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,7 @@ AC_PROG_CC
WM_PROG_CC_C11
AC_PROG_LN_S
AC_PROG_GCC_TRADITIONAL
-AC_PROG_LIBTOOL
+LT_INIT
dnl Debugging Options
@@ -376,13 +376,12 @@ AC_CHECK_HEADERS(fcntl.h limits.h sys/ioctl.h libintl.h
poll.h malloc.h ctype.h
dnl Checks for typedefs, structures, and compiler characteristics.
dnl ==============================================================
-AC_DECL_SYS_SIGLIST
AC_C_CONST
AC_C_INLINE
WM_C_NORETURN
AC_TYPE_SIZE_T
AC_TYPE_PID_T
-AC_TYPE_SIGNAL
+WM_TYPE_SIGNAL
dnl pkg-config
@@ -902,22 +901,6 @@ dnl ======================================
WM_CFLAGS_GCC_OPTION_POSTPONED
-AC_OUTPUT(Makefile po/Makefile util/Makefile util/po/Makefile test/Makefile -
WINGs/Makefile WINGs/WINGs/Makefile WINGs/Documentation/Makefile -
WINGs/Examples/Makefile WINGs/Resources/Makefile WINGs/Tests/Makefile -
WINGs/Extras/Makefile WINGs/po/Makefile - wmlib/Makefile wrlib/Makefile
wrlib/tests/Makefile - src/Makefile src/wconfig.h - doc/Makefile
doc/sk/Makefile doc/cs/Makefile - doc/ru/Makefile - WindowMaker/Makefile
WindowMaker/Backgrounds/Makefile - WindowMaker/Defaults/Makefile
WindowMaker/IconSets/Makefile - WindowMaker/Icons/Makefile
WindowMaker/Pixmaps/Makefile - WindowMaker/Styles/Makefile
WindowMaker/Themes/Makefile - WPrefs.app/Makefile
WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile - WPrefs.app/po/Makefile )
-
-
dnl Output some helpful data for compiling wraster and WINGs/WUtil apps
dnl ===================================================================
@@ -934,6 +917,39 @@ AC_SUBST(inc_search_path)
dnl
dnl Spit out the configuration
dnl ==========================
+AC_CONFIG_FILES(
+ Makefile
+
+ dnl WRaster Library
+ wrlib/Makefile
+ wrlib/tests/Makefile
+
+ dnl WINGs toolkit
+ WINGs/Makefile WINGs/WINGs/Makefile WINGs/po/Makefile
+ WINGs/Documentation/Makefile WINGs/Resources/Makefile WINGs/Extras/Makefile
+ WINGs/Examples/Makefile WINGs/Tests/Makefile
+
+ dnl Window Maker's core
+ src/Makefile src/wconfig.h po/Makefile
+ doc/Makefile doc/sk/Makefile doc/cs/Makefile doc/ru/Makefile
+ WindowMaker/Makefile WindowMaker/Backgrounds/Makefile
+ WindowMaker/Defaults/Makefile WindowMaker/IconSets/Makefile
+ WindowMaker/Icons/Makefile WindowMaker/Pixmaps/Makefile
+ WindowMaker/Styles/Makefile WindowMaker/Themes/Makefile
+
+ dnl Preference GUI
+ WPrefs.app/Makefile WPrefs.app/po/Makefile
+ WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile
+
+ dnl Command-line utilities
+ util/Makefile util/po/Makefile
+
+ dnl Misceleanous stuff
+ wmlib/Makefile
+ test/Makefile
+)
+
+AC_OUTPUT
if test "x$MOFILES" = "x"; then
mof=None
diff --git a/m4/windowmaker.m4 b/m4/windowmaker.m4
index e59f7fa5..cb750ca9 100644
--- a/m4/windowmaker.m4
+++ b/m4/windowmaker.m4
@@ -244,3 +244,25 @@ AS_CASE([$wm_cv_func_open_nofollow],
AC_MSG_WARN([flag O_NOFOLLOW is not defined on your platform])],
[CPPFLAGS="$CPPFLAGS $wm_cv_func_open_nofollow"])
])
+
+
+# WM_TYPE_SIGNAL
+# --------------
+#
+# Check the return type for the function 'signal'
+# Autoconf now claims we can assume the type is 'void' as it is in the C89
standard,
+# but as Window Maker is supposed to be lightweight enough for old machines, we
+# prefer to keep the check for portability
+AC_DEFUN_ONCE([WM_TYPE_SIGNAL],
+[AC_CACHE_CHECK([return type of signal handlers], [wm_cv_type_signal],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([#include <sys/types.h>
+#include <signal.h>
+],
+ [return *(signal (0, 0)) (0) == 1;])],
+ [wm_cv_type_signal=int],
+ [wm_cv_type_signal=void])dnl
+ ])
+AC_DEFINE_UNQUOTED([RETSIGTYPE], [$wm_cv_type_signal],
+ [Define as the return type of signal handlers (`int' or `void')])dnl
+])
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 314 +++++++++++++++++++++++++++++--------------------
m4/windowmaker.m4 | 49 ++++++--
m4/wm_attributes.m4 | 4 +-
m4/wm_imgfmt_check.m4 | 3 +-
m4/wm_libexif.m4 | 3 +-
m4/wm_libmath.m4 | 1 +
m4/wm_prog_cc_c11.m4 | 3 +-
7 files changed, 230 insertions(+), 147 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
