[BACK]Return to aclocal.m4 CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / mtr

Diff for /embedaddon/mtr/aclocal.m4 between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2016/11/01 09:44:48 version 1.1.1.4, 2019/10/21 14:25:31
Line 20  You have another version of autoconf.  It may work, bu Line 20  You have another version of autoconf.  It may work, bu
 If you have problems, you may need to regenerate the build system entirely.  If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])  To do so, use the procedure documented by the package, typically 'autoreconf'.])])
   
 # Configure paths for GTK+  
 # Owen Taylor     1997-2001  
   
 dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])  
 dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,   
 dnl pass to pkg-config  
 dnl  
 AC_DEFUN([AM_PATH_GTK_2_0],  
 [dnl   
 dnl Get the cflags and libraries from pkg-config  
 dnl  
 AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],  
                     , enable_gtktest=yes)  
   
   pkg_config_args=gtk+-2.0  
   for module in . $4  
   do  
       case "$module" in  
          gthread)   
              pkg_config_args="$pkg_config_args gthread-2.0"  
          ;;  
       esac  
   done  
   
   no_gtk=""  
   
   AC_REQUIRE([PKG_PROG_PKG_CONFIG])  
   PKG_PROG_PKG_CONFIG([0.7])  
   
   min_gtk_version=ifelse([$1], ,2.0.0,$1)  
   AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)  
   
   if test x$PKG_CONFIG != xno ; then  
     ## don't try to run the test against uninstalled libtool libs  
     if $PKG_CONFIG --uninstalled $pkg_config_args; then  
           echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"  
           enable_gtktest=no  
     fi  
   
     if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then  
           :  
     else  
           no_gtk=yes  
     fi  
   fi  
   
   if test x"$no_gtk" = x ; then  
     GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`  
     GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`  
     gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \  
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`  
     gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \  
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`  
     gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \  
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`  
     if test "x$enable_gtktest" = "xyes" ; then  
       ac_save_CFLAGS="$CFLAGS"  
       ac_save_LIBS="$LIBS"  
       CFLAGS="$CFLAGS $GTK_CFLAGS"  
       LIBS="$GTK_LIBS $LIBS"  
 dnl  
 dnl Now check if the installed GTK+ is sufficiently new. (Also sanity  
 dnl checks the results of pkg-config to some extent)  
 dnl  
       rm -f conf.gtktest  
       AC_TRY_RUN([  
 #include <gtk/gtk.h>  
 #include <stdio.h>  
 #include <stdlib.h>  
   
 int   
 main ()  
 {  
   int major, minor, micro;  
   char *tmp_version;  
   
   fclose (fopen ("conf.gtktest", "w"));  
   
   /* HP/UX 9 (%@#!) writes to sscanf strings */  
   tmp_version = g_strdup("$min_gtk_version");  
   if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {  
      printf("%s, bad version string\n", "$min_gtk_version");  
      exit(1);  
    }  
   
   if ((gtk_major_version != $gtk_config_major_version) ||  
       (gtk_minor_version != $gtk_config_minor_version) ||  
       (gtk_micro_version != $gtk_config_micro_version))  
     {  
       printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",   
              $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,  
              gtk_major_version, gtk_minor_version, gtk_micro_version);  
       printf ("*** was found! If pkg-config was correct, then it is best\n");  
       printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");  
       printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");  
       printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");  
       printf("*** required on your system.\n");  
       printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");  
       printf("*** to point to the correct configuration files\n");  
     }   
   else if ((gtk_major_version != GTK_MAJOR_VERSION) ||  
            (gtk_minor_version != GTK_MINOR_VERSION) ||  
            (gtk_micro_version != GTK_MICRO_VERSION))  
     {  
       printf("*** GTK+ header files (version %d.%d.%d) do not match\n",  
              GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);  
       printf("*** library (version %d.%d.%d)\n",  
              gtk_major_version, gtk_minor_version, gtk_micro_version);  
     }  
   else  
     {  
       if ((gtk_major_version > major) ||  
         ((gtk_major_version == major) && (gtk_minor_version > minor)) ||  
         ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))  
       {  
         return 0;  
        }  
      else  
       {  
         printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",  
                gtk_major_version, gtk_minor_version, gtk_micro_version);  
         printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",  
                major, minor, micro);  
         printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");  
         printf("***\n");  
         printf("*** If you have already installed a sufficiently new version, this error\n");  
         printf("*** probably means that the wrong copy of the pkg-config shell script is\n");  
         printf("*** being found. The easiest way to fix this is to remove the old version\n");  
         printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");  
         printf("*** correct copy of pkg-config. (In this case, you will have to\n");  
         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");  
         printf("*** so that the correct libraries are found at run-time))\n");  
       }  
     }  
   return 1;  
 }  
 ],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])  
        CFLAGS="$ac_save_CFLAGS"  
        LIBS="$ac_save_LIBS"  
      fi  
   fi  
   if test "x$no_gtk" = x ; then  
      AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))  
      ifelse([$2], , :, [$2])       
   else  
      AC_MSG_RESULT(no)  
      if test "$PKG_CONFIG" = "no" ; then  
        echo "*** A new enough version of pkg-config was not found."  
        echo "*** See http://pkgconfig.sourceforge.net"  
      else  
        if test -f conf.gtktest ; then  
         :  
        else  
           echo "*** Could not run GTK+ test program, checking why..."  
           ac_save_CFLAGS="$CFLAGS"  
           ac_save_LIBS="$LIBS"  
           CFLAGS="$CFLAGS $GTK_CFLAGS"  
           LIBS="$LIBS $GTK_LIBS"  
           AC_TRY_LINK([  
 #include <gtk/gtk.h>  
 #include <stdio.h>  
 ],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],  
         [ echo "*** The test program compiled, but did not run. This usually means"  
           echo "*** that the run-time linker is not finding GTK+ or finding the wrong"  
           echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"  
           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"  
           echo "*** to the installed location  Also, make sure you have run ldconfig if that"  
           echo "*** is required on your system"  
           echo "***"  
           echo "*** If you have an old version installed, it is best to remove it, although"  
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],  
         [ echo "*** The test program failed to compile or link. See the file config.log for the"  
           echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])  
           CFLAGS="$ac_save_CFLAGS"  
           LIBS="$ac_save_LIBS"  
        fi  
      fi  
      GTK_CFLAGS=""  
      GTK_LIBS=""  
      ifelse([$3], , :, [$3])  
   fi  
   AC_SUBST(GTK_CFLAGS)  
   AC_SUBST(GTK_LIBS)  
   rm -f conf.gtktest  
 ])  
   
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-  # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # serial 1 (pkg-config-0.24)  # serial 1 (pkg-config-0.24)
 #   # 
Line 366  else Line 180  else
 fi[]dnl  fi[]dnl
 ])# PKG_CHECK_MODULES  ])# PKG_CHECK_MODULES
   
   
 # PKG_INSTALLDIR(DIRECTORY)  # PKG_INSTALLDIR(DIRECTORY)
 # -------------------------  # -------------------------
 # Substitutes the variable pkgconfigdir as the location where a module  # Substitutes the variable pkgconfigdir as the location where a module
Line 419  AS_VAR_COPY([$1], [pkg_cv_][$1]) Line 234  AS_VAR_COPY([$1], [pkg_cv_][$1])
   
 AS_VAR_IF([$1], [""], [$5], [$4])dnl  AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])# PKG_CHECK_VAR  ])# PKG_CHECK_VAR
   
 # PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,  
 #                  [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],  
 #                  [DESCRIPTION], [DEFAULT])  
 #  
 # Prepare a "--with-" configure option using the lowercase [VARIABLE-PREFIX]  
 # name, merging the behaviour of AC_ARG_WITH and PKG_CHECK_MODULES in a single  
 # macro  
 #  
 # --------------------------------------------------------------  
 AC_DEFUN([PKG_WITH_MODULES],  
 [  
 m4_pushdef([with_arg], m4_tolower([$1]))  
   
 m4_pushdef([description],  
            [m4_default([$5], [build with ]with_arg[ support])])  
   
 m4_pushdef([def_arg], [m4_default([$6], [auto])])  
 m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])  
 m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])  
   
 m4_case(def_arg,  
             [yes],[m4_pushdef([with_without], [--without-]with_arg)],  
             [m4_pushdef([with_without],[--with-]with_arg)])  
   
 AC_ARG_WITH(with_arg,  
      AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,  
     [AS_TR_SH([with_]with_arg)=def_arg])  
   
 AS_CASE([$AS_TR_SH([with_]with_arg)],  
             [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],  
             [auto],[PKG_CHECK_MODULES([$1],[$2],  
                                         [m4_n([def_action_if_found]) $3],  
                                         [m4_n([def_action_if_not_found]) $4])])  
   
 m4_popdef([with_arg])  
 m4_popdef([description])  
 m4_popdef([def_arg])  
   
 ]) dnl PKG_WITH_MODULES  
   
 # PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,  
 #                       [DESCRIPTION], [DEFAULT])  
 #  
 # Convenience macro to trigger AM_CONDITIONAL after  
 # PKG_WITH_MODULES check.  
 #  
 # HAVE_[VARIABLE-PREFIX] is exported as make variable.  
 #  
 # --------------------------------------------------------------  
 AC_DEFUN([PKG_HAVE_WITH_MODULES],  
 [  
 PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])  
   
 AM_CONDITIONAL([HAVE_][$1],  
                [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])  
 ])  
   
 # PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,  
 #                              [DESCRIPTION], [DEFAULT])  
 #  
 # Convenience macro to run AM_CONDITIONAL and AC_DEFINE after  
 # PKG_WITH_MODULES check.  
 #  
 # HAVE_[VARIABLE-PREFIX] is exported as make and preprocessor variable.  
 #  
 # --------------------------------------------------------------  
 AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],  
 [  
 PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])  
   
 AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],  
         [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])  
 ])  
   
 # Copyright (C) 2002-2014 Free Software Foundation, Inc.  # Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #  #
Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>