/[winpt]/trunk/configure.ac
ViewVC logotype

Diff of /trunk/configure.ac

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 126 by twoaday, Fri Dec 16 12:57:17 2005 UTC revision 214 by twoaday, Sun May 14 18:40:36 2006 UTC
# Line 15  min_automake_version="1.9.4" Line 15  min_automake_version="1.9.4"
15    
16  # Version number: Remember to change it immediately *after* a release.  # Version number: Remember to change it immediately *after* a release.
17  #                 Add a "-cvs" prefix for non-released code.  #                 Add a "-cvs" prefix for non-released code.
18  AC_INIT(WinPT, 0.11.4-cvs, http://www.winpt.org)  AC_INIT(WinPT, 0.12.1, http://www.winpt.org)
19    NEED_GPG_VERSION=1.4.2
20  NEED_GPGME_API=1  NEED_GPGME_API=1
21  NEED_GPGME_VERSION=1.1.0  NEED_GPGME_VERSION=1.1.1
22  NEED_GPG_ERROR_VERSION=1.2  NEED_GPG_ERROR_VERSION=1.2
23    
24  PACKAGE=$PACKAGE_NAME  PACKAGE=$PACKAGE_NAME
# Line 29  AC_CONFIG_SRCDIR(Src/WinPT.cpp) Line 29  AC_CONFIG_SRCDIR(Src/WinPT.cpp)
29  AM_CONFIG_HEADER(config.h)  AM_CONFIG_HEADER(config.h)
30  AC_CANONICAL_TARGET()  AC_CANONICAL_TARGET()
31  AM_INIT_AUTOMAKE  AM_INIT_AUTOMAKE
32    AM_MKINSTALLDIRS
33    
34  AC_GNU_SOURCE  AC_GNU_SOURCE
35    
# Line 43  AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$ Line 44  AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$
44                                          [Bug report address])                                          [Bug report address])
45  AC_DEFINE_UNQUOTED(NEED_GPGME_VERSION, "$NEED_GPGME_VERSION",  AC_DEFINE_UNQUOTED(NEED_GPGME_VERSION, "$NEED_GPGME_VERSION",
46                                         [Required version of GPGME])                                         [Required version of GPGME])
47    AC_DEFINE_UNQUOTED(NEED_GPG_VERSION, "$NEED_GPG_VERSION",
48                                         [Required version of GnuPG])
49    
50  BUILD_TIMESTAMP=`date --iso-8601=minutes`  BUILD_TIMESTAMP=`date --iso-8601=minutes`
51  AC_SUBST(BUILD_TIMESTAMP)  AC_SUBST(BUILD_TIMESTAMP)
# Line 66  AC_SUBST(W32ROOT) Line 69  AC_SUBST(W32ROOT)
69  AH_BOTTOM([  AH_BOTTOM([
70  /* Some global constants. */  /* Some global constants. */
71    
 /* Set to distinguish between the old custom Makefile based build  
    system and our new automake based one.  This is only required in  
    Include/wptVersion.h.  Fixme: See whether we may define the constants  
    there by means of command line apssed args or similar.  */  
 #define WINPT_MODERN_BUILD 1  
   
72  /* We need to include this header to be able to include specific parts  /* We need to include this header to be able to include specific parts
73     of the header files.  For now we require at least Internet Exploder     of the header files.  For now we require at least Internet Exploder
74     4.01 to be installed. */     4.01 to be installed. */
75  #include <w32api.h>  #include <w32api.h>
76  #define _WIN32_IE IE401  #define _WIN32_IE IE401
   
77  ])  ])
78    
79  AM_MAINTAINER_MODE  AM_MAINTAINER_MODE
# Line 103  AC_CHECK_TOOL(AR, ar, :) Line 99  AC_CHECK_TOOL(AR, ar, :)
99  AC_CHECK_TOOL(DLLTOOL, dlltool, :)  AC_CHECK_TOOL(DLLTOOL, dlltool, :)
100  AC_CHECK_TOOL(WINDRES, windres, :)  AC_CHECK_TOOL(WINDRES, windres, :)
101    
   
102  try_gettext=yes  try_gettext=yes
103  have_dosish_system=no  have_dosish_system=no
104  have_w32_system=no  have_w32_system=no
# Line 145  AH_BOTTOM([ Line 140  AH_BOTTOM([
140  # Note, that autogen.sh greps for the next line.  # Note, that autogen.sh greps for the next line.
141  AM_GNU_GETTEXT_VERSION(0.12.1)  AM_GNU_GETTEXT_VERSION(0.12.1)
142  AM_GNU_GETTEXT([external])  AM_GNU_GETTEXT([external])
143    # There is something wrong with the NLS checking here.  We force using it.
144    USE_NLS=yes
145    
146  if test "$have_dosish_system" = yes; then  if test "$have_dosish_system" = yes; then
147     AC_DEFINE(HAVE_DOSISH_SYSTEM,1,     AC_DEFINE(HAVE_DOSISH_SYSTEM,1,
# Line 189  AM_CONDITIONAL(CROSS_COMPILING, test x$c Line 185  AM_CONDITIONAL(CROSS_COMPILING, test x$c
185  # Add some extra libs here so that previous tests don't fail for  # Add some extra libs here so that previous tests don't fail for
186  # mysterious reasons - the final link step should bail out.  # mysterious reasons - the final link step should bail out.
187  if test "$have_w32_system" = yes; then  if test "$have_w32_system" = yes; then
188     W32LIBS="-lwsock32"     W32LIBS="-lws2_32"
189  fi  fi
190    
191  if test "$GCC" = yes; then  if test "$GCC" = yes; then
# Line 243  fi Line 239  fi
239    
240  AC_CONFIG_FILES([ Makefile  AC_CONFIG_FILES([ Makefile
241  PTD/Makefile  PTD/Makefile
242  PTD/versioninfo.rc          PTD/versioninfo.rc
243  Src/Makefile  Src/Makefile
244  Src/versioninfo.rc          Src/versioninfo.rc
245  Include/Makefile  Include/Makefile
 Ico/Makefile  
246  icons/Makefile  icons/Makefile
247  m4/Makefile  m4/Makefile
248  Gnupg/Makefile  Gnupg/Makefile
Legend:
Removed from v.126  
changed lines
  Added in v.214
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26