Get rid of -Wshadow warning - I guess we're including something that

[metze/wireshark/wip.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 94a29129b2aeee465d52c0fd355dc98ab876d13f..e3b3327215809c59e365154657b9f18d9926d8b8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -105,11 +105,11 @@ if test ! -z "$PYTHON"; then
        AC_MSG_CHECKING([whether $PYTHON is Python 2.5 or later])
        python_major_version=`$PYTHON -c 'import sys; print (sys.version_info[[0]])'`
        python_minor_version=`$PYTHON -c 'import sys; print (sys.version_info[[1]])'`
-       if test "$python_major_version" -eq 2 -a "$python_minor_version" -ge 5 ; then
-               AC_MSG_RESULT(yes)
-       else
+       if test "$python_major_version" -eq 2 -a "$python_minor_version" -lt 5 ; then
                AC_MSG_RESULT(no)
                AC_MSG_WARN([Building with Python $python_major_version.$python_minor_version may not work])
+       else
+               AC_MSG_RESULT(yes)
        fi
 fi
 
@@ -1128,6 +1128,15 @@ AC_SUBST(SYSTEMCONFIGURATION_FRAMEWORKS)
 AC_SUBST(COREFOUNDATION_FRAMEWORKS)
 AC_SUBST(OSX_APP_FLAGS)
 
+#
+# On Solaris, check whether we have getexecname().
+#
+case "$host_os" in
+solaris*)
+       AC_CHECK_FUNC(getexecname)
+       ;;
+esac
+
 dnl Look in /usr/local for header files and libraries ?
 dnl XXX FIXME don't include /usr/local if it is already in the system
 dnl search path as this causes gcc 3.2 on Linux to complain about a change
@@ -1325,8 +1334,8 @@ if test "x$enable_wireshark" = "xyes"; then
                        CFLAGS="$CFLAGS $Qt_CFLAGS"
                        CXXFLAGS="$CXXFLAGS $Qt_CFLAGS"
                        have_qt=yes
-               ]
-               , [AC_MSG_ERROR([Qt is not available])])
+               ],
+               [AC_MSG_ERROR([Qt is not available])])
 
                #
                # XXX - greasy hack to make ui/gtk/recent.c
@@ -1353,7 +1362,8 @@ if test "x$enable_wireshark" = "xyes"; then
                        CFLAGS="$CFLAGS $GTK_CFLAGS"
                        CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
                        have_gtk=yes
-               ], have_gtk=no)
+               ],
+               [AC_MSG_ERROR([GTK+ 3 is not available])])
        elif test "x$with_gtk2" = "xyes"; then
                #
                # GTK+ 3 wasn't specified, and GTK+ 2 was specified;
@@ -1364,7 +1374,8 @@ if test "x$enable_wireshark" = "xyes"; then
                        CFLAGS="$CFLAGS $GTK_CFLAGS"
                        CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
                        have_gtk=yes
-               ], have_gtk=no)
+               ],
+               [AC_MSG_ERROR([GTK+ 2 is not available])])
        fi
 fi
 
@@ -1574,40 +1585,34 @@ else
 fi
 
 #
-# If we have <dlfcn.h>, check whether we can use dladdr to find a
-# filename (hopefully, a full pathname, but no guarantees) for
-# the executable.
+# If we have <dlfcn.h>, check whether we have dladdr.
 #
 if test "$ac_cv_header_dlfcn_h" = "yes"
 then
-       AC_MSG_CHECKING(whether dladdr can be used to find the pathname of an executable)
+       #
+       # Use GLib compiler flags and linker flags; GLib's gmodule
+       # stuff uses the dl APIs if available, so it might know
+       # what flags are needed.
+       #
        ac_save_CFLAGS="$CFLAGS"
        ac_save_LIBS="$LIBS"
        CFLAGS="$CFLAGS $GLIB_CFLAGS"
        LIBS="$GLIB_LIBS $LIBS"
-       AC_TRY_RUN([
-#define _GNU_SOURCE    /* required on Linux, sigh */
-#include <dlfcn.h>
-
-int
-main(void)
-{
-       Dl_info info;
-
-       if (!dladdr((void *)main, &info))
-               return 1;       /* failure */
-       return 0;               /* assume success */
-}
-], ac_cv_dladdr_finds_executable_path=yes, ac_cv_dladdr_finds_executable_path=no,
-   [echo $ac_n "cross compiling; assumed OK... $ac_c"
-    ac_cv_dladdr_finds_executable_path=yes])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-       if test x$ac_cv_dladdr_finds_executable_path = xyes
+       AC_CHECK_FUNCS(dladdr)
+       if test x$ac_cv_func_dladdr = xno
        then
-               AC_DEFINE(DLADDR_FINDS_EXECUTABLE_PATH, 1, [Define if dladdr can be used to find the path of the executable])
+               #
+               # OK, try it with -ldl, in case you need that to get
+               # dladdr().  For some reason, on Linux, that's not
+               # part of the GLib flags; perhaps GLib itself is
+               # linked with libdl, so that you can link with
+               # Glib and it'll pull libdl in itself.
+               #
+               LIBS="$LIBS -ldl"
+               AC_CHECK_FUNCS(dladdr)
        fi
-       AC_MSG_RESULT($ac_cv_dladdr_finds_executable_path)
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
 fi
 
 #
@@ -2644,6 +2649,9 @@ AC_OUTPUT(
   asn1/acse/Makefile
   asn1/ansi_map/Makefile
   asn1/ansi_tcap/Makefile
+  asn1/atn-cm/Makefile
+  asn1/atn-cpdlc/Makefile
+  asn1/atn-ulcs/Makefile
   asn1/c1222/Makefile
   asn1/camel/Makefile
   asn1/cdt/Makefile