CVS tags cleaning (with other minor cleaning).

[wxWidgets.git] / wxwin.m4

diff --git a/wxwin.m4 b/wxwin.m4
index 07df4e46796f619ec4fac580fde9504e9ea16fe5..52c55e2e6e6be4244378d28c6c3ce0058faf7e9a 100644 (file)
--- a/wxwin.m4
+++ b/wxwin.m4
@@ -1,5 +1,5 @@
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------

-dnl Macros for wxWindows detection. Typically used in configure.in as:
+dnl Macros for wxWidgets detection. Typically used in configure.in as:

 dnl
 dnl     AC_ARG_ENABLE(...)
 dnl     AC_ARG_WITH(...)
 dnl
 dnl     AC_ARG_ENABLE(...)
 dnl     AC_ARG_WITH(...)


@@ -7,23 +7,23 @@ dnl        ...
 dnl     AM_OPTIONS_WXCONFIG
 dnl        ...
 dnl        ...
 dnl     AM_OPTIONS_WXCONFIG
 dnl        ...
 dnl        ...

-dnl     AM_PATH_WXCONFIG(2.3.4, wxWin=1)
+dnl     AM_PATH_WXCONFIG(2.6.0, wxWin=1)

 dnl     if test "$wxWin" != 1; then
 dnl        AC_MSG_ERROR([
 dnl     if test "$wxWin" != 1; then
 dnl        AC_MSG_ERROR([

-dnl                wxWindows must be installed on your system
+dnl                wxWidgets must be installed on your system

 dnl                but wx-config script couldn't be found.
 dnl
 dnl                Please check that wx-config is in path, the directory
 dnl                but wx-config script couldn't be found.
 dnl
 dnl                Please check that wx-config is in path, the directory

-dnl                where wxWindows libraries are installed (returned by
+dnl                where wxWidgets libraries are installed (returned by

 dnl                'wx-config --libs' command) is in LD_LIBRARY_PATH or
 dnl                'wx-config --libs' command) is in LD_LIBRARY_PATH or

-dnl                equivalent variable and wxWindows version is 2.3.4 or above.
+dnl                equivalent variable and wxWidgets version is 2.3.4 or above.

 dnl        ])
 dnl     fi
 dnl     CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
 dnl     CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
 dnl     CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
 dnl
 dnl        ])
 dnl     fi
 dnl     CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
 dnl     CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
 dnl     CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
 dnl

-dnl     LDFLAGS="$LDFLAGS $WX_LIBS"
+dnl     LIBS="$LIBS $WX_LIBS"

 dnl ---------------------------------------------------------------------------
 
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
 
 dnl ---------------------------------------------------------------------------


@@ -36,35 +36,59 @@ dnl ---------------------------------------------------------------------------
 AC_DEFUN([AM_OPTIONS_WXCONFIG],
 [
     AC_ARG_WITH(wxdir,
 AC_DEFUN([AM_OPTIONS_WXCONFIG],
 [
     AC_ARG_WITH(wxdir,

-                [  --with-wxdir=PATH       Use uninstalled version of wxWindows in PATH],
+                [  --with-wxdir=PATH       Use uninstalled version of wxWidgets in PATH],

                 [ wx_config_name="$withval/wx-config"
                   wx_config_args="--inplace"])
     AC_ARG_WITH(wx-config,
                 [  --with-wx-config=CONFIG wx-config script to use (optional)],
                 wx_config_name="$withval" )
     AC_ARG_WITH(wx-prefix,
                 [ wx_config_name="$withval/wx-config"
                   wx_config_args="--inplace"])
     AC_ARG_WITH(wx-config,
                 [  --with-wx-config=CONFIG wx-config script to use (optional)],
                 wx_config_name="$withval" )
     AC_ARG_WITH(wx-prefix,

-                [  --with-wx-prefix=PREFIX Prefix where wxWindows is installed (optional)],
+                [  --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)],

                 wx_config_prefix="$withval", wx_config_prefix="")
     AC_ARG_WITH(wx-exec-prefix,
                 [  --with-wx-exec-prefix=PREFIX
                 wx_config_prefix="$withval", wx_config_prefix="")
     AC_ARG_WITH(wx-exec-prefix,
                 [  --with-wx-exec-prefix=PREFIX

-                          Exec prefix where wxWindows is installed (optional)],
+                          Exec prefix where wxWidgets is installed (optional)],

                 wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
 ])
 
                 wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
 ])
 

+dnl Helper macro for checking if wx version is at least $1.$2.$3, set's
+dnl wx_ver_ok=yes if it is:
+AC_DEFUN([_WX_PRIVATE_CHECK_VERSION],
+[
+    wx_ver_ok=""
+    if test "x$WX_VERSION" != x ; then
+      if test $wx_config_major_version -gt $1; then
+        wx_ver_ok=yes
+      else
+        if test $wx_config_major_version -eq $1; then
+           if test $wx_config_minor_version -gt $2; then
+              wx_ver_ok=yes
+           else
+              if test $wx_config_minor_version -eq $2; then
+                 if test $wx_config_micro_version -ge $3; then
+                    wx_ver_ok=yes
+                 fi
+              fi
+           fi
+        fi
+      fi
+    fi
+])
+

 dnl ---------------------------------------------------------------------------
 dnl AM_PATH_WXCONFIG(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
 dnl                  [, WX-LIBS [, ADDITIONAL-WX-CONFIG-FLAGS]]]])
 dnl
 dnl ---------------------------------------------------------------------------
 dnl AM_PATH_WXCONFIG(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
 dnl                  [, WX-LIBS [, ADDITIONAL-WX-CONFIG-FLAGS]]]])
 dnl

-dnl Test for wxWindows, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
-dnl (the latter is for static linking against wxWindows). Set WX_CONFIG_NAME
+dnl Test for wxWidgets, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
+dnl (the latter is for static linking against wxWidgets). Set WX_CONFIG_NAME

 dnl environment variable to override the default name of the wx-config script
 dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this
 dnl case the macro won't even waste time on tests for its existence.
 dnl
 dnl Optional WX-LIBS argument contains comma- or space-separated list of
 dnl environment variable to override the default name of the wx-config script
 dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this
 dnl case the macro won't even waste time on tests for its existence.
 dnl
 dnl Optional WX-LIBS argument contains comma- or space-separated list of

-dnl wxWindows libraries to link against (it may include contrib libraries). If
+dnl wxWidgets libraries to link against (it may include contrib libraries). If

 dnl it is not specified then WX_LIBS and WX_LIBS_STATIC will contain flags to
 dnl it is not specified then WX_LIBS and WX_LIBS_STATIC will contain flags to

-dnl link with all of the core wxWindows libraries.
+dnl link with all of the core wxWidgets libraries.

 dnl
 dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config
 dnl invocation command in present. It can be used to fine-tune lookup of
 dnl
 dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config
 dnl invocation command in present. It can be used to fine-tune lookup of


@@ -116,9 +140,9 @@ AC_DEFUN([AM_PATH_WXCONFIG],
 
     min_wx_version=ifelse([$1], ,2.2.1,$1)
     if test -z "$5" ; then
 
     min_wx_version=ifelse([$1], ,2.2.1,$1)
     if test -z "$5" ; then

-      AC_MSG_CHECKING([for wxWindows version >= $min_wx_version])
+      AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version])

     else
     else

-      AC_MSG_CHECKING([for wxWindows version >= $min_wx_version ($5)])
+      AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version ($5)])

     fi
 
     WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5 $4"
     fi
 
     WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5 $4"


@@ -138,24 +162,9 @@ AC_DEFUN([AM_PATH_WXCONFIG],
     wx_requested_micro_version=`echo $min_wx_version | \
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
 
     wx_requested_micro_version=`echo $min_wx_version | \
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
 

-    wx_ver_ok=""
-    if test "x$WX_VERSION" != x ; then
-      if test $wx_config_major_version -gt $wx_requested_major_version; then
-        wx_ver_ok=yes
-      else
-        if test $wx_config_major_version -eq $wx_requested_major_version; then
-           if test $wx_config_minor_version -gt $wx_requested_minor_version; then
-              wx_ver_ok=yes
-           else
-              if test $wx_config_minor_version -eq $wx_requested_minor_version; then
-                 if test $wx_config_micro_version -ge $wx_requested_micro_version; then
-                    wx_ver_ok=yes
-                 fi
-              fi
-           fi
-        fi
-      fi
-    fi
+    _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version],
+                              [$wx_requested_minor_version],
+                              [$wx_requested_micro_version])

 
     if test -n "$wx_ver_ok"; then
 
 
     if test -n "$wx_ver_ok"; then
 


@@ -166,9 +175,11 @@ AC_DEFUN([AM_PATH_WXCONFIG],
       dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is
       dnl what the user actually wants, making this redundant at best.
       dnl For now keep it in case anyone actually used it in the past.
       dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is
       dnl what the user actually wants, making this redundant at best.
       dnl For now keep it in case anyone actually used it in the past.

-      AC_MSG_CHECKING([for wxWindows static library])
-      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>&1 > /dev/null`
-      if test -n "$WX_LIBS_STATIC"; then
+      AC_MSG_CHECKING([for wxWidgets static library])
+      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
+      if test "x$WX_LIBS_STATIC" = "x"; then
+        AC_MSG_RESULT(no)
+      else

         AC_MSG_RESULT(yes)
       fi
 
         AC_MSG_RESULT(yes)
       fi
 


@@ -190,6 +201,24 @@ AC_DEFUN([AM_PATH_WXCONFIG],
         fi
       fi
 
         fi
       fi
 

+      dnl starting with version 2.7.0 wx-config has --rescomp option
+      wx_has_rescomp=""
+      if test $wx_config_major_version -gt 2; then
+        wx_has_rescomp=yes
+      else
+        if test $wx_config_major_version -eq 2; then
+           if test $wx_config_minor_version -ge 7; then
+              wx_has_rescomp=yes
+           fi
+        fi
+      fi
+      if test "x$wx_has_rescomp" = x ; then
+         dnl cannot give any useful info for resource compiler
+         WX_RESCOMP=
+      else
+         WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp`
+      fi
+

       if test "x$wx_has_cppflags" = x ; then
          dnl no choice but to define all flags like CFLAGS
          WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
       if test "x$wx_has_cppflags" = x ; then
          dnl no choice but to define all flags like CFLAGS
          WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`


@@ -224,9 +253,21 @@ AC_DEFUN([AM_PATH_WXCONFIG],
        WX_CXXFLAGS=""
        WX_LIBS=""
        WX_LIBS_STATIC=""
        WX_CXXFLAGS=""
        WX_LIBS=""
        WX_LIBS_STATIC=""

+       WX_RESCOMP=""

        ifelse([$3], , :, [$3])
 
     fi
        ifelse([$3], , :, [$3])
 
     fi

+  else
+
+    WX_CFLAGS=""
+    WX_CPPFLAGS=""
+    WX_CXXFLAGS=""
+    WX_LIBS=""
+    WX_LIBS_STATIC=""
+    WX_RESCOMP=""
+
+    ifelse([$3], , :, [$3])
+

   fi
 
   AC_SUBST(WX_CPPFLAGS)
   fi
 
   AC_SUBST(WX_CPPFLAGS)


@@ -237,4 +278,89 @@ AC_DEFUN([AM_PATH_WXCONFIG],
   AC_SUBST(WX_LIBS)
   AC_SUBST(WX_LIBS_STATIC)
   AC_SUBST(WX_VERSION)
   AC_SUBST(WX_LIBS)
   AC_SUBST(WX_LIBS_STATIC)
   AC_SUBST(WX_VERSION)

+  AC_SUBST(WX_RESCOMP)
+])
+
+dnl ---------------------------------------------------------------------------
+dnl Get information on the wxrc program for making C++, Python and xrs
+dnl resource files.
+dnl
+dnl     AC_ARG_ENABLE(...)
+dnl     AC_ARG_WITH(...)
+dnl        ...
+dnl     AM_OPTIONS_WXCONFIG
+dnl        ...
+dnl     AM_PATH_WXCONFIG(2.6.0, wxWin=1)
+dnl     if test "$wxWin" != 1; then
+dnl        AC_MSG_ERROR([
+dnl                wxWidgets must be installed on your system
+dnl                but wx-config script couldn't be found.
+dnl
+dnl                Please check that wx-config is in path, the directory
+dnl                where wxWidgets libraries are installed (returned by
+dnl                'wx-config --libs' command) is in LD_LIBRARY_PATH or
+dnl                equivalent variable and wxWidgets version is 2.6.0 or above.
+dnl        ])
+dnl     fi
+dnl
+dnl     AM_PATH_WXRC([HAVE_WXRC=1], [HAVE_WXRC=0])
+dnl     if test "x$HAVE_WXRC" != x1; then
+dnl         AC_MSG_ERROR([
+dnl                The wxrc program was not installed or not found.
+dnl     
+dnl                Please check the wxWidgets installation.
+dnl         ])
+dnl     fi
+dnl
+dnl     CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+dnl     CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
+dnl     CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+dnl
+dnl     LDFLAGS="$LDFLAGS $WX_LIBS"
+dnl ---------------------------------------------------------------------------
+
+
+
+dnl ---------------------------------------------------------------------------
+dnl AM_PATH_WXRC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl
+dnl Test for wxWidgets' wxrc program for creating either C++, Python or XRS
+dnl resources.  The variable WXRC will be set and substituted in the configure
+dnl script and Makefiles.
+dnl
+dnl Example use:
+dnl   AM_PATH_WXRC([wxrc=1], [wxrc=0])
+dnl ---------------------------------------------------------------------------
+
+dnl
+dnl wxrc program from the wx-config script
+dnl
+AC_DEFUN([AM_PATH_WXRC],
+[
+  AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler])
+    
+  if test "x$WX_CONFIG_NAME" = x; then
+    AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.])
+  else
+    
+    AC_MSG_CHECKING([for wxrc])
+    
+    if test "x$WXRC" = x ; then
+      dnl wx-config --utility is a new addition to wxWidgets:
+      _WX_PRIVATE_CHECK_VERSION(2,5,3)
+      if test -n "$wx_ver_ok"; then
+        WXRC=`$WX_CONFIG_WITH_ARGS --utility=wxrc`
+      fi
+    fi
+
+    if test "x$WXRC" = x ; then
+      AC_MSG_RESULT([not found])
+      ifelse([$2], , :, [$2])
+    else
+      AC_MSG_RESULT([$WXRC])
+      ifelse([$1], , :, [$1])
+    fi
+    
+    AC_SUBST(WXRC)
+  fi

 ])
 ])