Skip to content

Commit

Permalink
Merge pull request #415 from qmfrederik/config-relative-paths-rebased
Browse files Browse the repository at this point in the history
Use absolute paths in ./configure
  • Loading branch information
rfm authored Jun 1, 2024
2 parents c6d288a + 7f12e86 commit c498475
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -2974,7 +2974,7 @@ else
fi
CROSS_CONFIG="./cross.config"
CROSS_CONFIG="$srcdir/cross.config"
if test "$cross_result" != "no"
then
if test -f "$cross_result" && test -r "$cross_result"
Expand Down Expand Up @@ -7918,7 +7918,7 @@ if ${ac_cv_sizeof_gs_mutex_t+:} false; then :
else
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (gs_mutex_t))" "ac_cv_sizeof_gs_mutex_t" "$ac_includes_default
#define GS_USE_WIN32_THREADS_AND_LOCKS 1
#include \"Source/GSPThread.h\"
#include \"$srcdir/Source/GSPThread.h\"
"; then :
else
Expand Down Expand Up @@ -7958,7 +7958,7 @@ if ${ac_cv_alignof_gs_mutex_t+:} false; then :
else
if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gs_mutex_t" "$ac_includes_default
#define GS_USE_WIN32_THREADS_AND_LOCKS 1
#include \"Source/GSPThread.h\"
#include \"$srcdir/Source/GSPThread.h\"
#ifndef offsetof
# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ AC_ARG_WITH(cross-compilation-info,
cross_result="$withval",
cross_result="no"
)
CROSS_CONFIG="./cross.config"
CROSS_CONFIG="$srcdir/cross.config"
if test "$cross_result" != "no"
then
if test -f "$cross_result" && test -r "$cross_result"
Expand Down Expand Up @@ -1873,7 +1873,7 @@ fi
if test $HAVE_WIN32_THREADS_AND_LOCKS = 1; then
AC_CHECK_SIZEOF(gs_mutex_t,,[AC_INCLUDES_DEFAULT
#define GS_USE_WIN32_THREADS_AND_LOCKS 1
#include "Source/GSPThread.h"])
#include "$srcdir/Source/GSPThread.h"])
GS_SIZEOF_MUTEX_T=$ac_cv_sizeof_gs_mutex_t
if test $ac_cv_sizeof_gs_mutex_t = 0 ; then
AC_MSG_ERROR([Unable to find size of gs_mutex_t (required).])
Expand All @@ -1882,7 +1882,7 @@ if test $HAVE_WIN32_THREADS_AND_LOCKS = 1; then

AC_CHECK_ALIGNOF(gs_mutex_t,[AC_INCLUDES_DEFAULT
#define GS_USE_WIN32_THREADS_AND_LOCKS 1
#include "Source/GSPThread.h"])
#include "$srcdir/Source/GSPThread.h"])
GS_ALIGNOF_MUTEX_T=$ac_cv_alignof_gs_mutex_t
if test $ac_cv_alignof_gs_mutex_t = 0 ; then
AC_MSG_ERROR([Unable to find align of gs_mutex_t (required).])
Expand Down

0 comments on commit c498475

Please sign in to comment.