diff options
author | Christophe Grenier <[email protected]> | 2009-01-04 19:37:13 +0100 |
---|---|---|
committer | Christophe Grenier <[email protected]> | 2009-01-04 19:37:13 +0100 |
commit | 25b603a4ccd8831a8c836139e0c59c5f445c7641 (patch) | |
tree | 4099cff76522f45c3ee01151ecc9df9da16c1323 | |
parent | 30ccc2bf64b29c4a749a1e34f6ed5b80f33aaca8 (diff) |
Fix warning for automake 1.10.1
Don't generate an error when windres is missing
Search uuid_create and uuid_generate first in C standard library before using other library
e2fsprogs 1.41.3 may use pthread, so when creating a static version, pthread flags must be added
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | acx_pthread.m4 | 195 | ||||
-rw-r--r-- | configure.ac | 24 |
3 files changed, 213 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index ea436958..0e14c4a7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,7 @@ uninstall-hook: static: rm -f src/testdisk src/photorec src/testdisk.exe src/photorec.exe - $(MAKE) LDFLAGS="$(LDFLAGS) -static" + $(MAKE) LDFLAGS="$(LDFLAGS) -static" LIBS="$(PTHREAD_LIBS) $(LIBS)" CFLAGS="$(PTHREAD_CFLAGS) $(CFLAGS)" CXXFLAGS="$(PTHREAD_CFLAGS) $(CXXFLAGS)" smallstatic: $(MAKE) static diff --git a/acx_pthread.m4 b/acx_pthread.m4 new file mode 100644 index 00000000..417d61d4 --- /dev/null +++ b/acx_pthread.m4 @@ -0,0 +1,195 @@ +AC_DEFUN([ACX_PTHREAD], [ +AC_REQUIRE([AC_CANONICAL_HOST]) +AC_LANG_SAVE +AC_LANG_C +acx_pthread_ok=no + +# We used to check for pthread.h first, but this fails if pthread.h +# requires special compiler flags (e.g. on True64 or Sequent). +# It gets checked for in the link test anyway. + +# First of all, check if the user has set any of the PTHREAD_LIBS, +# etcetera environment variables, and if threads linking works using +# them: +if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) + AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) + AC_MSG_RESULT($acx_pthread_ok) + if test x"$acx_pthread_ok" = xno; then + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" + fi + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" +fi + +# We must check for the threads library under a number of different +# names; the ordering is very important because some systems +# (e.g. DEC) have both -lpthread and -lpthreads, where one of the +# libraries is broken (non-POSIX). + +# Create a list of thread flags to try. Items starting with a "-" are +# C compiler flags, and other items are library names, except for "none" +# which indicates that we try without any flags at all, and "pthread-config" +# which is a program returning the flags for the Pth emulation library. + +acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" + +# The ordering *is* (sometimes) important. Some notes on the +# individual items follow: + +# pthreads: AIX (must check this before -lpthread) +# none: in case threads are in libc; should be tried before -Kthread and +# other compiler flags to prevent continual compiler warnings +# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) +# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) +# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) +# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) +# -pthreads: Solaris/gcc +# -mthreads: Mingw32/gcc, Lynx/gcc +# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it +# doesn't hurt to check since this sometimes defines pthreads too; +# also defines -D_REENTRANT) +# ... -mt is also the pthreads flag for HP/aCC +# pthread: Linux, etcetera +# --thread-safe: KAI C++ +# pthread-config: use pthread-config program (for GNU Pth library) + +case "${host_cpu}-${host_os}" in + *solaris*) + + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based + # tests will erroneously succeed. (We need to link with -pthreads/-mt/ + # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather + # a function called by this macro, so we could check for that, but + # who knows whether they'll stub that too in a future libc.) So, + # we'll just look for -pthreads and -lpthread first: + + acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" + ;; +esac + +if test x"$acx_pthread_ok" = xno; then +for flag in $acx_pthread_flags; do + + case $flag in + none) + AC_MSG_CHECKING([whether pthreads work without any flags]) + ;; + + -*) + AC_MSG_CHECKING([whether pthreads work with $flag]) + PTHREAD_CFLAGS="$flag" + ;; + + pthread-config) + AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) + if test x"$acx_pthread_config" = xno; then continue; fi + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; + + *) + AC_MSG_CHECKING([for the pthreads library -l$flag]) + PTHREAD_LIBS="-l$flag" + ;; + esac + + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we + # need a special flag -Kthread to make this header compile.) + # We check for pthread_join because it is in -lpthread on IRIX + # while pthread_create is in libc. We check for pthread_attr_init + # due to DEC craziness with -lpthreads. We check for + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. + AC_TRY_LINK([#include <pthread.h>], + [pthread_t th; pthread_join(th, 0); + pthread_attr_init(0); pthread_cleanup_push(0, 0); + pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], + [acx_pthread_ok=yes]) + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + AC_MSG_RESULT($acx_pthread_ok) + if test "x$acx_pthread_ok" = xyes; then + break; + fi + + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" +done +fi + +# Various other checks: +if test "x$acx_pthread_ok" = xyes; then + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. + AC_MSG_CHECKING([for joinable pthread attribute]) + attr_name=unknown + for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;], + [attr_name=$attr; break]) + done + AC_MSG_RESULT($attr_name) + if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then + AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, + [Define to necessary symbol if this constant + uses a non-standard name on your system.]) + fi + + AC_MSG_CHECKING([if more special flags are required for pthreads]) + flag=no + case "${host_cpu}-${host_os}" in + *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; + *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; + esac + AC_MSG_RESULT(${flag}) + if test "x$flag" != xno; then + PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" + fi + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + # More AIX lossage: must compile with xlc_r or cc_r + if test x"$GCC" != xyes; then + AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC}) + else + PTHREAD_CC=$CC + fi +else + PTHREAD_CC="$CC" +fi + +AC_SUBST(PTHREAD_LIBS) +AC_SUBST(PTHREAD_CFLAGS) +AC_SUBST(PTHREAD_CC) + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test x"$acx_pthread_ok" = xyes; then + ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) + : +else + acx_pthread_ok=no + $2 +fi +AC_LANG_RESTORE +])dnl ACX_PTHREAD + diff --git a/configure.ac b/configure.ac index 90c66112..29d4ae93 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,8 @@ AC_PREREQ(2.59) AC_INIT([testdisk],[6.11-WIP],[[email protected]]) -TESTDISKDATE="November 2008" +sinclude(acx_pthread.m4) +TESTDISKDATE="January 2009" AC_SUBST(TESTDISKDATE) AC_DEFINE_UNQUOTED([TESTDISKDATE],"$TESTDISKDATE",[Date of release]) AC_CONFIG_AUX_DIR(config) @@ -175,7 +176,7 @@ AC_ARG_WITH(sudo-bin, [SUDO_BIN="${withval}"]) AC_ARG_ENABLE([missing-uuid-ok], - AS_HELP_STRING(--enable-missing-uuid-ok, force compilation even if both uuidgen and uuid_generate are missing, for developpement only (default is NO)), + AS_HELP_STRING(--enable-missing-uuid-ok, [force compilation even if both uuidgen and uuid_generate are missing, for developpement only (default is NO)]), [case "${enableval}" in yes) missing_uuid_ok=true ;; no) missing_uuid_ok=false ;; @@ -218,15 +219,17 @@ AM_CONDITIONAL(USEICON, test "$use_icon" = yes) # Checks for programs. AC_PROG_CC +#AC_PROG_CXX AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET AC_ARG_VAR(WINDRES, [Windows Resource compiler tool path]) -AC_PATH_TOOL(WINDRES,windres, - [AC_MSG_WARN(Could not find a windres tool in your PATH.)] - ) +AC_PATH_TOOL(WINDRES,windres,) AC_SUBST(WINDRES) +if test -z "$WINDRES"; then + AC_MSG_WARN(Could not find a windres tool in your PATH.) +fi # Enable large file support. AC_SYS_LARGEFILE @@ -547,7 +550,7 @@ AC_CHECK_FUNCS([uuidgen],,[found_uuid_function=no]) if test "${found_uuid_function}" = "no"; then found_uuid_function=yes - AC_CHECK_LIB(uuid, uuid_create, , [found_uuid_function=no]) + AC_SEARCH_LIBS(uuid_create, uuid, , [found_uuid_function=no]) if test "${found_uuid_function}" = "yes"; then AC_CHECK_FUNCS([uuid_create]) @@ -557,7 +560,7 @@ fi if test "${found_uuid_function}" = "no"; then found_uuid_function=yes - AC_CHECK_LIB(uuid, uuid_generate, ,[ found_uuid_function=no ]) + AC_SEARCH_LIBS(uuid_generate, uuid, , [ found_uuid_function=no ]) if test "${found_uuid_function}" = "yes"; then AC_CHECK_FUNCS([uuid_generate]) @@ -650,6 +653,13 @@ AC_CHECK_FUNCS([reiserfs_fs_open_fast]) LIBS="$OLDLIBS" AC_CHECK_FUNCS([ntfs_libntfs_version ntfs_volume_startup]) +# e2fsprogs may be using pthread +# checks for pthreads +SAVE_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -static" +ACX_PTHREAD([enable_threads="pthread"],[enable_threads="no"]) +CFLAGS="$SAVE_CFLAGS" + AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) |