summaryrefslogtreecommitdiffstats
path: root/devel/pwlib/files/patch-configureac
diff options
context:
space:
mode:
Diffstat (limited to 'devel/pwlib/files/patch-configureac')
-rw-r--r--devel/pwlib/files/patch-configureac163
1 files changed, 163 insertions, 0 deletions
diff --git a/devel/pwlib/files/patch-configureac b/devel/pwlib/files/patch-configureac
new file mode 100644
index 000000000..e8da151aa
--- /dev/null
+++ b/devel/pwlib/files/patch-configureac
@@ -0,0 +1,163 @@
+--- configure.ac.orig Wed Feb 22 12:53:28 2006
++++ configure.ac Sun May 7 14:19:18 2006
+@@ -136,7 +136,7 @@
+ x86 | i686 | i586 | i486 | i386 ) MACHTYPE=x86
+ ;;
+
+- x86_64) MACHTYPE=x86_64 ;
++ x86_64|amd64) MACHTYPE=x86_64 ;
+ P_64BIT=1 ;
+ LIB64=1 ;
+ ;;
+@@ -278,7 +278,7 @@
+
+ AC_MSG_CHECKING(if linker accepts -Wreorder)
+ AC_LANG_CONFTEST([[int main(int ac,char **av) { return 0; }]])
+-$STDCXX $CXXFLAGS -Wreorder conftest.cc > /dev/null 2>&1
++$CXX $CXXFLAGS -Wreorder conftest.cc > /dev/null 2>&1
+ if test $? = 0 ; then
+ AC_MSG_RESULT(yes)
+ STDCXXFLAGS="$STDCXXFLAGS -Wreorder"
+@@ -291,7 +291,7 @@
+ # $CXX $CFLAGS -Woverloaded-virtual conftest.cc > /dev/null 2>&1
+ # if test $? = 0 ; then
+ # AC_MSG_RESULT(yes)
+-# STDCCFLAGS="$STDCCFLAGS -Woverloaded-virtual"
++# STDCXXFLAGS="$STDCCFLAGS -Woverloaded-virtual"
+ # else
+ # AC_MSG_RESULT(no)
+ # fi
+@@ -320,7 +320,7 @@
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+- STDCXXFLAGS="$STDCCFLAGS -rtti"
++ STDCXXFLAGS="$STDCXXFLAGS -rtti"
+ fi
+
+ GCSECTIONS=0
+@@ -341,7 +341,7 @@
+ $CXX $CFLAGS -ffunction-sections -c conftest.cc > /dev/null 2>&1
+ if test $? = 0 ; then
+ AC_MSG_RESULT(yes)
+- STDCCFLAGS="$STDCCFLAGS -ffunction-sections"
++ STDCXXFLAGS="$STDCXXFLAGS -ffunction-sections"
+ GCSECTIONS=1
+ else
+ AC_MSG_RESULT(no)
+@@ -357,7 +357,7 @@
+ dnl $CXX $CFLAGS -fdata-sections -c conftest.cc > /dev/null 2>&1
+ dnl if test $? = 0 ; then
+ dnl AC_MSG_RESULT(yes)
+- dnl STDCCFLAGS="$STDCCFLAGS -fdata-sections"
++ dnl STDCXXFLAGS="$STDCXXFLAGS -fdata-sections"
+ dnl GCSECTIONS=1
+ dnl else
+ dnl AC_MSG_RESULT(no)
+@@ -370,7 +370,7 @@
+ dnl $CXX $CFLAGS -fvtable-gc -c conftest.cc > /dev/null 2>&1
+ dnl if test $? = 0 ; then
+ dnl AC_MSG_RESULT(yes)
+- dnl STDCCFLAGS="$STDCCFLAGS -fvtable-gc"
++ dnl STDCXXFLAGS="$STDCXXFLAGS -fvtable-gc"
+ dnl GCSECTIONS=1
+ dnl else
+ dnl AC_MSG_RESULT(no)
+@@ -689,18 +689,18 @@
+ dnl MSWIN_DISPLAY semaphore,Semaphore Support
+ dnl MSWIN_DEFINE semaphore,P_HAS_SEMAPHORES
+
+-dnl Linux, Mac OS X use libpthread and -lpthread
+-dnl FreeBSD uses the -pthread compiler option and uses libc_r
++dnl FreeBSD >= 5.x, Linux, Mac OS X use libpthread and -lpthread
++dnl FreeBSD < 5.x uses the -pthread compiler option and uses libc_r
+
+ AC_CHECK_LIB(pthread, pthread_create, HAS_PTHREADS=yes, HAS_PTHREADS=no)
+ if test ${HAS_PTHREADS} = yes ; then
+- ENDLDLIBS="$ENDLDLIBS -lpthread"
+- STDCCFLAGS="$STDCCFLAGS -D_REENTRANT"
++ ENDLDLIBS="$ENDLDLIBS ${PTHREAD_LIBS}"
++ STDCCFLAGS="$STDCCFLAGS -D_REENTRANT ${PTHREAD_LIBS}"
+ else
+ if test ${OSTYPE} = FreeBSD ; then
+ HAS_PTHREADS=yes
+- ENDLDLIBS="$ENDLDLIBS -pthread"
+- STDCCFLAGS="$STDCCFLAGS -D_REENTRANT -pthread"
++ ENDLDLIBS="$ENDLDLIBS ${PTHREAD_LIBS}"
++ STDCCFLAGS="$STDCCFLAGS -D_REENTRANT ${PTHREAD_LIBS}"
+ fi
+ fi
+
+@@ -1253,7 +1253,7 @@
+ else
+ AC_CHECK_HEADERS(expat.h, HAS_EXPAT=1)
+ if test "${HAS_EXPAT:-unset}" != "unset" ; then
+- AC_CHECK_LIB(expat, XML_ParserCreate, HAS_EXPAT=1, HAS_EXPAT=)
++ AC_SEARCH_LIBS(XML_ParserCreate, expat, HAS_EXPAT=1, HAS_EXPAT=)
+ else
+ AC_CHECK_FILE(/usr/local/include/expat.h, HAS_EXPAT=1)
+ if test "${HAS_EXPAT:-unset}" != "unset" ; then
+@@ -1428,7 +1428,8 @@
+ if test $HAS_IPV6 = no ; then
+ AC_MSG_RESULT(no)
+ else
+- AC_TRY_COMPILE([#include <sys/socket.h>
++ AC_TRY_COMPILE([#include <stddef.h>
++ #include <sys/socket.h>
+ #include <netdb.h>],
+ [getnameinfo(NULL, 0, NULL, 0, NULL, 0, 0);], HAS_IPV6=yes, HAS_IPV6=no)
+ if test $HAS_IPV6 = no ; then
+@@ -1485,7 +1486,7 @@
+ HAS_SDL=
+ if test "$enable_sdl" = "no" ; then
+ AC_MSG_NOTICE(SDL disabled)
+- AC_DEFINE(P_SDL, 0)
++# AC_DEFINE(P_SDL, 0)
+ else
+ dnl SDL checks
+ if test "${SDLLIB:-unset}" = "unset" ; then
+@@ -1501,9 +1502,9 @@
+ AC_CHECK_LIB(SDL, SDL_CreateYUVOverlay, HAS_SDL=1, HAS_SDL=, -L${X11LIBDIR} -lpthread -lX11 -lXext)
+ fi
+
+- dnl freeBSD SDL check
++ dnl FreeBSD SDL check
+ if test "${HAS_SDL:-unset}" = "unset" ; then
+- AC_CHECK_FILE(/usr/local/include/SDL11/SDL.h, HAS_SDL=1)
++ AC_CHECK_HEADER(SDL11/SDL.h, HAS_SDL=1)
+ if test "${HAS_SDL:-unset}" != "unset" ; then
+ SDLLIB=SDL-1.1
+ fi
+@@ -1527,7 +1528,7 @@
+ dnl ########################################################################
+ dnl check for video capture support.
+ dnl videodev.h on linux
+-dnl machine/ioctl_meteor on FreeBSD
++dnl machine/ioctl_meteor or dev/bktr/ioctl_meteor.h on FreeBSD
+ dnl i386/ioctl_meteor on OpenBSD
+ dnl dev/ic/bt8xx on NetBSD
+
+@@ -1553,9 +1554,10 @@
+ HAS_VIDEO_CAPTURE=1
+ else
+ AC_CHECK_HEADER(linux/videodev.h, HAS_VIDEO_CAPTURE=1)
+- dnl AC_CHECK_HEADER(machine/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1)
+- dnl AC_CHECK_HEADER(i386/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1)
+- dnl AC_CHECK_HEADER(dev/ic/bt8xx.h, HAS_VIDEO_CAPTURE=1)
++ AC_CHECK_HEADER(machine/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1)
++ AC_CHECK_HEADER(dev/bktr/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1)
++ AC_CHECK_HEADER(i386/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1)
++ AC_CHECK_HEADER(dev/ic/bt8xx.h, HAS_VIDEO_CAPTURE=1)
+ if test "${HAS_VIDEO_CAPTURE}z" = "z" ; then
+ AC_MSG_NOTICE(No Video Capture support)
+ AC_DEFINE([NO_VIDEO_CAPTURE], [], [No video capture])
+@@ -2046,6 +2048,9 @@
+ AC_MSG_NOTICE(C++ exceptions enabled)
+ STDCCFLAGS="$STDCCFLAGS -fno-exceptions"
+ fi
++
++STDCCFLAGS="$CPPFLAGS $STDCCFLAGS"
++STDCXXFLAGS="$CPPFLAGS $STDCXXFLAGS"
+
+ dnl ########################################################################
+ dnl final declarations
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-22 01:45:54 +0800