Skip to content

W
wine-winehq
Commit daa2886c authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Updated configure to take advantage of new autoconf 2.53 features.

parent 7746e821
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 40 deletions
Makefile.in
View file @ daa2886c
......@@ -184,7 +184,7 @@ clean::
$(RM) wine
distclean: clean
$(RM) config.* TAGS Make.rules dlls/Makedll.rules programs/Makeprog.rules include/config.h include/wine/version.h
$(RM) config.* TAGS Make.rules dlls/Makedll.rules programs/Makeprog.rules include/config.h
$(RM) `find . \( -name Makefile -o -size 0 \) -print`
### Dependencies:
configure
View file @ daa2886c
This source diff could not be displayed because it is too large. You can view the blob instead.
configure.ac
View file @ daa2886c
......@@ -4,7 +4,7 @@ dnl See ChangeLog file for detailed change history.
m4_define(WINE_VERSION,regexp(m4_include(VERSION),[version \([-.0-9A-Za-z]+\)],[\1]))
AC_PREREQ(2.50)
AC_PREREQ(2.53)
AC_INIT([Wine],WINE_VERSION)
AC_CONFIG_SRCDIR(server/atom.c)
AC_CONFIG_HEADERS(include/config.h)
......@@ -160,8 +160,8 @@ then
AC_DEFINE(HAVE_LIBXXSHM, 1, [Define if you have the X Shm extension]),,
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
],
AC_MSG_WARN([[XShm extension not found, Wine will be built without it]])
)
AC_MSG_WARN([[XShm extension not found, Wine will be built without it]]),
[#include <X11/Xlib.h>])
dnl *** Check for X shape extension
AC_CHECK_HEADERS(X11/extensions/shape.h,
......@@ -170,8 +170,8 @@ then
AC_DEFINE(HAVE_LIBXSHAPE, 1, [Define if you have the X Shape extension]),,
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
],
AC_MSG_WARN([[XShape extension not found, Wine will be built without it]])
)
AC_MSG_WARN([[XShape extension not found, Wine will be built without it]]),
[#include <X11/Xlib.h>])
dnl *** Check for XFree86 DGA / DGA 2.0 extension
AC_CHECK_HEADERS(X11/extensions/xf86dga.h,
......@@ -196,8 +196,8 @@ then
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS
)
],
AC_MSG_WARN([[DGA extension not found, Wine will be built without it]])
)
AC_MSG_WARN([[DGA extension not found, Wine will be built without it]]),
[#include <X11/Xlib.h>])
dnl *** Check for XFree86 VMODE extension
AC_CHECK_HEADERS(X11/extensions/xf86vmode.h,
......@@ -209,8 +209,8 @@ then
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS
)
],
AC_MSG_WARN([[XFree86 VMODE extension not found, Wine will be built without it]])
)
AC_MSG_WARN([[XFree86 VMODE extension not found, Wine will be built without it]]),
[#include <X11/Xlib.h>])
dnl *** Check for XVideo extension supporting XvImages
AC_CHECK_HEADERS(X11/extensions/Xvlib.h,
......@@ -222,8 +222,8 @@ then
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS
)
],
AC_MSG_WARN([[XVideo extension not found, Wine will be built without it]])
)
AC_MSG_WARN([[XVideo extension not found, Wine will be built without it]]),
[#include <X11/Xlib.h>])
dnl *** Check for XRender extension
AC_CHECK_HEADERS(X11/extensions/Xrender.h,
......@@ -235,8 +235,8 @@ then
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS
)
],
AC_MSG_WARN([[XRender extension not found, Wine will be built without it]])
)
AC_MSG_WARN([[XRender extension not found, Wine will be built without it]]),
[#include <X11/Xlib.h>])
]
) dnl *** End of X11/Xlib.h check
......@@ -250,9 +250,10 @@ then
This prevents linking to OpenGL. Delete the file and restart configure.])
fi
AC_CHECK_HEADERS(GL/gl.h GL/glx.h GL/glext.h)
AC_CHECK_HEADERS(GL/gl.h GL/glx.h)
if test "$ac_cv_header_GL_gl_h" = "yes" -a "$ac_cv_header_GL_glx_h" = "yes"
then
AC_CHECK_HEADERS(GL/glext.h,,,[#include <GL/glx.h>])
dnl Check for some problems due to old Mesa versions
AC_CACHE_CHECK([for up-to-date OpenGL version], wine_cv_opengl_version_OK,
AC_TRY_COMPILE(
......@@ -1269,21 +1270,6 @@ WINE_CONFIG_EXTRA_DIR(include/wine)
WINE_CONFIG_EXTRA_DIR(programs/regapi/tests)
WINE_CONFIG_EXTRA_DIR(programs/winetest/tests)
AC_CONFIG_COMMANDS([include/wine/version.h],
[AC_MSG_NOTICE([creating include/wine/version.h])
cat >$tmp/version.h <<CEOF
/* Generated automatically by configure; DO NOT EDIT! */
#define WINE_RELEASE_INFO "Wine version $wine_version"
CEOF
if cmp -s $tmp/version.h include/wine/version.h 2>/dev/null; then
AC_MSG_NOTICE([include/wine/version.h is unchanged])
rm -f $tmp/version.h
else
rm -f include/wine/version.h
mv $tmp/version.h include/wine/version.h
fi],
[wine_version=$PACKAGE_VERSION])
MAKE_RULES=Make.rules
AC_SUBST_FILE(MAKE_RULES)
......@@ -1298,7 +1284,6 @@ Make.rules
dlls/Makedll.rules
programs/Makeprog.rules
Makefile
console/Makefile
controls/Makefile
debugger/Makefile
dlls/Makefile
......
misc/options.c
View file @ daa2886c
......@@ -26,7 +26,6 @@
#include "winnls.h"
#include "ntddk.h"
#include "wine/library.h"
#include "wine/version.h"
#include "options.h"
#include "module.h"
#include "wine/debug.h"
......@@ -92,7 +91,7 @@ static void do_help( const char *arg )
static void do_version( const char *arg )
{
MESSAGE( "%s\n", WINE_RELEASE_INFO );
MESSAGE( "%s\n", PACKAGE_STRING );
ExitProcess(0);
}
......@@ -313,7 +312,7 @@ static void inherit_options( char *buffer )
void OPTIONS_Usage(void)
{
const struct option_descr *opt;
MESSAGE( "%s\n\n", WINE_RELEASE_INFO );
MESSAGE( "%s\n\n", PACKAGE_STRING );
MESSAGE( "Usage: %s [options] [--] program_name [arguments]\n", argv0 );
MESSAGE("The -- has to be used if you specify arguments (of the program)\n\n");
MESSAGE( "Options:\n" );
......
programs/clock/main.c
View file @ daa2886c
......@@ -23,11 +23,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "config.h"
#include <stdio.h>
#include "windows.h"
#include "main.h"
#include "license.h"
#include "wine/version.h"
#include "language.h"
#include "winclock.h"
#include "commdlg.h"
......@@ -106,7 +107,7 @@ CHAR szAppRelease[MAX_STRING_LEN];
case 0x10B: {
LoadString(Globals.hInstance, 0x10C, szApp, sizeof(szApp));
lstrcpy(szAppRelease,szApp);
lstrcat(szAppRelease,"\n" WINE_RELEASE_INFO);
lstrcat(szAppRelease,"\n" PACKAGE_STRING);
ShellAbout(Globals.hMainWnd, szApp, szAppRelease, 0);
break;
}
......
programs/winver/winver.c
View file @ daa2886c
......@@ -18,12 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "config.h"
#include "windows.h"
#include "wine/version.h"
int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
{
return ShellAbout((HWND)0, "WINE", WINE_RELEASE_INFO, 0);
return ShellAbout((HWND)0, PACKAGE_NAME, PACKAGE_STRING, 0);
}
/* Local Variables: */
......
windows/nonclient.c
View file @ daa2886c
......@@ -18,10 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "config.h"
#include "windef.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "wine/version.h"
#include "win.h"
#include "user.h"
#include "dce.h"
......@@ -2178,7 +2179,7 @@ LONG NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam )
if (hmodule)
{
FARPROC aboutproc = GetProcAddress( hmodule, "ShellAboutA" );
if (aboutproc) aboutproc( hwnd, "Wine", WINE_RELEASE_INFO, 0 );
if (aboutproc) aboutproc( hwnd, PACKAGE_NAME, PACKAGE_STRING, 0 );
FreeLibrary( hmodule );
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment