Fixed configure script.
authorRyan C. Gordon <icculus@icculus.org>
Tue, 02 May 2017 11:16:58 -0400
changeset 10984fb6d770b08f9
parent 10983 9f9160df4f1f
child 10985 f6970c9a4434
Fixed configure script.

The Haiku patch would define some HAVE_* things to /**/ instead of 1, breaking
the build for various things.
configure
configure.in
     1.1 --- a/configure	Mon May 01 18:39:05 2017 -0400
     1.2 +++ b/configure	Tue May 02 11:16:58 2017 -0400
     1.3 @@ -745,6 +745,7 @@
     1.4  docdir
     1.5  oldincludedir
     1.6  includedir
     1.7 +runstatedir
     1.8  localstatedir
     1.9  sharedstatedir
    1.10  sysconfdir
    1.11 @@ -916,6 +917,7 @@
    1.12  sysconfdir='${prefix}/etc'
    1.13  sharedstatedir='${prefix}/com'
    1.14  localstatedir='${prefix}/var'
    1.15 +runstatedir='${localstatedir}/run'
    1.16  includedir='${prefix}/include'
    1.17  oldincludedir='/usr/include'
    1.18  docdir='${datarootdir}/doc/${PACKAGE}'
    1.19 @@ -1168,6 +1170,15 @@
    1.20    | -silent | --silent | --silen | --sile | --sil)
    1.21      silent=yes ;;
    1.22  
    1.23 +  -runstatedir | --runstatedir | --runstatedi | --runstated \
    1.24 +  | --runstate | --runstat | --runsta | --runst | --runs \
    1.25 +  | --run | --ru | --r)
    1.26 +    ac_prev=runstatedir ;;
    1.27 +  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
    1.28 +  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
    1.29 +  | --run=* | --ru=* | --r=*)
    1.30 +    runstatedir=$ac_optarg ;;
    1.31 +
    1.32    -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
    1.33      ac_prev=sbindir ;;
    1.34    -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
    1.35 @@ -1305,7 +1316,7 @@
    1.36  for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
    1.37  		datadir sysconfdir sharedstatedir localstatedir includedir \
    1.38  		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
    1.39 -		libdir localedir mandir
    1.40 +		libdir localedir mandir runstatedir
    1.41  do
    1.42    eval ac_val=\$$ac_var
    1.43    # Remove trailing slashes.
    1.44 @@ -1458,6 +1469,7 @@
    1.45    --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
    1.46    --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
    1.47    --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
    1.48 +  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
    1.49    --libdir=DIR            object code libraries [EPREFIX/lib]
    1.50    --includedir=DIR        C header files [PREFIX/include]
    1.51    --oldincludedir=DIR     C header files for non-gcc [/usr/include]
    1.52 @@ -16745,7 +16757,7 @@
    1.53  "
    1.54  if test "x$ac_cv_member_struct_sigaction_sa_sigaction" = xyes; then :
    1.55  
    1.56 -$as_echo "#define HAVE_SA_SIGACTION /**/" >>confdefs.h
    1.57 +$as_echo "#define HAVE_SA_SIGACTION 1" >>confdefs.h
    1.58  
    1.59  fi
    1.60  
    1.61 @@ -19305,9 +19317,11 @@
    1.62  _ACEOF
    1.63  if ac_fn_c_try_compile "$LINENO"; then :
    1.64  
    1.65 -        $as_echo "#define SDL_VIDEO_DRIVER_NACL 1" >>confdefs.h
    1.66 -
    1.67 -        $as_echo "#define SDL_AUDIO_DRIVER_NACL 1" >>confdefs.h
    1.68 +
    1.69 +$as_echo "#define SDL_VIDEO_DRIVER_NACL 1" >>confdefs.h
    1.70 +
    1.71 +
    1.72 +$as_echo "#define SDL_AUDIO_DRIVER_NACL 1" >>confdefs.h
    1.73  
    1.74  
    1.75  $as_echo "#define HAVE_POW 1" >>confdefs.h
    1.76 @@ -20175,7 +20189,7 @@
    1.77  
    1.78              have_const_param_XextAddDisplay=yes
    1.79  
    1.80 -$as_echo "#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY /**/" >>confdefs.h
    1.81 +$as_echo "#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY 1" >>confdefs.h
    1.82  
    1.83  
    1.84  fi
    1.85 @@ -20210,7 +20224,7 @@
    1.86  
    1.87                  have_XGenericEvent=yes
    1.88  
    1.89 -$as_echo "#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS /**/" >>confdefs.h
    1.90 +$as_echo "#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1" >>confdefs.h
    1.91  
    1.92  
    1.93  fi
    1.94 @@ -22283,7 +22297,7 @@
    1.95  
    1.96                  have_sem_timedwait=yes
    1.97  
    1.98 -$as_echo "#define HAVE_SEM_TIMEDWAIT /**/" >>confdefs.h
    1.99 +$as_echo "#define HAVE_SEM_TIMEDWAIT 1" >>confdefs.h
   1.100  
   1.101  
   1.102  fi
   1.103 @@ -23864,7 +23878,8 @@
   1.104  
   1.105          # Set up files for the timer library
   1.106          if test x$enable_timers = xyes; then
   1.107 -            $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
   1.108 +
   1.109 +$as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
   1.110  
   1.111              SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
   1.112              have_timers=yes
     2.1 --- a/configure.in	Mon May 01 18:39:05 2017 -0400
     2.2 +++ b/configure.in	Tue May 02 11:16:58 2017 -0400
     2.3 @@ -276,7 +276,7 @@
     2.4      AC_CHECK_LIB(iconv, iconv_open, [LIBS="$LIBS -liconv"; EXTRA_LDFLAGS="$EXTRA_LDFLAGS -liconv"])
     2.5      AC_CHECK_FUNCS(iconv)
     2.6  
     2.7 -    AC_CHECK_MEMBER(struct sigaction.sa_sigaction,[AC_DEFINE([HAVE_SA_SIGACTION], [], [Description])], ,[#include <signal.h>])
     2.8 +    AC_CHECK_MEMBER(struct sigaction.sa_sigaction,[AC_DEFINE([HAVE_SA_SIGACTION], 1, [Description])], ,[#include <signal.h>])
     2.9  fi
    2.10  
    2.11  dnl AC_CHECK_SIZEOF(void*)
    2.12 @@ -1479,8 +1479,8 @@
    2.13            #endif
    2.14          ],[
    2.15          ],[
    2.16 -        AC_DEFINE(SDL_VIDEO_DRIVER_NACL)
    2.17 -        AC_DEFINE(SDL_AUDIO_DRIVER_NACL)
    2.18 +        AC_DEFINE(SDL_VIDEO_DRIVER_NACL, 1, [ ])
    2.19 +        AC_DEFINE(SDL_AUDIO_DRIVER_NACL, 1, [ ])
    2.20          AC_DEFINE(HAVE_POW, 1, [ ])
    2.21          AC_DEFINE(HAVE_OPENGLES2, 1, [ ])
    2.22          AC_DEFINE(SDL_VIDEO_OPENGL_ES2, 1, [ ])
    2.23 @@ -1619,7 +1619,7 @@
    2.24              ],[
    2.25              ],[
    2.26              have_const_param_XextAddDisplay=yes
    2.27 -            AC_DEFINE([SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY], [], [Description])
    2.28 +            AC_DEFINE([SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY], 1, [ ])
    2.29              ])
    2.30              AC_MSG_RESULT($have_const_param_XextAddDisplay)
    2.31  
    2.32 @@ -1637,7 +1637,7 @@
    2.33  XFreeEventData(display, cookie);
    2.34              ],[
    2.35                  have_XGenericEvent=yes
    2.36 -                AC_DEFINE([SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS], [], [Description])
    2.37 +                AC_DEFINE([SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS], 1, [ ])
    2.38              ])
    2.39              AC_MSG_RESULT($have_XGenericEvent)
    2.40  
    2.41 @@ -2605,7 +2605,7 @@
    2.42                    sem_timedwait(NULL, NULL);
    2.43                  ],[
    2.44                  have_sem_timedwait=yes
    2.45 -                AC_DEFINE([HAVE_SEM_TIMEDWAIT], [], [Description])
    2.46 +                AC_DEFINE([HAVE_SEM_TIMEDWAIT], 1, [ ])
    2.47                  ])
    2.48                  AC_MSG_RESULT($have_sem_timedwait)
    2.49              fi
    2.50 @@ -3502,7 +3502,7 @@
    2.51          
    2.52          # Set up files for the timer library
    2.53          if test x$enable_timers = xyes; then
    2.54 -            AC_DEFINE(SDL_TIMER_UNIX)
    2.55 +            AC_DEFINE(SDL_TIMER_UNIX, 1, [ ])
    2.56              SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
    2.57              have_timers=yes
    2.58          fi