Hopefully fix broken autoconfs.
This commit is contained in:
parent
7d63933239
commit
adcd591b69
20
configure.in
20
configure.in
|
@ -70,15 +70,15 @@ AC_ARG_ENABLE(debug,
|
||||||
, enable_debug=yes)
|
, enable_debug=yes)
|
||||||
if test x$enable_debug = xyes; then
|
if test x$enable_debug = xyes; then
|
||||||
if test x$ac_cv_prog_cc_g = xyes; then
|
if test x$ac_cv_prog_cc_g = xyes; then
|
||||||
CFLAGS="-g -O0"
|
PHYSFSCFLAGS="-g -O0"
|
||||||
else
|
else
|
||||||
CFLAGS="-O0"
|
PHYSFSCFLAGS="-O0"
|
||||||
fi
|
fi
|
||||||
CFLAGS="$CFLAGS -Werror -Wall"
|
PHYSFSCFLAGS="$PHYSFSCFLAGS -Werror -Wall"
|
||||||
AC_DEFINE([DEBUG], 1, [define if debug build is enabled])
|
AC_DEFINE([DEBUG], 1, [define if debug build is enabled])
|
||||||
AC_DEFINE([DEBUG_CHATTER], 1, [define if debug chatter is enabled])
|
AC_DEFINE([DEBUG_CHATTER], 1, [define if debug chatter is enabled])
|
||||||
else
|
else
|
||||||
CFLAGS="-O2"
|
PHYSFSCFLAGS="-O2"
|
||||||
AC_DEFINE([NDEBUG], 1, [define if debug build is disabled])
|
AC_DEFINE([NDEBUG], 1, [define if debug build is disabled])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -325,7 +325,7 @@ AC_MSG_RESULT([$this_is_beos])
|
||||||
AC_MSG_CHECKING([if this is Cygwin])
|
AC_MSG_CHECKING([if this is Cygwin])
|
||||||
if test x$build_os = xcygwin; then
|
if test x$build_os = xcygwin; then
|
||||||
this_is_cygwin=yes
|
this_is_cygwin=yes
|
||||||
CFLAGS="$CFLAGS -DWIN32"
|
PHYSFSCFLAGS="$PHYSFSCFLAGS -DWIN32"
|
||||||
enable_pthreads=no
|
enable_pthreads=no
|
||||||
have_non_posix_threads=yes
|
have_non_posix_threads=yes
|
||||||
else
|
else
|
||||||
|
@ -351,7 +351,7 @@ if test x$we_have_sed = xyes; then
|
||||||
x=`echo $build_os |tr A-Z a-z |sed "s/.*freebsd.*/freebsd/"`
|
x=`echo $build_os |tr A-Z a-z |sed "s/.*freebsd.*/freebsd/"`
|
||||||
if test x$x = xfreebsd; then
|
if test x$x = xfreebsd; then
|
||||||
this_is_freebsd=yes
|
this_is_freebsd=yes
|
||||||
LDFLAGS="$LDFLAGS -pthread"
|
PHYSFSLDFLAGS="$PHYSFSLDFLAGS -pthread"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_MSG_RESULT([$this_is_freebsd])
|
AC_MSG_RESULT([$this_is_freebsd])
|
||||||
|
@ -363,7 +363,7 @@ if test x$we_have_sed = xyes; then
|
||||||
x=`echo $build_os |tr A-Z a-z |sed "s/.*openbsd.*/openbsd/"`
|
x=`echo $build_os |tr A-Z a-z |sed "s/.*openbsd.*/openbsd/"`
|
||||||
if test x$x = xopenbsd; then
|
if test x$x = xopenbsd; then
|
||||||
this_is_openbsd=yes
|
this_is_openbsd=yes
|
||||||
LDFLAGS="$LDFLAGS -pthread"
|
PHYSFSLDFLAGS="$PHYSFSLDFLAGS -pthread"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_MSG_RESULT([$this_is_openbsd])
|
AC_MSG_RESULT([$this_is_openbsd])
|
||||||
|
@ -388,7 +388,7 @@ if test x$we_have_sed = xyes; then
|
||||||
x=`echo $build_os |tr A-Z a-z |sed "s/.*os2.*/os2/"`
|
x=`echo $build_os |tr A-Z a-z |sed "s/.*os2.*/os2/"`
|
||||||
if test x$x = xos2; then
|
if test x$x = xos2; then
|
||||||
this_is_os2=yes
|
this_is_os2=yes
|
||||||
CFLAGS="$CFLAGS -DOS2"
|
PHYSFSCFLAGS="$PHYSFSCFLAGS -DOS2"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_MSG_RESULT([$this_is_os2])
|
AC_MSG_RESULT([$this_is_os2])
|
||||||
|
@ -440,8 +440,8 @@ AC_CHECK_FUNCS([memset strrchr])
|
||||||
|
|
||||||
AC_CHECK_SIZEOF(int, 4)
|
AC_CHECK_SIZEOF(int, 4)
|
||||||
|
|
||||||
CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE"
|
CFLAGS="$CFLAGS $PHYSFSCFLAGS -D_REENTRANT -D_THREAD_SAFE"
|
||||||
LDFLAGS="$LDFLAGS -no-undefined"
|
LDFLAGS="$LDFLAGS $PHYSFSLDFLAGS -no-undefined"
|
||||||
|
|
||||||
dnl Add Makefile conditionals
|
dnl Add Makefile conditionals
|
||||||
AM_CONDITIONAL(BUILD_ZLIB, test x$enable_internal_zlib = xyes)
|
AM_CONDITIONAL(BUILD_ZLIB, test x$enable_internal_zlib = xyes)
|
||||||
|
|
Loading…
Reference in New Issue