Attachment #215029 for bug #299464




# Checks for programs.
AC_PROG_CC
AC_PROG_RANLIB
AC_USE_SYSTEM_EXTENSIONS

# Default CFLAGS.
#if test "x$GCC" = "xyes" && test "$DEFAULT_CFLAGS" = "yes"; then
#  CFLAGS="-Wall -O2 -fomit-frame-pointer -ffast-math"
#fi
#CFLAGS="$CFLAGS -I${srcdir}/../lib"

# Checks for LFS flags, we may not handle big files, but it doesn't hurt.
AC_SYS_LARGEFILE


AC_DEFUN([CHECK_MATH],
         [OLD_CFLAGS="$CFLAGS"]
         [CFLAGS="$CFLAGS -w"]


# Checks for X.
AC_PATH_XTRA
CFLAGS="$X_CFLAGS $CFLAGS"
LDFLAGS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS $LDFLAGS"

# Checks for GtkGLExt.
PKG_CHECK_MODULES(GTKGLEXT, [gtkglext-1.0 >= 0.7.0])
CFLAGS="$GTKGLEXT_CFLAGS $CFLAGS"
LDFLAGS="$GTKGLEXT_LIBS $LDFLAGS"
GTKGL_VERSION="$($PKG_CONFIG --modversion gtkglext-1.0)"

# Checks for OpenGL.
AC_SEARCH_LIBS([glBegin],[GL],[ogl="yes"],[ogl="no"],)
            [glBegin(GL_QUADS);],
            [ogl="yes"],
            [ogl="no"])

if test "x$ogl" = "xno"; then
 AC_MSG_NOTICE([maybe libGL requires libpthread...])
 AC_SEARCH_LIBS([glBegin],[GL],[ogl="yes"],[ogl="no"],[-lpthread])
 LDFLAGS="$LDFLAGS -lpthread"
 AC_TRY_LINK([#include "GL/gl.h"],
             [glBegin(GL_QUADS);],
             [],
             AC_MSG_ERROR([cannot use -lGL]))
fi

# Checks for gtk.
AM_PATH_GTK_2_0([2.6.0], [
  CFLAGS="$GTK_CFLAGS $CFLAGS"
  LIBS="$LIBS $GTK_LIBS"
  GTK_VERSION="$($PKG_CONFIG --modversion gtk+-2.0)"
 ], [exit 1], [gthread])


ALL_LINGUAS=$(echo po/*.po | sed -e 's|\.po||g' -e 's|po/||g')
AM_GNU_GETTEXT_VERSION
AM_GNU_GETTEXT
CFLAGS="$CFLAGS -I../${srcdir}/intl"
LIBS="$LIBS $LIBINTL"


AC_CONFIG_FILES([
 Makefile

Lines 64-69 Link Here

(-)gliv-1.9.6.orig/src/Makefile.am (+3 lines)
64	gliv_LDADD = -L../lib -lreplacements	64	gliv_LDADD = -L../lib -lreplacements
65	endif	65	endif
66		66
		67	gliv_CFLAGS = @GTKGLEXT_CFLAGS@
		68	gliv_LDADD = @GTKGLEXT_LIBS@
		69
67	AM_CPPFLAGS = -I$(srcdir)/include -D_REENTRANT -D_THREAD_SAFE \	70	AM_CPPFLAGS = -I$(srcdir)/include -D_REENTRANT -D_THREAD_SAFE \
68	-DSYSCONFDIR=\"$(sysconfdir)\"	71	-DSYSCONFDIR=\"$(sysconfdir)\"
69		72

Lines 29-35 Link Here

(-)gliv-1.9.6.orig/po/Makefile.in.in (-1 / +1 lines)
29		29
30	INSTALL = @INSTALL@	30	INSTALL = @INSTALL@
31	INSTALL_DATA = @INSTALL_DATA@	31	INSTALL_DATA = @INSTALL_DATA@
32	MKINSTALLDIRS = @MKINSTALLDIRS@	32	MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs
33	mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)	33	mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
34		34
35	GMSGFMT = @GMSGFMT@	35	GMSGFMT = @GMSGFMT@

Return to bug 299464

Lines 16-33 Link Here

(-)gliv-1.9.6.orig/configure.ac (-25 / +8 lines)
16	# Checks for programs.	16	# Checks for programs.
17	AC_PROG_CC	17	AC_PROG_CC
18	AC_PROG_RANLIB	18	AC_PROG_RANLIB
19		19	AC_USE_SYSTEM_EXTENSIONS
20		20
21	# Default CFLAGS.	21	# Default CFLAGS.
22	if test "x$GCC" = "xyes" && test "$DEFAULT_CFLAGS" = "yes"; then	22	#if test "x$GCC" = "xyes" && test "$DEFAULT_CFLAGS" = "yes"; then
23	CFLAGS="-Wall -O2 -fomit-frame-pointer -ffast-math"	23	# CFLAGS="-Wall -O2 -fomit-frame-pointer -ffast-math"
24	fi	24	#fi
25	CFLAGS="$CFLAGS -I${srcdir}/../lib"	25	#CFLAGS="$CFLAGS -I${srcdir}/../lib"
26		26
27	# Checks for LFS flags, we may not handle big files, but it doesn't hurt.	27	# Checks for LFS flags, we may not handle big files, but it doesn't hurt.
28	AC_SYS_LARGEFILE	28	AC_SYS_LARGEFILE
29		29
30
31	AC_DEFUN([CHECK_MATH],	30	AC_DEFUN([CHECK_MATH],
32	[OLD_CFLAGS="$CFLAGS"]	31	[OLD_CFLAGS="$CFLAGS"]
33	[CFLAGS="$CFLAGS -w"]	32	[CFLAGS="$CFLAGS -w"]
Lines 127-161 Link Here
127		126
128	# Checks for X.	127	# Checks for X.
129	AC_PATH_XTRA	128	AC_PATH_XTRA
130	CFLAGS="$X_CFLAGS $CFLAGS"
131	LDFLAGS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS $LDFLAGS"
132		129
133	# Checks for GtkGLExt.	130	# Checks for GtkGLExt.
134	PKG_CHECK_MODULES(GTKGLEXT, [gtkglext-1.0 >= 0.7.0])	131	PKG_CHECK_MODULES(GTKGLEXT, [gtkglext-1.0 >= 0.7.0])
135	CFLAGS="$GTKGLEXT_CFLAGS $CFLAGS"
136	LDFLAGS="$GTKGLEXT_LIBS $LDFLAGS"
137	GTKGL_VERSION="$($PKG_CONFIG --modversion gtkglext-1.0)"	132	GTKGL_VERSION="$($PKG_CONFIG --modversion gtkglext-1.0)"
138		133
139	# Checks for OpenGL.	134	# Checks for OpenGL.
140	AC_TRY_LINK([#include "GL/gl.h"],	135	AC_SEARCH_LIBS([glBegin],[GL],[ogl="yes"],[ogl="no"],)
141	[glBegin(GL_QUADS);],
142	[ogl="yes"],
143	[ogl="no"])
144
145	if test "x$ogl" = "xno"; then	136	if test "x$ogl" = "xno"; then
146	AC_MSG_NOTICE([maybe libGL requires libpthread...])	137	AC_MSG_NOTICE([maybe libGL requires libpthread...])
147	OLD_LDFLAGS="$LDFLAGS"	138	AC_SEARCH_LIBS([glBegin],[GL],[ogl="yes"],[ogl="no"],[-lpthread])
148	LDFLAGS="$LDFLAGS -lpthread"
149	AC_TRY_LINK([#include "GL/gl.h"],
150	[glBegin(GL_QUADS);],
151	[],
152	AC_MSG_ERROR([cannot use -lGL]))
153	fi	139	fi
154		140
155	# Checks for gtk.	141	# Checks for gtk.
156	AM_PATH_GTK_2_0([2.6.0], [	142	AM_PATH_GTK_2_0([2.6.0], [
157	CFLAGS="$GTK_CFLAGS $CFLAGS"	143	CFLAGS="$GTK_CFLAGS $CFLAGS"
158	LDFLAGS="$GTK_LIBS $LDFLAGS"	144	LIBS="$LIBS $GTK_LIBS"
159	GTK_VERSION="$($PKG_CONFIG --modversion gtk+-2.0)"	145	GTK_VERSION="$($PKG_CONFIG --modversion gtk+-2.0)"
160	], [exit 1], [gthread])	146	], [exit 1], [gthread])
161		147
Lines 163-171 Link Here
163	ALL_LINGUAS=$(echo po/*.po \| sed -e 's\|\.po\|\|g' -e 's\|po/\|\|g')	149	ALL_LINGUAS=$(echo po/*.po \| sed -e 's\|\.po\|\|g' -e 's\|po/\|\|g')
164	AM_GNU_GETTEXT_VERSION	150	AM_GNU_GETTEXT_VERSION
165	AM_GNU_GETTEXT	151	AM_GNU_GETTEXT
166	CFLAGS="$CFLAGS -I../${srcdir}/intl"
167	LIBS="$LIBS $LIBINTL"
168
169		152
170	AC_CONFIG_FILES([	153	AC_CONFIG_FILES([
171	Makefile	154	Makefile