ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgraded configure script to use autoconf 2.50 features, and renamed 

to configure.ac.
Changed a few things to better follow the autoconf guidelines.
This commit is contained in:
Alexandre Julliard 2002-02-14 19:47:29 +00:00
parent fb2b1c85b7
commit f5818d2f7a
18 changed files with 8871 additions and 5371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Make.rules.in
View File

@ -92,7 +92,7 @@ prog_manext = 1
conf_manext = 5 conf_manext = 5
includedir = @includedir@/wine includedir = @includedir@/wine
CLEAN_FILES = *.o *.a *.so *.ln \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ CLEAN_FILES = *.o *.a *.so *.ln \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
*.flc *.spec.c *.spec.def *.glue.c y.tab.c y.tab.h lex.yy.c core *.flc *.spec.c *.spec.def *.glue.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core
OBJS = $(SPEC_SRCS:.spec=.spec.o) $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) \ OBJS = $(SPEC_SRCS:.spec=.spec.o) $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) \
$(ASM_SRCS:.S=.o) $(GLUE:.c=.glue.o) $(EXTRA_OBJS) $(ASM_SRCS:.S=.o) $(GLUE:.c=.glue.o) $(EXTRA_OBJS)

2
Makefile.in
View File

@ -151,7 +151,7 @@ clean::
$(RM) wine $(RM) wine
distclean: clean distclean: clean
$(RM) config.* TAGS Make.rules dlls/Makedll.rules programs/Makeprog.rules include/config.h documentation/wine.man documentation/wine.conf.man tools/winelauncher $(RM) config.* TAGS Make.rules dlls/Makedll.rules programs/Makeprog.rules include/config.h include/wine/version.h
$(RM) `find . \( -name Makefile -o -size 0 \) -print` $(RM) `find . \( -name Makefile -o -size 0 \) -print`
### Dependencies: ### Dependencies:

1
VERSION Normal file
View File

@ -0,0 +1 @@
Wine version 20020122

12760
configure vendored
View File

File diff suppressed because it is too large Load Diff

373
configure.in → configure.ac
View File

@ -1,54 +1,39 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl Author: Michael Patra <micky@marie.physik.tu-berlin.de> dnl Original author: Michael Patra
dnl <patra@itp1.physik.tu-berlin.de> dnl See ChangeLog file for detailed change history.
dnl Ported to autoconf 2.5x by bero@redhat.com
AC_REVISION([configure.in 1.00]) m4_define(WINE_VERSION,regexp(m4_include(VERSION),[version \([-.0-9A-Za-z]+\)],[\1]))
AC_INIT(controls/edit.c)
AC_CONFIG_HEADER(include/config.h) AC_PREREQ(2.50)
AC_INIT([Wine],WINE_VERSION)
AC_CONFIG_SRCDIR(server/atom.c)
AC_CONFIG_HEADERS(include/config.h)
AC_CONFIG_AUX_DIR(tools) AC_CONFIG_AUX_DIR(tools)
dnl **** Command-line arguments **** dnl **** Command-line arguments ****
dnl Default values dnl Default values
LIBEXT=so # library type .so or .a LIBEXT=so # library type .so or .a
TRACE_MSGS=yes # the TRACE() macro
DEBUG_MSGS=yes # the TRACE(), WARN(), and FIXME() macros.
CURSES=yes
OPENGL=normal
AC_ARG_ENABLE(debug, AC_ARG_ENABLE(debug, AC_HELP_STRING([--disable-debug],[compile out all debugging messages]))
[ --disable-debug compile out all debugging messages], AC_ARG_ENABLE(trace, AC_HELP_STRING([--disable-trace],[compile out TRACE messages]))
[if test "$enableval" = "no"; then DEBUG_MSGS="no"; fi]) AC_ARG_ENABLE(opengl,AC_HELP_STRING([--enable-opengl],[force usage of OpenGL even if the latter is thread-safe via pthread]))
AC_ARG_WITH(curses, AC_HELP_STRING([--without-curses],[do not use curses]))
AC_ARG_ENABLE(opengl, AC_ARG_WITH(reentrant-x,AC_HELP_STRING([--without-reentrant-x],[compile for use with non-reentrant X libraries]))
[ --enable-opengl force usage of OpenGL even if the latter is thread-safe via pthread],
[if test "$enableval" = "no"; then OPENGL="no"; elif test "$enableval" = "yes"; then OPENGL="yes"; fi])
AC_ARG_ENABLE(trace,
[ --disable-trace compile out TRACE messages],
[if test "$enableval" = "no"; then TRACE_MSGS="no"; fi])
AC_ARG_WITH(curses,
[ --without-curses do not use curses],
[if test "$withval" = "no"; then CURSES="no"; fi])
AC_ARG_WITH(reentrant-x,
[ --without-reentrant-x compile for use with non-reentrant X libraries])
AC_SUBST(OPTIONS) AC_SUBST(OPTIONS)
if test "x$enable_debug" = "xno"
if test "$DEBUG_MSGS" = "no"
then then
OPTIONS="$OPTIONS -DNO_DEBUG_MSGS" AC_DEFINE(NO_DEBUG_MSGS,1,[Define to disable all debug messages.])
fi fi
if test "x$enable_trace" = "xno" -o "x$enable_debug" = "xno"
if test "$TRACE_MSGS" = "no" -o "$DEBUG_MSGS" = "no"
then then
OPTIONS="$OPTIONS -DNO_TRACE_MSGS" AC_DEFINE(NO_TRACE_MSGS,1,[Define to disable trace messages.])
fi fi
dnl **** Check for some programs **** dnl **** Check for some programs ****
AC_CANONICAL_TARGET
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PROG_CC AC_PROG_CC
AC_PROG_CPP AC_PROG_CPP
@ -61,24 +46,18 @@ dnl **** without one present.
AC_CHECK_PROGS(XYACC,$YACC bison yacc,none) AC_CHECK_PROGS(XYACC,$YACC bison yacc,none)
if test "$XYACC" = "none" if test "$XYACC" = "none"
then then
echo "*** Error: No suitable bison/yacc found. ***" AC_MSG_ERROR([no suitable bison/yacc found. Please install the 'bison' package.])
echo " Please install the 'bison' package."
exit 1
fi fi
AC_CHECK_PROGS(XLEX,$LEX flex lex,none) AC_CHECK_PROGS(XLEX,$LEX flex lex,none)
if test "$XLEX" = "none" if test "$XLEX" = "none"
then then
echo "*** Error: No suitable lex found. ***" AC_MSG_ERROR([no suitable lex found. Please install the 'flex' package.])
echo " Please install the 'flex' package."
exit 1
fi fi
AC_PROG_RANLIB AC_PROG_RANLIB
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
AC_CHECK_PROG(C2MAN,c2man,c2man,\$(TOPSRCDIR)/tools/c2man.pl) AC_CHECK_PROG(C2MAN,c2man,c2man,\$(TOPSRCDIR)/tools/c2man.pl)
AC_PATH_PROG(LDCONFIG, ldconfig, true, /sbin:/usr/sbin:$PATH) AC_PATH_PROG(LDCONFIG, ldconfig, true, /sbin:/usr/sbin:$PATH)
AC_CYGWIN
AC_CHECK_PROG(DLLWRAP,dllwrap,dllwrap,false)
dnl Check for lint dnl Check for lint
AC_CHECK_PROGS(LINT, lclint lint) AC_CHECK_PROGS(LINT, lclint lint)
@ -90,12 +69,10 @@ fi
AC_SUBST(LINT) AC_SUBST(LINT)
AC_SUBST(LINTFLAGS) AC_SUBST(LINTFLAGS)
if test "$CYGWIN" = "yes" case $host_os in
then *cygwin*) LDCOMBINE="ld -r --enable-stdcall-fixup" ;;
LDCOMBINE="ld -r --enable-stdcall-fixup" *) LDCOMBINE="ld -r" ;;
else esac
LDCOMBINE="ld -r"
fi
AC_SUBST(LDCOMBINE) AC_SUBST(LDCOMBINE)
dnl **** Check for some libraries **** dnl **** Check for some libraries ****
@ -171,7 +148,7 @@ then
AC_DEFINE(HAVE_XKB, 1, [Define if you have the XKB extension]),, AC_DEFINE(HAVE_XKB, 1, [Define if you have the XKB extension]),,
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS) $X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
], ],
AC_MSG_WARN([XKB extension not found!!]) AC_MSG_WARN([[Xkb extension not found, Wine will be built without it]])
) )
dnl *** Check for X Shm extension dnl *** Check for X Shm extension
@ -181,7 +158,7 @@ then
AC_DEFINE(HAVE_LIBXXSHM, 1, [Define if you have the X Shm extension]),, AC_DEFINE(HAVE_LIBXXSHM, 1, [Define if you have the X Shm extension]),,
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS) $X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
], ],
AC_MSG_WARN([Xshm extension not found!!]) AC_MSG_WARN([[XShm extension not found, Wine will be built without it]])
) )
dnl *** Check for X shape extension dnl *** Check for X shape extension
@ -191,7 +168,7 @@ then
AC_DEFINE(HAVE_LIBXSHAPE, 1, [Define if you have the X Shape extension]),, AC_DEFINE(HAVE_LIBXSHAPE, 1, [Define if you have the X Shape extension]),,
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS) $X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
], ],
AC_MSG_WARN([XShape extension not found!!]) AC_MSG_WARN([[XShape extension not found, Wine will be built without it]])
) )
dnl *** Check for XFree86 DGA / DGA 2.0 extension dnl *** Check for XFree86 DGA / DGA 2.0 extension
@ -217,7 +194,7 @@ then
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS $X_LIBS -lXext -lX11 $X_EXTRA_LIBS
) )
], ],
AC_MSG_WARN([DGA extension not found!!]) AC_MSG_WARN([[DGA extension not found, Wine will be built without it]])
) )
dnl *** Check for XFree86 VMODE extension dnl *** Check for XFree86 VMODE extension
@ -230,7 +207,7 @@ then
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS $X_LIBS -lXext -lX11 $X_EXTRA_LIBS
) )
], ],
AC_MSG_WARN([XFree86 VMODE extension not found!!]) AC_MSG_WARN([[XFree86 VMODE extension not found, Wine will be built without it]])
) )
dnl *** Check for XVideo extension supporting XvImages dnl *** Check for XVideo extension supporting XvImages
@ -243,7 +220,7 @@ then
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS $X_LIBS -lXext -lX11 $X_EXTRA_LIBS
) )
], ],
AC_MSG_WARN([XVideo extension not found !!]) AC_MSG_WARN([[XVideo extension not found, Wine will be built without it]])
) )
dnl *** Check for XRender extension dnl *** Check for XRender extension
@ -256,14 +233,14 @@ then
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS $X_LIBS -lXext -lX11 $X_EXTRA_LIBS
) )
], ],
AC_MSG_WARN([XRender extension not found !!]) AC_MSG_WARN([[XRender extension not found, Wine will be built without it]])
) )
] ]
) dnl *** End of X11/Xlib.h check ) dnl *** End of X11/Xlib.h check
dnl Check for the presence of OpenGL dnl Check for the presence of OpenGL
if test $OPENGL = "yes" -o $OPENGL = "normal" if test "x$enable_opengl" != "xno"
then then
if test -f /usr/X11R6/lib/libGL.a -a ! -f /usr/X11R6/lib/libGL.so if test -f /usr/X11R6/lib/libGL.a -a ! -f /usr/X11R6/lib/libGL.so
then then
@ -295,7 +272,7 @@ This prevents linking to OpenGL. Delete the file and restart configure.])
LIBS=$saved_libs] LIBS=$saved_libs]
) )
if test "$wine_cv_opengl_version_OK" = "yes" -a \( "$wine_cv_opengl_version_threadsafe" = "no" -o $OPENGL = "yes" \) if test "$wine_cv_opengl_version_OK" = "yes" -a \( "$wine_cv_opengl_version_threadsafe" = "no" -o "x$enable_opengl" = "xyes" \)
then then
dnl Check for the presence of the library dnl Check for the presence of the library
AC_CHECK_LIB(GL,glXCreateContext, AC_CHECK_LIB(GL,glXCreateContext,
@ -355,7 +332,7 @@ fi
dnl **** Check which curses lib to use *** dnl **** Check which curses lib to use ***
CURSESLIBS="" CURSESLIBS=""
if test "$CURSES" = "yes" if test "x$with_curses" != "xno"
then then
AC_CHECK_HEADERS(ncurses.h, AC_CHECK_HEADERS(ncurses.h,
[AC_CHECK_LIB(ncurses,waddch, [AC_CHECK_LIB(ncurses,waddch,
@ -732,22 +709,25 @@ then
if test "$ac_cv_c_dll_gnuelf" = "no" -a "$ac_cv_c_dll_unixware" = "no" if test "$ac_cv_c_dll_gnuelf" = "no" -a "$ac_cv_c_dll_unixware" = "no"
then then
LIBEXT="a" LIBEXT="a"
AC_CHECK_PROG(DLLWRAP,dllwrap,dllwrap,false)
if test "$DLLWRAP" = "dllwrap"; then if test "$DLLWRAP" = "dllwrap"; then
dnl FIXME - check whether dllwrap works correctly... dnl FIXME - check whether dllwrap works correctly...
if test "$CYGWIN" = "yes"; then case $host_os in
echo "*** use dllwrap for building shared library." *cygwin*)
LIBEXT="dll" LIBEXT="dll"
fi ;;
esac
fi fi
fi fi
fi fi
if test "$LIBEXT" = "a"; then if test "$LIBEXT" = "a"; then
echo "*** It is currently not possible to build WINE without shared" AC_MSG_ERROR(
echo "*** library (.so) support to allow transparent switch between .so" [could not find a way to build shared libraries.
echo "*** and .dll files." It is currently not possible to build Wine without shared library
echo "*** If you are using Linux, you will need a newer binutils." (.so) support to allow transparent switch between .so and .dll files.
exit 1 If you are using Linux, you will need a newer binutils.]
)
fi fi
DLLFLAGS="" DLLFLAGS=""
@ -955,9 +935,12 @@ AC_HEADER_STAT()
dnl **** Check for types **** dnl **** Check for types ****
AC_C_CONST() AC_C_CONST
AC_C_INLINE() AC_C_INLINE
AC_TYPE_SIZE_T() AC_TYPE_MODE_T
AC_TYPE_OFF_T
AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_CHECK_SIZEOF(long long,0) AC_CHECK_SIZEOF(long long,0)
AC_CACHE_CHECK([whether linux/input.h is for real], AC_CACHE_CHECK([whether linux/input.h is for real],
@ -1103,152 +1086,129 @@ then
fi fi
fi fi
dnl *** Check for some structure members
dnl Macro to check if a structure contains a specified member
dnl Usage: WINE_CHECK_STRUCT_MEMBER(struct,member,[includes,[action-if-found,[action-if-not-found]]])
AC_DEFUN([WINE_CHECK_STRUCT_MEMBER],
[AC_CACHE_CHECK([for $2 in struct $1], ac_cv_c_$1_$2,
AC_TRY_COMPILE([$3],[struct $1 s; s.$2 = 0],ac_cv_c_$1_$2="yes",ac_cv_c_$1_$2="no"))
AS_IF([ test "x$ac_cv_c_$1_$2" = "xyes"],[$4],[$5])
])
dnl **** FIXME: what about mixed cases, where we need two of them? *** dnl **** FIXME: what about mixed cases, where we need two of them? ***
AC_CACHE_CHECK( [for statfs.f_bfree], wine_cv_statfs_bfree, WINE_CHECK_STRUCT_MEMBER(statfs,f_bfree,
[ if test "x$statfs_bfree" = "xno" [#include <sys/types.h>
then #ifdef HAVE_SYS_PARAM_H
wine_cv_statfs_bfree=no # include <sys/param.h>
else #endif
AC_TRY_COMPILE([ #ifdef STATFS_DEFINED_BY_SYS_MOUNT
#include <sys/types.h> # include <sys/mount.h>
#ifdef HAVE_SYS_PARAM_H #else
# include <sys/param.h> # ifdef STATFS_DEFINED_BY_SYS_VFS
#endif # include <sys/vfs.h>
#ifdef STATFS_DEFINED_BY_SYS_MOUNT # else
# include <sys/mount.h> # ifdef STATFS_DEFINED_BY_SYS_STATFS
#else # include <sys/statfs.h>
# ifdef STATFS_DEFINED_BY_SYS_VFS # endif
# include <sys/vfs.h> # endif
# else #endif],
# ifdef STATFS_DEFINED_BY_SYS_STATFS [AC_DEFINE(STATFS_HAS_BFREE, 1, [Define if the struct statfs has the member bfree])])
# include <sys/statfs.h>
# endif
# endif
#endif
],[
struct statfs stfs;
stfs.f_bfree++; WINE_CHECK_STRUCT_MEMBER(statfs,f_bavail,
],wine_cv_statfs_bfree=yes,wine_cv_statfs_bfree=no [#include <sys/types.h>
) #ifdef HAVE_SYS_PARAM_H
fi ] ) # include <sys/param.h>
if test "$wine_cv_statfs_bfree" = "yes" #endif
then #ifdef STATFS_DEFINED_BY_SYS_MOUNT
AC_DEFINE(STATFS_HAS_BFREE, 1, [Define if the struct statfs has the member bfree]) # include <sys/mount.h>
fi #else
# ifdef STATFS_DEFINED_BY_SYS_VFS
# include <sys/vfs.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif],
[AC_DEFINE(STATFS_HAS_BAVAIL, 1, [Define if the struct statfs has the member bavail])])
AC_CACHE_CHECK( [for statfs.f_bavail], wine_cv_statfs_bavail, dnl Check for file descriptor passing with msg_accrights
[ if test "x$statfs_bavail" = "xno" WINE_CHECK_STRUCT_MEMBER(msghdr,msg_accrights,
then [#include <sys/types.h>
wine_cv_statfs_bavail=no #include <sys/socket.h>],
else [AC_DEFINE(HAVE_MSGHDR_ACCRIGHTS, 1, [Define if struct msghdr contains msg_accrights])])
AC_TRY_COMPILE([
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifdef STATFS_DEFINED_BY_SYS_MOUNT
# include <sys/mount.h>
#else
# ifdef STATFS_DEFINED_BY_SYS_VFS
# include <sys/vfs.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif
],[
struct statfs stfs;
stfs.f_bavail++; dnl Check for the sa_len member in struct sockaddr
],wine_cv_statfs_bavail=yes,wine_cv_statfs_bavail=no WINE_CHECK_STRUCT_MEMBER(sockaddr,sa_len,
) [#include <sys/types.h>
fi ] ) #include <sys/socket.h>],
if test "$wine_cv_statfs_bavail" = "yes" [AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [Define if struct sockaddr contains sa_len])])
then
AC_DEFINE(STATFS_HAS_BAVAIL, 1, [Define if the struct statfs has the member bavail])
fi
dnl *** check for file descriptor passing with msg_accrights dnl Check for the sun_len member in struct sockaddr_un
WINE_CHECK_STRUCT_MEMBER(sockaddr_un,sun_len,
AC_CACHE_CHECK([for msg_accrights in struct msghdr], ac_cv_c_msg_accrights, [#include <sys/types.h>
AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/socket.h>],[struct msghdr hdr; hdr.msg_accrights=0],
ac_cv_c_msg_accrights="yes", ac_cv_c_msg_accrights="no"))
if test "$ac_cv_c_msg_accrights" = "yes"
then
AC_DEFINE(HAVE_MSGHDR_ACCRIGHTS, 1, [Define if struct msghdr contains msg_accrights])
fi
dnl *** Check for the sa_len member in struct sockaddr
AC_CACHE_CHECK([for sa_len in struct sockaddr], ac_cv_c_sockaddr_sa_len,
AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
], [static struct sockaddr addr; addr.sa_len = 1], #include <sys/un.h>],
ac_cv_c_sockaddr_sa_len="yes", ac_cv_c_sockaddr_sa_len="no")) [AC_DEFINE(HAVE_SOCKADDR_SUN_LEN, 1, [Define if struct sockaddr_un contains sun_len])])
if test "$ac_cv_c_sockaddr_sa_len" = "yes"
then
AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [Define if struct sockaddr contains sa_len])
fi
dnl *** Check for the sun_len member in struct sockaddr_un
AC_CACHE_CHECK([for sun_len in struct sockaddr_un], ac_cv_c_sockaddr_sun_len,
AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>], [static struct sockaddr_un addr; addr.sun_len = 1],
ac_cv_c_sockaddr_sun_len="yes", ac_cv_c_sockaddr_sun_len="no"))
if test "$ac_cv_c_sockaddr_sun_len" = "yes"
then
AC_DEFINE(HAVE_SOCKADDR_SUN_LEN, 1, [Define if struct sockaddr_un contains sun_len])
fi
dnl *** check for the need to define __i386__ dnl *** check for the need to define __i386__
AC_CACHE_CHECK([whether we need to define __i386__],ac_cv_cpp_def_i386, case $target_cpu in
AC_EGREP_CPP(yes,[#if (defined(i386) || defined(__i386)) && !defined(__i386__) *i[3456789]86* )
AC_CACHE_CHECK([whether we need to define __i386__],ac_cv_cpp_def_i386,
AC_EGREP_CPP(yes,[#ifndef __i386__
yes yes
#endif], #endif],
ac_cv_cpp_def_i386="yes", ac_cv_cpp_def_i386="no")) ac_cv_cpp_def_i386="yes", ac_cv_cpp_def_i386="no"))
;;
esac
if test "$ac_cv_cpp_def_i386" = "yes" if test "$ac_cv_cpp_def_i386" = "yes"
then then
CFLAGS="$CFLAGS -D__i386__" CFLAGS="$CFLAGS -D__i386__"
LINTFLAGS="$LINTFLAGS -D__i386__" LINTFLAGS="$LINTFLAGS -D__i386__"
fi fi
dnl $GCC is set by autoconf
GCC_NO_BUILTIN=""
if test "$GCC" = "yes"
then
GCC_NO_BUILTIN="-fno-builtin"
fi
AC_SUBST(GCC_NO_BUILTIN)
dnl **** Generate output files **** dnl **** Generate output files ****
AC_DEFINE(__WINE_CONFIG_H, 1, dnl Macro to create non-existent directories from config.status
[This must always be defined to allow checking for config.h inclusion]) dnl Usage: WINE_CONFIG_EXTRA_DIR(dirname)
AC_DEFUN([WINE_CONFIG_EXTRA_DIR],
[AC_CONFIG_COMMANDS([$1],[test -d "$1" || (AC_MSG_NOTICE([creating $1]) && mkdir "$1")])])
AC_OUTPUT_COMMANDS([ AH_TOP([#define __WINE_CONFIG_H])
extra_subdirs="\
dlls/ddraw/d3ddevice \ WINE_CONFIG_EXTRA_DIR(dlls/ddraw/d3ddevice)
dlls/ddraw/dclipper \ WINE_CONFIG_EXTRA_DIR(dlls/ddraw/dclipper)
dlls/ddraw/ddraw \ WINE_CONFIG_EXTRA_DIR(dlls/ddraw/ddraw)
dlls/ddraw/direct3d \ WINE_CONFIG_EXTRA_DIR(dlls/ddraw/direct3d)
dlls/ddraw/dpalette \ WINE_CONFIG_EXTRA_DIR(dlls/ddraw/dpalette)
dlls/ddraw/dsurface \ WINE_CONFIG_EXTRA_DIR(dlls/ddraw/dsurface)
dlls/dinput/joystick \ WINE_CONFIG_EXTRA_DIR(dlls/dinput/joystick)
dlls/dinput/keyboard \ WINE_CONFIG_EXTRA_DIR(dlls/dinput/keyboard)
dlls/dinput/mouse \ WINE_CONFIG_EXTRA_DIR(dlls/dinput/mouse)
dlls/kernel/messages \ WINE_CONFIG_EXTRA_DIR(dlls/kernel/messages)
dlls/user/dde \ WINE_CONFIG_EXTRA_DIR(dlls/user/dde)
dlls/user/resources \ WINE_CONFIG_EXTRA_DIR(dlls/user/resources)
dlls/wineps/data \ WINE_CONFIG_EXTRA_DIR(dlls/wineps/data)
" WINE_CONFIG_EXTRA_DIR(include/wine)
for i in $extra_subdirs; do [ -d $i ] || (echo "creating $i" && mkdir $i); done ])
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 MAKE_RULES=Make.rules
AC_SUBST_FILE(MAKE_RULES) AC_SUBST_FILE(MAKE_RULES)
@ -1259,7 +1219,7 @@ AC_SUBST_FILE(MAKE_DLL_RULES)
MAKE_PROG_RULES=programs/Makeprog.rules MAKE_PROG_RULES=programs/Makeprog.rules
AC_SUBST_FILE(MAKE_PROG_RULES) AC_SUBST_FILE(MAKE_PROG_RULES)
AC_OUTPUT([ AC_CONFIG_FILES([
Make.rules Make.rules
dlls/Makedll.rules dlls/Makedll.rules
programs/Makeprog.rules programs/Makeprog.rules
@ -1351,8 +1311,6 @@ dlls/wow32/Makefile
dlls/wsock32/Makefile dlls/wsock32/Makefile
dlls/x11drv/Makefile dlls/x11drv/Makefile
documentation/Makefile documentation/Makefile
documentation/wine.conf.man
documentation/wine.man
files/Makefile files/Makefile
graphics/Makefile graphics/Makefile
graphics/enhmetafiledrv/Makefile graphics/enhmetafiledrv/Makefile
@ -1396,7 +1354,6 @@ tools/Makefile
tools/winapi/Makefile tools/winapi/Makefile
tools/winebuild/Makefile tools/winebuild/Makefile
tools/winedump/Makefile tools/winedump/Makefile
tools/winelauncher
tools/wmc/Makefile tools/wmc/Makefile
tools/wrc/Makefile tools/wrc/Makefile
tsx11/Makefile tsx11/Makefile
@ -1405,6 +1362,8 @@ win32/Makefile
windows/Makefile windows/Makefile
windows/x11drv/Makefile ]) windows/x11drv/Makefile ])
AC_OUTPUT
if test "$have_x" = "no" if test "$have_x" = "no"
then then
echo echo
@ -1424,8 +1383,8 @@ fi
if test "$wine_cv_libc_reentrant" = "no" if test "$wine_cv_libc_reentrant" = "no"
then then
echo echo
echo "*** Warning: non-reentrant libc detected. Wine will be build without" echo "*** Warning: non-reentrant libc detected. Wine will be built without"
echo "*** thread support. Consider upgrading libc to a more recent" echo "*** threading support. Consider upgrading libc to a more recent"
echo "*** reentrant version of libc." echo "*** reentrant version of libc."
fi fi
@ -1436,7 +1395,7 @@ then
echo "*** support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)." echo "*** support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)."
fi fi
if test "$wine_cv_opengl_version_threadsafe" = "yes" -a $OPENGL = "normal" if test "$wine_cv_opengl_version_threadsafe" = "yes" -a "x$enable_opengl" = "x"
then then
echo echo
echo "*** Warning: the OpenGL version you have installed relies on libpthread for" echo "*** Warning: the OpenGL version you have installed relies on libpthread for"
@ -1445,7 +1404,7 @@ then
echo "*** start configure with '--enable-opengl' to force OpenGL support." echo "*** start configure with '--enable-opengl' to force OpenGL support."
fi fi
if test "$wine_cv_opengl_version_threadsafe" = "yes" -a $OPENGL = "yes" if test "$wine_cv_opengl_version_threadsafe" = "yes" -a "x$enable_opengl" = "xyes"
then then
echo echo
echo "*** Warning: you explicitly linked in a thread-safe OpenGL version. If you" echo "*** Warning: you explicitly linked in a thread-safe OpenGL version. If you"
@ -1458,18 +1417,16 @@ then
echo echo
echo "*** Note: You have cups runtime libraries, but no development" echo "*** Note: You have cups runtime libraries, but no development"
echo "*** libraries. Install the cups-devel package or whichever package" echo "*** libraries. Install the cups-devel package or whichever package"
echo "*** contains cups.h to enable CUPS support in WINE." echo "*** contains cups.h to enable CUPS support in Wine."
fi fi
if test "$wine_cv_msg_freetype" = "yes" if test "$wine_cv_msg_freetype" = "yes"
then then
echo echo
echo "*** Note: Your system appears to have the FreeType 2 runtime libraries" echo "*** Note: Your system appears to have the FreeType 2 runtime libraries"
echo "*** installed, but either 'freetype-config' is not in your PATH," echo "*** installed, but 'freetype-config' is not in your PATH. Install the"
echo "*** you do not have the FreeType include files or you have a version" echo "*** freetype-devel package (or its equivalent on your distribution) to"
echo "*** of FreeType lower than 2.0.3. Install the freetype-devel package" echo "*** enable Wine to use TrueType fonts."
echo "*** (or its equivalent on your distribution) to enable Wine to use"
echo "*** TrueType fonts."
fi fi
echo echo

4
debugger/Makefile.in
View File

@ -24,14 +24,14 @@ C_SRCS = \
winedbg.c winedbg.c
EXTRA_SRCS = dbg.y debug.l EXTRA_SRCS = dbg.y debug.l
EXTRA_OBJS = y.tab.o lex.yy.o EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o
@MAKE_PROG_RULES@ @MAKE_PROG_RULES@
y.tab.c y.tab.h: dbg.y y.tab.c y.tab.h: dbg.y
$(YACC) -d -t $(SRCDIR)/dbg.y $(YACC) -d -t $(SRCDIR)/dbg.y
lex.yy.c: debug.l @LEX_OUTPUT_ROOT@.c: debug.l
$(LEX) -8 -I $(SRCDIR)/debug.l $(LEX) -8 -I $(SRCDIR)/debug.l
### Dependencies: ### Dependencies:

1
documentation/.cvsignore
View File

@ -10,5 +10,4 @@ wine-doc
wine-doc.pdf wine-doc.pdf
wine-doc.ps wine-doc.ps
wine-doc.rtf wine-doc.rtf
wine.conf.man
wine.man wine.man

15
documentation/Makefile.in
View File

@ -44,12 +44,14 @@ BOOK_SRCS = \
winelib-toolkit.sgml \ winelib-toolkit.sgml \
winelib-user.sgml winelib-user.sgml
MAN_TARGETS = wine.man
BOOK_TARGETS = \ BOOK_TARGETS = \
$(BOOKNAME)/index.html \ $(BOOKNAME)/index.html \
$(BOOKNAME).pdf \ $(BOOKNAME).pdf \
$(BOOKNAME).ps $(BOOKNAME).ps
all: $(BOOK_TARGETS) all: $(MAN_TARGETS) $(BOOK_TARGETS)
@MAKE_RULES@ @MAKE_RULES@
@ -62,14 +64,15 @@ $(BOOKNAME).pdf: $(BOOK_SRCS)
$(BOOKNAME).ps: $(BOOK_SRCS) $(BOOKNAME).ps: $(BOOK_SRCS)
db2ps $(BOOKNAME).sgml > /dev/null db2ps $(BOOKNAME).sgml > /dev/null
install:: wine.man: wine.man.in
sed -e 's,@bindir\@,$(bindir),g' -e 's,@libdir\@,$(libdir),g' $(SRCDIR)/wine.man.in >wine.man
install:: $(MAN_TARGETS)
$(INSTALL) -d $(mandir)/man$(prog_manext) $(INSTALL) -d $(mandir)/man$(prog_manext)
$(INSTALL) -d $(mandir)/man$(conf_manext) $(INSTALL) -d $(mandir)/man$(conf_manext)
sed -e 's|$${prefix}|$(prefix)|g' < wine.man > wine.man.tmp && mv wine.man.tmp wine.man
$(INSTALL_DATA) wine.man $(mandir)/man$(prog_manext)/wine.$(prog_manext) $(INSTALL_DATA) wine.man $(mandir)/man$(prog_manext)/wine.$(prog_manext)
$(INSTALL_DATA) $(SRCDIR)/winemaker.man $(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(INSTALL_DATA) $(SRCDIR)/winemaker.man $(mandir)/man$(prog_manext)/winemaker.$(prog_manext)
sed -e 's|$${prefix}|$(prefix)|g' < wine.conf.man > wine.conf.man.tmp && mv wine.conf.man.tmp wine.conf.man $(INSTALL_DATA) $(SRCDIR)/wine.conf.man $(mandir)/man$(conf_manext)/wine.conf.$(conf_manext)
$(INSTALL_DATA) wine.conf.man $(mandir)/man$(conf_manext)/wine.conf.$(conf_manext)
uninstall:: uninstall::
$(RM) $(mandir)/man$(prog_manext)/wine.$(prog_manext) $(RM) $(mandir)/man$(prog_manext)/wine.$(prog_manext)
@ -77,7 +80,7 @@ uninstall::
$(RM) $(mandir)/man$(conf_manext)/wine.conf.$(conf_manext) $(RM) $(mandir)/man$(conf_manext)/wine.conf.$(conf_manext)
clean:: clean::
$(RM) *.aux *.dvi *.out *.pdf *.ps *.tex *.log $(BOOKNAME).pdf $(BOOKNAME).ps $(RM) *.aux *.dvi *.out *.pdf *.ps *.tex *.log $(BOOKNAME).pdf $(BOOKNAME).ps $(MAN_TARGETS)
$(RM) -r $(BOOKNAME) html man3w *.junk DBTOHTML_OUTPUT_DIR* $(RM) -r $(BOOKNAME) html man3w *.junk DBTOHTML_OUTPUT_DIR*
### Dependencies: ### Dependencies:

0
documentation/wine.conf.man.in → documentation/wine.conf.man
View File

15
documentation/wine.man.in
View File

@ -357,35 +357,32 @@ development, you might want to subscribe to the
.SH FILES .SH FILES
.PD 0 .PD 0
.TP .TP
.I @prefix@/bin/wine .I @bindir@/wine
The The
.B wine .B wine
program loader. program loader.
.TP .TP
.I @prefix@/bin/wineconsole .I @bindir@/wineconsole
The The
.B wine .B wine
program loader for CUI (console) applications. program loader for CUI (console) applications.
.TP .TP
.I @prefix@/bin/dosmod .I @bindir@/wineserver
The DOS program loader.
.TP
.I @prefix@/bin/wineserver
The The
.B wine .B wine
server server
.TP .TP
.I @prefix@/bin/winedbg .I @bindir@/winedbg
The The
.B wine .B wine
debugger debugger
.TP .TP
.I @prefix@/bin/wineclpsrv .I @bindir@/wineclpsrv
The The
.B wine .B wine
clipboard server clipboard server
.TP .TP
.I @prefix@/lib/ .I @libdir@
Directory containing Directory containing
.B wine's .B wine's
shared libraries shared libraries

1042
include/config.h.in
View File

File diff suppressed because it is too large Load Diff

1
include/version.h
View File

@ -1 +0,0 @@
#define WINE_RELEASE_INFO "Wine release 20020122"

1
include/wine/.cvsignore Normal file
View File

@ -0,0 +1 @@
version.h

4
programs/winhelp/Makefile.in
View File

@ -13,7 +13,7 @@ C_SRCS = \
string.c string.c
EXTRA_SRCS = macro.yacc.y macro.lex.l EXTRA_SRCS = macro.yacc.y macro.lex.l
EXTRA_OBJS = y.tab.o lex.yy.o EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o
RC_SRCS = rsrc.rc RC_SRCS = rsrc.rc
@ -33,7 +33,7 @@ uninstall::
y.tab.c y.tab.h: macro.yacc.y y.tab.c y.tab.h: macro.yacc.y
$(YACC) -d -t $(SRCDIR)/macro.yacc.y $(YACC) -d -t $(SRCDIR)/macro.yacc.y
lex.yy.c: macro.lex.l @LEX_OUTPUT_ROOT@.c: macro.lex.l
$(LEX) -8 -i $(SRCDIR)/macro.lex.l $(LEX) -8 -i $(SRCDIR)/macro.lex.l
### Dependencies: ### Dependencies:

7
tools/Makefile.in
View File

@ -1,10 +1,10 @@
DEFS = -D__WINE__ DEFS = -D__WINE__ -DLEX_OUTPUT_ROOT="\"@LEX_OUTPUT_ROOT@\""
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = .. TOPOBJDIR = ..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
PROGRAMS = makedep fnt2bdf bin2res PROGRAMS = makedep fnt2bdf bin2res winelauncher
MODULE = none MODULE = none
C_SRCS = makedep.c fnt2bdf.c bin2res.c C_SRCS = makedep.c fnt2bdf.c bin2res.c
@ -40,6 +40,9 @@ fnt2bdf: fnt2bdf.o
bin2res: bin2res.o bin2res: bin2res.o
$(CC) $(CFLAGS) -o bin2res bin2res.o $(CC) $(CFLAGS) -o bin2res bin2res.o
winelauncher: winelauncher.in
sed -e 's,@bindir\@,$(bindir),g' -e 's,@libdir\@,$(libdir),g' $(SRCDIR)/winelauncher.in >winelauncher
install:: $(PROGRAMS) $(INSTALLSUBDIRS:%=%/__install__) install:: $(PROGRAMS) $(INSTALLSUBDIRS:%=%/__install__)
[ -d $(bindir) ] || $(MKDIR) $(bindir) [ -d $(bindir) ] || $(MKDIR) $(bindir)
$(INSTALL_PROGRAM) fnt2bdf $(bindir)/fnt2bdf $(INSTALL_PROGRAM) fnt2bdf $(bindir)/fnt2bdf

2
tools/makedep.c
View File

@ -324,7 +324,7 @@ static void output_src( FILE *file, INCL_FILE *pFile, int *column )
} }
else if (!strcmp( ext, "l" )) /* lex file */ else if (!strcmp( ext, "l" )) /* lex file */
{ {
*column += fprintf( file, "lex.yy.o: lex.yy.c" ); *column += fprintf( file, "%s.o: %s.c", LEX_OUTPUT_ROOT, LEX_OUTPUT_ROOT );
} }
else if (!strcmp( ext, "rc" )) /* resource file */ else if (!strcmp( ext, "rc" )) /* resource file */
{ {

8
tools/winelauncher.in
View File

@ -19,14 +19,8 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Primary configuration area - change this if you installed Wine to # Primary configuration area - change this if you installed Wine to
# a location other than @prefix@ # a different location
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
prefix=@prefix@
#------------------------------------------------------------------------------
# Secondary configuration area; change these at your own risk.
#------------------------------------------------------------------------------
exec_prefix=@exec_prefix@
WINEBIN=@bindir@ WINEBIN=@bindir@
WINELIB=@libdir@ WINELIB=@libdir@
WINESERVER= WINESERVER=

4
tools/wrc/Makefile.in
View File

@ -21,7 +21,7 @@ C_SRCS = \
GEN_C_SRCS = ppy.tab.c lex.ppl.c GEN_C_SRCS = ppy.tab.c lex.ppl.c
EXTRA_SRCS = parser.y parser.l EXTRA_SRCS = parser.y parser.l
EXTRA_OBJS = y.tab.o lex.yy.o EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o
all: $(PROGRAMS) all: $(PROGRAMS)
@ -39,7 +39,7 @@ y.tab.c y.tab.h: parser.y
ppy.tab.c ppy.tab.h: ppy.y ppy.tab.c ppy.tab.h: ppy.y
$(YACC) $(YACCOPT) -bppy -ppp -d -t $(SRCDIR)/ppy.y $(YACC) $(YACCOPT) -bppy -ppp -d -t $(SRCDIR)/ppy.y
lex.yy.c: parser.l @LEX_OUTPUT_ROOT@.c: parser.l
$(LEX) $(LEXOPT) -d -8 $(SRCDIR)/parser.l $(LEX) $(LEXOPT) -d -8 $(SRCDIR)/parser.l
lex.ppl.c: ppl.l lex.ppl.c: ppl.l