X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=configure.ac;h=c62a19b7ed52840b2992e4218ab0313a53352a94;hb=44915ef56ef12a7440032daaaec403d58fe1b20e;hp=35b441a19d8318d192fbd5bba992c82d5e05a8aa;hpb=5e685b907d89e5d2d8dbeb2e80ece0edccd1c852;p=dockapps%2Fwmnotify.git

diff --git a/configure.ac b/configure.ac
index 35b441a..c62a19b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,24 +1,19 @@
-# configure.in -- Process this file with autoconf to produce configure.
+# configure.ac -- Process this file with autoconf to produce configure.
 
 dnl Initialization stuff.
-AC_INIT(wmnotify, 0.3.2)
-AC_CONFIG_AUX_DIR(config)
+AC_INIT(wmnotify, 1.1.0)
+AC_CONFIG_AUX_DIR(build-aux)
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/wmnotify.c)
 AM_CONFIG_HEADER(config.h:config-h.in)
 dnl Checking if the NEWS file has been updated to reflect the current version.
 AM_INIT_AUTOMAKE(check-news)
+AM_SILENT_RULES([yes])
 
 dnl Testing the C compiler.
-dnl AC_PROG_CC
-AM_PROG_CC_C_O
+AC_PROG_CC
 AC_LANG_C
 
-dnl Checking for header files.
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(stdlib.h unistd.h errno.h assert.h)
-AC_CHECK_HEADERS(string.h strings.h)
-
 dnl Checking for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_PID_T
@@ -28,7 +23,8 @@ dnl Basic CFLAGS values
 CFLAGS="${CFLAGS} -Wall"
 
 dnl Checking for POSIX threads library.
-ACX_PTHREAD(CC="${PTHREAD_CC}", , echo "Can't find POSIX threads library"; exit 1 )
+ACX_PTHREAD([CFLAGS="$CFLAGS $PTHREAD_CFLAGS" LDFLAGS="$PTHREAD_LIBS $LDFLAGS" CC="$PTHREAD_CC"],
+            [AC_MSG_ERROR([POSIX thread support required])])
 
 dnl Trying to locate the X window system's includes and libraries, and sets the
 dnl variables x_includes and x_libraries to their locations. Also adds the
@@ -82,8 +78,8 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} ${SNDFILE_CFLAGS} ${OPENSSL_CFLAGS}"
-LIBS="${PTHREAD_LIBS} ${SNDFILE_LIBS} ${OPENSSL_LIBS} ${LIBS}"
+CFLAGS="${CFLAGS} ${SNDFILE_CFLAGS} ${OPENSSL_CFLAGS}"
+LIBS="${SNDFILE_LIBS} ${OPENSSL_LIBS} ${LIBS}"
 
 AC_SUBST(CFLAGS)
 AC_SUBST(LIBS)