])
+#
+# AC_WIRESHARK_STRUCT_ST_FLAGS
+#
+dnl AC_STRUCT_ST_BLKSIZE extracted from the file in question,
+dnl "acspecific.m4" in GNU Autoconf 2.12, and turned into
+dnl AC_WIRESHARK_STRUCT_ST_FLAGS, which checks if "struct stat"
+dnl has the 4.4BSD "st_flags" member, and defines HAVE_ST_FLAGS; that's
+dnl what's in this file.
+dnl Done by Guy Harris <guy@alum.mit.edu> on 2012-06-02.
+
+dnl ### Checks for structure members
+
+AC_DEFUN([AC_WIRESHARK_STRUCT_ST_FLAGS],
+[AC_CACHE_CHECK([for st_flags in struct stat], ac_cv_wireshark_struct_st_flags,
+[AC_TRY_COMPILE([#include <sys/stat.h>], [struct stat s; s.st_flags;],
+ac_cv_wireshark_struct_st_flags=yes, ac_cv_wireshark_struct_st_flags=no)])
+if test $ac_cv_wireshark_struct_st_flags = yes; then
+ AC_DEFINE(HAVE_ST_FLAGS, 1, [Define if st_flags field exists in struct stat])
+fi
+])
+
+
#
# AC_WIRESHARK_STRUCT_SA_LEN
#
v6lib=none
AC_MSG_CHECKING([ipv6 stack type])
- for i in v6d toshiba kame inria zeta linux linux-glibc solaris8; do
+ for i in v6d toshiba kame inria zeta linux linux-glibc solaris; do
case $i in
v6d)
AC_EGREP_CPP(yes, [
#endif],
[v6type=$i; v6lib=inet6; CPPFLAGS="-DINET6 $CPPFLAGS"])
;;
- solaris8)
- if test "`uname -s`" = "SunOS" && test "`uname -r`" = "5.8"; then
+ solaris)
+ if test "`uname -s`" = "SunOS"; then
v6type=$i
v6lib=inet6
- [CPPFLAGS="-DINET6 -DSOLARIS8_INET6 $CPPFLAGS"]
+ [CPPFLAGS="-DINET6 $CPPFLAGS"]
fi
;;
esac
# header.
#
# However, it might also happen on some others OSes with some erroneous
- # system manipulations where multiple versions of libcap might co-exist
+ # system manipulations where multiple versions of libpcap might co-exist
# e.g. hand made symbolic link from libpcap.so -> libpcap.so.0.8 but
# having the pcap header version 0.7.
#
# AC_WIRESHARK_LIBLUA_CHECK
#
AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[
-
+ lua_ver=5.2
if test "x$lua_dir" != "x"
then
#
LIBS="$LIBS -L$lua_dir/lib -llua -lm"
wireshark_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$lua_dir/lib"
+
+ #
+ # Determine Lua version by reading the LUA_VERSION_NUM definition
+ # from lua.h under the given Lua directory. The value is 501 for
+ # Lua 5.1, 502 for Lua 5.2, etc.
+ #
+ AC_MSG_CHECKING(Lua version)
+ [[ -d "$lua_dir/include" ]] && grep -rq 'LUA_VERSION_NUM.*501' "$lua_dir/include" && lua_ver=5.1
+ AC_MSG_RESULT(Lua ${lua_ver})
else
#
# The user specified no directory in which liblua resides,
- # so just add "-llua -lliblua" to the used libs.
+ # we try to find out the lua version by looking at pathnames
+ # and we just add "-llua -lliblua" to the used libs.
#
+ AC_MSG_CHECKING(Lua version)
+ for i in 5.0 5.1 5.2
+ do
+ [[ -d "/usr/include/lua$i" ]] && lua_ver=$i
+ done
+ AC_MSG_RESULT(Lua ${lua_ver})
wireshark_save_CPPFLAGS="$CPPFLAGS"
wireshark_save_LDFLAGS="$LDFLAGS"
wireshark_save_LIBS="$LIBS"
#
AC_CHECK_HEADERS(lua.h lualib.h lauxlib.h,,
[
- AC_CHECK_HEADERS(lua5.1/lua.h lua5.1/lualib.h lua5.1/lauxlib.h,
+ AC_CHECK_HEADERS(lua${lua_ver}/lua.h lua${lua_ver}/lualib.h lua${lua_ver}/lauxlib.h,
[
if test "x$lua_dir" != "x"
then
- LUA_INCLUDES="-I$lua_dir/include/lua5.1"
+ LUA_INCLUDES="-I$lua_dir/include/lua${lua_ver}"
else
#
# The user didn't specify a directory in which liblua resides;
- # we must look for the headers in a "lua5.1" subdirectory of
+ # we must look for the headers in a "lua${lua_ver}" subdirectory of
# "/usr/include", "/usr/local/include", or "$prefix/include"
- # as some systems apparently put the headers in a "lua5.1"
+ # as some systems apparently put the headers in a "lua${lua_ver}"
# subdirectory.
AC_MSG_CHECKING(for extraneous lua header directories)
found_lua_dir=""
- lua_dir_list="/usr/include/lua5.1 $prefix/include/lua5.1"
+ lua_dir_list="/usr/include/lua${lua_ver} $prefix/include/lua${lua_ver}"
if test "x$ac_cv_enable_usr_local" = "xyes"
then
- lua_dir_list="$lua_dir_list /usr/local/include/lua5.1"
+ lua_dir_list="$lua_dir_list /usr/local/include/lua${lua_ver}"
fi
for lua_dir_ent in $lua_dir_list
do
LUA_LIBS=""
if test "x$want_lua" = "xyes"
then
- # we found lua5.1/lua.h, but we don't know which include dir contains it
- AC_MSG_ERROR(Header file lua.h was found as lua5.1/lua.h but we can't locate the include directory. Please set the DIR for the --with-lua configure parameter.)
+ # we found lua${lua_ver}/lua.h, but we don't know which include dir contains it
+ AC_MSG_ERROR(Header file lua.h was found as lua${lua_ver}/lua.h but we can't locate the include directory. Please set the DIR for the --with-lua configure parameter.)
else
#
# We couldn't find the header file; don't use the
#
want_lua=no
fi
- fi
+ fi
fi
],
[
# against libm.
LIBS="$LIBS $LUA_LIBS -lm"
- AC_CHECK_LIB(lua, luaL_register,
+ AC_CHECK_LIB(lua, luaL_openlibs,
[
- #
- # Lua 5.1 found
- #
+ #
+ # Lua found
+ #
if test "x$lua_dir" != "x"
then
#
- # Put the "-I" and "-L" flags for lua at
- # the beginning of CFLAGS, CPPFLAGS,
- # LDFLAGS, and LIBS.
+ # Put the "-I" and "-L" flags for lua into
+ # LUA_INCLUDES and LUA_LIBS, respectively.
#
LUA_LIBS="-L$lua_dir/lib -llua -lm"
LUA_INCLUDES="-I$lua_dir/include"
LUA_LIBS="-llua -lm"
LUA_INCLUDES=""
fi
- AC_DEFINE(HAVE_LUA_5_1, 1, [Define to use Lua 5.1])
+ AC_DEFINE(HAVE_LUA, 1, [Define to use Lua])
want_lua=yes
],[
# We could not find the libs, maybe we have version number in the lib name
#
- LIBS="$wireshark_save_LIBS -llua5.1 -lm"
+ LIBS="$wireshark_save_LIBS -llua${lua_ver} -lm"
- AC_CHECK_LIB(lua5.1, luaL_register,
+ AC_CHECK_LIB(lua${lua_ver}, luaL_openlibs,
[
#
- # Lua 5.1 found
+ # Lua found
#
- LUA_LIBS=" -llua5.1 -lm"
- AC_DEFINE(HAVE_LUA_5_1, 1, [Define to use Lua 5.1])
+ LUA_LIBS=" -llua${lua_ver} -lm"
+ AC_DEFINE(HAVE_LUA, 1, [Define to use Lua])
want_lua=yes
],[
#
if test "x$portaudio_dir" != "x"
then
#
- # Put the "-I" and "-L" flags for portaudio at
- # the beginning of CFLAGS, CPPFLAGS,
- # LDFLAGS, and LIBS.
+ # Put the "-I" and "-L" flags for portaudio
+ # into PORTAUDIO_INCLUDES and PORTAUDIO_LIBS,
+ # respectively.
#
PORTAUDIO_LIBS="-L$portaudio_dir/lib -lportaudio"
PORTAUDIO_INCLUDES="-I$portaudio_dir/include"
KRB5_LIBS=`echo $KRB5_LIBS | sed 's/-lcrypto//'`
KRB5_LIBS="$KRB5_LIBS $SSL_LIBS"
else
- AC_MSG_ERROR([Kerberos library requires -lcrypto but --with-ssl not specified])
+ AC_MSG_ERROR([Kerberos library requires -lcrypto, so you must specify --with-ssl])
fi
;;
esac
fi
])
+dnl
+dnl Check whether, if you pass an unknown warning option to the
+dnl compiler, it fails or just prints a warning message and succeeds.
+dnl Set ac_wireshark_unknown_warning_option_error to the appropriate flag
+dnl to force an error if it would otherwise just print a warning message
+dnl and succeed.
+dnl
+AC_DEFUN([AC_WIRESHARK_CHECK_UNKNOWN_WARNING_OPTION_ERROR],
+ [
+ AC_MSG_CHECKING([whether the compiler fails when given an unknown warning option])
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Wxyzzy-this-will-never-succeed-xyzzy"
+ AC_TRY_COMPILE(
+ [],
+ [return 0],
+ [
+ AC_MSG_RESULT([no, adding -Werror=unknown-warning-option])
+ #
+ # We're assuming this is clang, where
+ # -Werror=unknown-warning-option is the appropriate
+ # option to force the compiler to fail.
+ #
+ ac_wireshark_unknown_warning_option_error="-Werror=unknown-warning-option"
+ ],
+ [
+ AC_MSG_RESULT([yes])
+ ])
+ CFLAGS="$save_CFLAGS"
+ ])
+
+dnl
+dnl Check whether, if you pass a valid-for-C-but-not-C++ option to the
+dnl compiler, it fails or just prints a warning message and succeeds.
+dnl Set ac_wireshark_non_cxx_warning_option_error to the appropriate flag
+dnl to force an error if it would otherwise just print a warning message
+dnl and succeed.
+dnl
+AC_DEFUN([AC_WIRESHARK_CHECK_NON_CXX_WARNING_OPTION_ERROR],
+ [
+ AC_MSG_CHECKING([whether the compiler fails when given an warning option not supported for C++])
+ #
+ # Some C+ compilers warn about -Wmissing-prototypes, and some warn
+ # about -Wmissing-declarations. Check both.
+ #
+ AC_LANG_PUSH(C++)
+ save_CXXFLAGS="$CXXFLAGS"
+ for flag in -Wmissing-prototypes -Wmissing-declarations; do
+ CXXFLAGS="$save_CXXFLAGS $flag"
+ AC_TRY_COMPILE(
+ [],
+ [return 0],
+ [
+ #
+ # We're assuming this is g++, where -Werror is the
+ # appropriate option to force the compiler to fail.
+ # Check whether it fails with -Werror.
+ #
+ # NOTE: it's important to put -Werror *before*
+ # the flag, otherwise, when it sees the flag,
+ # it doesn't yet know that warnings should be
+ # treated as errors, and doesn't treat the
+ # "that's C-only" warning as an error.
+ #
+ CXXFLAGS="$save_CXXFLAGS -Werror $flag"
+ AC_TRY_COMPILE(
+ [],
+ [return 0],
+ [
+ #
+ # No, so this option is actually OK
+ # with our C++ compiler.
+ #
+ # (We need an empty command here to
+ # prevent some versions of autoconf
+ # from generating a script with an
+ # empty "then" clause for an if statement.)
+ #
+ :
+ ],
+ [
+ #
+ # Yes, so we need -Werror for the tests.
+ #
+ ac_wireshark_non_cxx_warning_option_error="-Werror"
+ break
+ ])
+ ])
+ done
+ CXXFLAGS="$save_CXXFLAGS"
+ AC_LANG_POP
+ if test x$ac_wireshark_non_cxx_warning_option_error = x; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no, adding -Werror])
+ fi
+ ])
+
#
-# AC_WIRESHARK_GCC_CFLAGS_CHECK
+# AC_WIRESHARK_COMPILER_FLAGS_CHECK
#
-# $1 : cflags to test
+# $1 : flags to test
# $2 : if supplied, C for C-only flags, CXX for C++-only flags
+# $3 : if supplied, a program to try to compile with the flag
+# and, if the compile fails when -Werror is turned on,
+# we don't add the flag - used for warning flags that
+# issue incorrect or non-useful warnings with some
+# compiler versions
+# $4 : must be supplied if $3 is supplied - a message describing
+# for what the test program is testing
#
# The macro first determines if the compiler supports GCC-style flags.
# Then it attempts to compile with the defined cflags. The defined
# We do this because not all such options are necessarily supported by
# the version of the particular compiler we're using.
#
-# NOTE: clang, by default, only warns about unknown -W options.
-# If we're using clang, we turn on -Werror=unknown-warning-option
-# so that it fails if we pass it a -W option it doesn't know about
-# but doesn't fail for any other warning that the test program might
-# produce.
-#
-AC_DEFUN([AC_WIRESHARK_GCC_CFLAGS_CHECK],
+AC_DEFUN([AC_WIRESHARK_COMPILER_FLAGS_CHECK],
[GCC_OPTION="$1"
-case "$2" in
-C)
- AC_MSG_CHECKING(whether we can add $GCC_OPTION to CFLAGS)
- ;;
-
-CXX)
- AC_MSG_CHECKING(whether we can add $GCC_OPTION to CXXFLAGS)
- ;;
-
-*)
- AC_MSG_CHECKING(whether we can add $GCC_OPTION to CFLAGS and CXXFLAGS)
- ;;
-esac
-
+can_add_to_cflags=""
+can_add_to_cxxflags=""
if test "x$ac_supports_gcc_flags" = "xyes" ; then
if test "$2" != CXX ; then
#
# Not C++-only; if this can be added to the C compiler flags, add them.
#
+ # If the option begins with "-W", add
+ # $ac_wireshark_unknown_warning_option_error to make sure that
+ # we'll get an error if it's an unknown warning option; not all
+ # compilers treat unknown warning options as errors (I'm looking at
+ # you, clang).
+ #
+ # If the option begins with "-f" or "-m", add -Werror to make sure
+ # that we'll get an error if we get "argument unused during compilation"
+ # warnings, as those will either cause a failure for files compiled
+ # with -Werror or annoying noise for files compiled without it.
+ # (Yeah, you, clang.)
+ #
+ AC_MSG_CHECKING(whether we can add $GCC_OPTION to CFLAGS)
CFLAGS_saved="$CFLAGS"
- CFLAGS="$CFLAGS $GCC_OPTION"
- if test "x$CC" = "xclang" ; then
- #
- # Force clang to fail on an unknown warning option; by default,
- # it whines but doesn't fail, so we add unknown options and,
- # as a result, get a lot of that whining when we compile.
- #
- CFLAGS="$CFLAGS -Werror=unknown-warning-option"
+ if expr "x$GCC_OPTION" : "x-W.*" >/dev/null
+ then
+ CFLAGS="$CFLAGS $ac_wireshark_unknown_warning_option_error $GCC_OPTION"
+ elif expr "x$GCC_OPTION" : "x-f.*" >/dev/null
+ then
+ CFLAGS="$CFLAGS -Werror $GCC_OPTION"
+ elif expr "x$GCC_OPTION" : "x-m.*" >/dev/null
+ then
+ CFLAGS="$CFLAGS -Werror $GCC_OPTION"
+ else
+ CFLAGS="$CFLAGS $GCC_OPTION"
fi
- AC_COMPILE_IFELSE([
- AC_LANG_SOURCE([[
- int foo;
- ]])],
- [
- AC_MSG_RESULT(yes)
- #
- # Remove -Werror=unknown-warning-option, if we
- # added it, by setting CFLAGS to the saved value
- # plus just the new option.
- #
- CFLAGS="$CFLAGS_saved $GCC_OPTION"
- if test "$2" != C ; then
- #
- # Add it to the C++ flags as well.
- #
- CXXFLAGS="$CXXFLAGS $GCC_OPTION"
- fi
- ],
- [
- AC_MSG_RESULT(no)
- CFLAGS="$CFLAGS_saved"
- ])
- else
+ AC_COMPILE_IFELSE(
+ [
+ AC_LANG_SOURCE([[int foo;]])
+ ],
+ [
+ AC_MSG_RESULT(yes)
+ can_add_to_cflags=yes
+ #
+ # OK, do we have a test program? If so, check
+ # whether it fails with this option and -Werror,
+ # and, if so, don't include it.
+ #
+ # We test arg 4 here because arg 3 is a program which
+ # could contain quotes (breaking the comparison).
+ #
+ if test "x$4" != "x" ; then
+ CFLAGS="$CFLAGS -Werror"
+ AC_MSG_CHECKING(whether $GCC_OPTION $4)
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE($3)],
+ [
+ AC_MSG_RESULT(no)
+ #
+ # Remove "force an error for a warning" options, if we
+ # added them, by setting CFLAGS to the saved value plus
+ # just the new option.
+ #
+ CFLAGS="$CFLAGS_saved $GCC_OPTION"
+ #
+ # Add it to the flags we use when building build tools.
+ #
+ CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
+ ],
+ [
+ AC_MSG_RESULT(yes)
+ CFLAGS="$CFLAGS_saved"
+ ])
+ else
+ #
+ # Remove "force an error for a warning" options, if we
+ # added them, by setting CFLAGS to the saved value plus
+ # just the new option.
+ #
+ CFLAGS="$CFLAGS_saved $GCC_OPTION"
+ #
+ # Add it to the flags we use when building build tools.
+ #
+ CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
+ fi
+ ],
+ [
+ AC_MSG_RESULT(no)
+ can_add_to_cflags=no
+ CFLAGS="$CFLAGS_saved"
+ ])
+ fi
+ if test "$2" != C ; then
#
- # C++-only; if this can be added to the C++ compiler flags, add them.
+ # Not C-only; if this can be added to the C++ compiler flags, add them.
#
+ # If the option begins with "-W", add
+ # $ac_wireshark_unknown_warning_option_error, as per the above, and
+ # also add $ac_wireshark_non_cxx_warning_option_error, because at
+ # lease some versions of g++ whine about -Wmissing-prototypes, the
+ # fact that at least one of those versions refuses to warn about
+ # function declarations without an earlier declaration nonwithstanding;
+ # perhaps there's a reason not to warn about that with C++ even though
+ # warning about it can be a Good Idea with C, but it's not obvious to
+ # me).
+ #
+ # If the option begins with "-f" or "-m", add -Werror to make sure
+ # that we'll get an error if we get "argument unused during compilation"
+ # warnings, as those will either cause a failure for files compiled
+ # with -Werror or annoying noise for files compiled without it.
+ # (Yeah, you, clang++.)
+ #
+ AC_MSG_CHECKING(whether we can add $GCC_OPTION to CXXFLAGS)
CXXFLAGS_saved="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $GCC_OPTION"
- if test "x$CC" = "xclang" ; then
- CXXFLAGS="$CXXFLAGS -Werror=unknown-warning-option"
+ if expr "x$GCC_OPTION" : "x-W.*" >/dev/null
+ then
+ CXXFLAGS="$CXXFLAGS $ac_wireshark_unknown_warning_option_error $ac_wireshark_non_cxx_warning_option_error $GCC_OPTION"
+ elif expr "x$GCC_OPTION" : "x-f.*" >/dev/null
+ then
+ CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION"
+ elif expr "x$GCC_OPTION" : "x-m.*" >/dev/null
+ then
+ CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION"
+ else
+ CXXFLAGS="$CXXFLAGS $GCC_OPTION"
fi
AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE([
- AC_LANG_SOURCE([[
- int foo;
- ]])],
- [
- AC_MSG_RESULT(yes)
- ],
- [
- AC_MSG_RESULT(no)
- CXXFLAGS="$CXXFLAGS_saved"
- ])
+ AC_COMPILE_IFELSE(
+ [
+ AC_LANG_SOURCE([[int foo;]])
+ ],
+ [
+ AC_MSG_RESULT(yes)
+ can_add_to_cxxflags=yes
+ #
+ # OK, do we have a test program? If so, check
+ # whether it fails with this option and -Werror,
+ # and, if so, don't include it.
+ #
+ # We test arg 4 here because arg 3 is a program which
+ # could contain quotes (breaking the comparison).
+ #
+ if test "x$4" != "x" ; then
+ CXXFLAGS="$CXXFLAGS -Werror"
+ AC_MSG_CHECKING(whether $GCC_OPTION $4)
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE($3)],
+ [
+ AC_MSG_RESULT(no)
+ #
+ # Remove "force an error for a warning" options, if we
+ # added them, by setting CXXFLAGS to the saved value plus
+ # just the new option.
+ #
+ CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION"
+ ],
+ [
+ AC_MSG_RESULT(yes)
+ CXXFLAGS="$CXXFLAGS_saved"
+ ])
+ else
+ #
+ # Remove "force an error for a warning" options, if we
+ # added them, by setting CXXFLAGS to the saved value plus
+ # just the new option.
+ #
+ CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION"
+ fi
+ ],
+ [
+ AC_MSG_RESULT(no)
+ can_add_to_cxxflags=no
+ CXXFLAGS="$CXXFLAGS_saved"
+ ])
AC_LANG_POP([C++])
fi
-else
- AC_MSG_RESULT(no)
+ if test "(" "$can_add_to_cflags" = "yes" -a "$can_add_to_cxxflags" = "no" ")" \
+ -o "(" "$can_add_to_cflags" = "no" -a "$can_add_to_cxxflags" = "yes" ")"
+ then
+ #
+ # Confusingly, some C++ compilers like -Wmissing-prototypes but
+ # don't like -Wmissing-declarations and others like
+ # -Wmissing-declarations but don't like -Wmissing-prototypes,
+ # the fact that the corresponding C compiler likes both. Don't
+ # warn about them.
+ #
+ if test "(" x$GCC_OPTION != x-Wmissing-prototypes ")" \
+ -a "(" x$GCC_OPTION != x-Wmissing-declarations ")"
+ then
+ AC_MSG_WARN([$CC and $CXX appear to be a mismatched pair])
+ fi
+ fi
+fi
+])
+
+# AC_WIRESHARK_GCC_FORTIFY_SOURCE_CHECK
+#
+# Checks if '-D_FORTIFY_SOURCE=...' is OK to use in CPPFLAGS.
+# Use '-D_FORTIFY_SOURCE=...' in CPPFLAGS only if the GCC 'optimization level' is > 0.
+# The use of '-D_FORTIFY_SOURCE=...' will cause a warning with at least some versions
+# of glibc if the GCC "optimization level" is 0 (default or -O or -O0)
+# when using GCC to compile a source file which references the macro definition.
+#
+# See: http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
+# See: http://sourceware.org/bugzilla/show_bug.cgi?id=13979
+#
+# We'll use '-D_FORTIFY_SOURCE=2' only if there's no warning; Among other things this means
+# that the use of '-D_FORTIFY_SOURCE=2' with '-Werror' and '-O0' won't cause
+# the compiler to stop on error.
+# Assumption: CFLAGS already contains whatever optimization option including none) is
+# to be used.
+#
+
+AC_DEFUN([AC_WIRESHARK_GCC_FORTIFY_SOURCE_CHECK],
+[
+if test "x$GCC" = "xyes" -o "x$CC" = "xclang" ; then
+ AC_MSG_CHECKING([whether -D_FORTIFY_SOURCE=... can be used (without generating a warning)])
+ CFLAGS_saved="$CFLAGS"
+ CPPFLAGS_saved="$CPPFLAGS"
+ CFLAGS="$CFLAGS -Werror"
+ CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+ AC_COMPILE_IFELSE([
+ AC_LANG_SOURCE([[
+ #include <stdio.h>
+ int foo;
+ ]])],
+ [
+ AC_MSG_RESULT(yes)
+ #
+ # (CPPFLAGS contains _D_FORTIFY_SOURCE=2)
+ #
+ ],
+ [
+ AC_MSG_RESULT(no)
+ # Remove -D_FORTIFY_SOURCE=2
+ CPPFLAGS="$CPPFLAGS_saved"
+ ])
+ CFLAGS="$CFLAGS_saved"
fi
])
# Checks for the presence of OS X integration functions in the GTK+ framework
# or as a separate library.
#
-# http://sourceforge.net/apps/trac/gtk-osx/wiki/Integrate
+# GTK+ for MAC OS X now lives on www.gtk.org at:
+#
+# http://www.gtk.org/download/macos.php
+#
+# Details on building with GTK-OSX are available at:
+#
+# http://live.gnome.org/GTK%2B/OSX/Building
+#
+# The GTK-OSX library has been renamed to gtkmacintegration.
+# It was previously named igemacintegration.
#
# http://live.gnome.org/GTK%2B/OSX/Integration
# for the old Carbon-based integration functions
#
-# http://gtk-osx.sourceforge.net/ige-mac-integration/
-# for the new Cocoa-based integration functions
-#
AC_DEFUN([AC_WIRESHARK_OSX_INTEGRATION_CHECK],
[
ac_save_CFLAGS="$CFLAGS"
LIBS="$GTK_LIBS $LIBS"
#
- # Check for the new integration functions in a -ligemacintegration
+ # Check for the new integration functions in a -lgtkmacintegration
# library.
#
- AC_CHECK_LIB(igemacintegration, gtk_osxapplication_set_menu_bar,
+ AC_CHECK_LIB(gtkmacintegration, gtkosx_application_set_menu_bar,
[
AC_DEFINE(HAVE_GTKOSXAPPLICATION, 1,
- [Define to 1 if -ligemacintegration includes the GtkOSXApplication Integration functions.])
+ [Define to 1 if -lgtkmacintegration includes the GtkOSXApplication Integration functions.])
have_ige_mac=yes
# We don't want gtk stuff in LIBS (which is reset below) so
# manually set GTK_LIBS (which is more appropriate)
- GTK_LIBS="$GTK_LIBS -ligemacintegration"
+ GTK_LIBS="$GTK_LIBS -lgtkmacintegration"
])
if test x$have_ige_mac = x
# Not found - check for the old integration functions in
# the Gtk framework.
#
- AC_CHECK_LIB(Gtk, ige_mac_menu_set_menu_bar,
+ AC_CHECK_LIB(Gtk, gtk_mac_menu_set_menu_bar,
[
AC_DEFINE(HAVE_IGE_MAC_INTEGRATION, 1,
[Define to 1 if the the Gtk+ framework or a separate library includes the Imendio IGE Mac OS X Integration functions.])
then
#
# Not found - check for the old integration functions in
- # a -ligemacintegration library.
+ # a -lgtkmacintegration library.
#
- AC_CHECK_LIB(igemacintegration, ige_mac_menu_set_menu_bar,
+ AC_CHECK_LIB(gtkmacintegration, gtk_mac_menu_set_menu_bar,
[
AC_DEFINE(HAVE_IGE_MAC_INTEGRATION, 1,
[Define to 1 if the the Gtk+ framework or a separate library includes the Imendio IGE Mac OS X Integration functions.])
have_ige_mac=yes
# We don't want gtk stuff in LIBS (which is reset below) so
# manually set GTK_LIBS (which is more appropriate)
- GTK_LIBS="$GTK_LIBS -ligemacintegration"
+ GTK_LIBS="$GTK_LIBS -lgtkmacintegration"
])
fi
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
])
-#
-# AC_WIRESHARK_PYTHON_CHECK
-#
-# Check whether python devel package is present
-#
-AC_DEFUN([AC_WIRESHARK_PYTHON_CHECK],
- [
- #
- # Checking whether we have a python devel environment available
- #
-# AC_CACHE_CHECK([checking python devel package], ac_cv_wireshark_python_devel,
-# [
- AC_CHECK_PROG([ac_ws_python_config], python-config, "yes", "no")
- if test "x$ac_ws_python_config" = "xno"; then
- ac_cv_wireshark_python_devel=no
- if test "x$want_python" = "xyes"
- then
- #
- # The user tried to force us to use Python, but we
- # couldn't find the python-config tool; report an error.
- #
- AC_MSG_ERROR("python-config not found")
- fi
- #
- # Set want_python to no, so we report that we aren't using
- # the Python interpreter.
- #
- want_python=no
- else
- AC_MSG_CHECKING([python devel])
- ac_save_ws_cflags=$CFLAGS
- ac_save_ws_libs=$LIBS
- CFLAGS=$(python-config --includes)
- LIBS=$(python-config --ldflags)
- AC_COMPILE_IFELSE(
- [
- AC_LANG_PROGRAM(
- [[#include <Python.h>]],
- [[Py_Initialiaze();]]
- )
- ],
- [
- #
- # Compilation successful, we have python devel available
- #
- ac_cv_wireshark_python_devel=yes
- PY_LIBS=$LIBS
- PY_CFLAGS=$CFLAGS
- AC_SUBST(PY_LIBS)
- AC_SUBST(PY_CFLAGS)
- CFLAGS="$ac_save_ws_cflags"
- LIBS="$ac_save_ws_libs"
- AC_DEFINE(HAVE_PYTHON, 1, [Define if python devel package available])
- AC_MSG_RESULT([yes])
- ],
- [
- #
- # Compilation unsuccessful, python devel not available
- #
- ac_cv_wireshark_python_devel=no
- CFLAGS=$ac_save_ws_cflags
- LIBS=$ac_save_ws_libs
- if test "x$want_python" = "xyes"
- then
- #
- # The user tried to force us to use Python, but we
- # couldn't compile the test program; report an error.
- #
- AC_MSG_ERROR("Python test program failed compilation")
- fi
- AC_MSG_RESULT([no])
- #
- # Set want_python to no, so we report that we aren't using
- # the Python interpreter.
- #
- want_python=no
- ])
- fi
-# ])
+# Based on AM_PATH_GTK in gtk-2.0.m4.
+
+dnl AC_WIRESHARK_QT_MODULE_CHECK([MODULE, MINIMUM-VERSION, [ACTION-IF-FOUND,
+dnl [ACTION-IF-NOT-FOUND]]])
+dnl Test for a particular Qt module and add the flags and libraries
+dnl for it to Qt_CFLAGS and Qt_LIBS.
+dnl
+AC_DEFUN([AC_WIRESHARK_QT_MODULE_CHECK],
+[
+ #
+ # Version of the module we're checking for.
+ # Default to 4.0.0.
+ #
+ min_qt_version=ifelse([$2], ,4.0.0,$2)
+
+ #
+ # Prior to Qt 5, modules were named QtXXX.
+ # In Qt 5, they're named Qt5XXX.
+ #
+ # Try the Qt 5 version first.
+ # (And be prepared to add Qt6 at some point....)
+ #
+ for modprefix in Qt5 Qt
+ do
+ pkg_config_module="${modprefix}$1"
+ AC_MSG_CHECKING(for $pkg_config_module - version >= $min_qt_version)
+ if $PKG_CONFIG --atleast-version $min_qt_version $pkg_config_module; then
+ mod_version=`$PKG_CONFIG --modversion $pkg_config_module`
+ AC_MSG_RESULT(yes (version $mod_version))
+ Qt_CFLAGS="$Qt_CFLAGS `$PKG_CONFIG --cflags $pkg_config_module`"
+ Qt_LIBS="$Qt_LIBS `$PKG_CONFIG --libs $pkg_config_module`"
+ found_$1=yes
+ break
+ else
+ AC_MSG_RESULT(no)
+ fi
+ done
+
+ if test "x$found_$1" = "xyes"; then
+ # Run Action-If-Found
+ ifelse([$3], , :, [$3])
+ else
+ # Run Action-If-Not-Found
+ ifelse([$4], , :, [$4])
+ fi
+])
+
+dnl AC_WIRESHARK_QT_CHECK([MINIMUM-VERSION, [ACTION-IF-FOUND,
+dnl [ACTION-IF-NOT-FOUND]]])
+dnl Test for Qt and define Qt_CFLAGS and Qt_LIBS.
+dnl
+AC_DEFUN([AC_WIRESHARK_QT_CHECK],
+[
+ no_qt=""
+
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+ if test x$PKG_CONFIG != xno ; then
+ if pkg-config --atleast-pkgconfig-version 0.7 ; then
+ :
+ else
+ echo *** pkg-config too old; version 0.7 or better required.
+ no_qt=yes
+ PKG_CONFIG=no
+ fi
+ else
+ no_qt=yes
+ fi
+
+ if test x"$no_qt" = x ; then
+ #
+ # OK, we have an adequate version of pkg-config.
+ #
+ # Check for the Core module; if we don't have that,
+ # we don't have Qt.
+ #
+ AC_WIRESHARK_QT_MODULE_CHECK(Core, $1, , [no_qt=yes])
+ fi
+
+ if test x"$no_qt" = x ; then
+ #
+ # We need the Gui module as well.
+ #
+ AC_WIRESHARK_QT_MODULE_CHECK(Gui, $1, , [no_qt=yes])
+ fi
+
+ if test x"$no_qt" = x ; then
+ #
+ # Qt 5.0 appears to move the widgets out of Qt GUI
+ # to Qt Widgets; look for the Widgets module, but
+ # don't fail if we don't have it.
+ #
+ AC_WIRESHARK_QT_MODULE_CHECK(Widgets, $1)
+
+ #
+ # Qt 5.0 also appears to move the printing support into
+ # the Qt PrintSupport module.
+ #
+ AC_WIRESHARK_QT_MODULE_CHECK(PrintSupport, $1)
+
+ #
+ # While we're at it, look for QtMacExtras. (Presumably
+ # if we're not building for OS X, it won't be present.)
+ #
+ # XXX - is there anything in QtX11Extras or QtWinExtras
+ # that we should be using?
+ #
+ AC_WIRESHARK_QT_MODULE_CHECK(MacExtras, $1,
+ AC_DEFINE(QT_MACEXTRAS_LIB, 1, [Define if we have QtMacExtras]))
+
+ AC_SUBST(Qt_LIBS)
+
+ # Run Action-If-Found
+ ifelse([$2], , :, [$2])
+ else
+ # Run Action-If-Not-Found
+ ifelse([$3], , :, [$3])
+ fi
+
])
git.samba.org / metze / wireshark / wip.git / blobdiff