gtkglarea r96 - in trunk: . gtkgl

[samh svn gnome org]

Author: samh
Date: Fri Mar  7 10:14:51 2008
New Revision: 96
URL: http://svn.gnome.org/viewvc/gtkglarea?rev=96&view=rev

Log:
  * Put uninteresting autotools files in the .auto subdirectory.
  * Get rid of outdated ltmain.sh and run libtoolize in autogen.sh instead.
  * Run autoconf, autoheader and automake in the proper order.
  * Create a config.h file instead of passing countless -D options to gcc.
  * Use more modern AC_INIT syntax in configure.ac.


Removed:
   trunk/ltmain.sh
Modified:
   trunk/   (props changed)
   trunk/autogen.sh
   trunk/configure.ac
   trunk/gtkgl/gdkgl-win32.c
   trunk/gtkgl/gdkgl.c
   trunk/gtkgl/gtkglarea.c

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Fri Mar  7 10:14:51 2008
@@ -2,14 +2,19 @@
 srcdir=`dirname $0`
 cd $srcdir
 
+mkdir -p .auto
+
 echo "Running glib-gettextize ..."
-glib-gettextize --force --copy ||
-	{ echo "**Error**: glib-gettextize failed."; exit 1; }
+glib-gettextize --force --copy || {
+  echo "**Error**: glib-gettextize failed."; exit 1; }
 
 # echo "Running intltoolize ..."
 # intltoolize --force --copy --automake ||
 # 	{ echo "**Error**: intltoolize failed."; exit 1; }
 
+libtoolize --force --copy || {
+  echo "**ERROR**: libtoolize failed."; exit 1; }
+
 echo "Running aclocal $ACLOCAL_FLAGS ..."
 aclocal $ACLOCAL_GLAGS || {
   echo
@@ -21,20 +26,22 @@
   exit 1
 }
 
+echo "Running autoconf ..."
+WANT_AUTOCONF=2.5 autoconf || {
+  echo "**Error**: autoconf failed."; exit 1; }
+
+echo "Running autoheader..."
+WANT_AUTOCONF=2.5 autoheader || {
+  echo "**Error**: autoheader failed."; exit 1; }
+
 # checking for automake 1.9+
 am_version=`automake --version | head -n 1 | cut -f2- -d1 | cut -f2 -d.`
-if [ "${am_version}" -lt 9 ]; then
-	echo "**Error**: automake 1.9+ required.";
-	exit 1;
-fi
+[ "${am_version}" -ge 9 ] || {
+  echo "**Error**: automake 1.9+ required."; exit 1; }
 
 echo "Running automake --gnu $am_opt ..."
-automake --add-missing --gnu $am_opt ||
-	{ echo "**Error**: automake failed."; exit 1; }
-
-echo "running autoconf ..."
-WANT_AUTOCONF=2.5 autoconf || {
-  echo "**Error**: autoconf failed."; exit 1; }
+automake --add-missing --gnu $am_opt || {
+  echo "**Error**: automake failed."; exit 1; }
 
 conf_flags="--enable-maintainer-mode --enable-compile-warnings"
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Mar  7 10:14:51 2008
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(gtkgl/gtkglarea.h)
-
-VERSION=2.0.0
-PACKAGE=gtkglarea
+AC_INIT(gtkglarea, 2.0.0)
+AC_CONFIG_AUX_DIR(.auto)
+AC_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE([no-define])
 
 #shared library versioning
 GTKGL_LIBRARY_VERSION=1:0:0
@@ -21,7 +21,6 @@
 # to know the DLL name to build MSVC import libraries.
 LT_CURRENT_MINUS_AGE=1
 
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
 AC_SUBST(GTKGL_LIBRARY_VERSION)
 AC_SUBST(LT_CURRENT_MINUS_AGE)
 AC_SUBST(VERSION)
@@ -34,6 +33,9 @@
 AM_SANITY_CHECK
 AM_MAINTAINER_MODE
 
+dnl
+dnl  Check for the operating system
+dnl
 AC_MSG_CHECKING([for Win32])
 case "$host" in
   *mingw* | pw32* | *cygwin*)
@@ -51,18 +53,27 @@
 fi
 AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
 
-dnl Check for GTK libraries
+dnl
+dnl  Check for GTK libraries
+dnl
 GTK_REQUIRED_VERSION=2.0.0
 PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk+-2.0 >= $GTK_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION)
 
 AC_SUBST(BASE_DEPENDENCIES_CFLAGS)
 AC_SUBST(BASE_DEPENDENCIES_LIBS)
 
+dnl
+dnl  Check for the windowing system (X11 or Win32)
+dnl
 gdk_target=`$PKG_CONFIG --variable=target gtk+-2.0`
-
 AM_CONDITIONAL(WINDOWING_WIN32, test x$gdk_target = xwin32)
+if test "$gdk_target" = "win32"; then
+  AC_DEFINE(USE_WIN32, 1, Define to 1 if the windowing system is Windows.)
+fi
 
-dnl Check for GL/MesaGL libraries
+dnl
+dnl  Check for GL/MesaGL libraries
+dnl
 AC_ARG_WITH(GL-prefix,  [  --with-GL-prefix=DIR    Prefix where GL/MesaGL is installed])
 AC_ARG_WITH(lib-GL,     [  --with-lib-GL           use '-lGL'])
 AC_ARG_WITH(lib-MesaGL, [  --with-lib-MesaGL       use '-lMesaGL'])

Modified: trunk/gtkgl/gdkgl-win32.c
==============================================================================
--- trunk/gtkgl/gdkgl-win32.c	(original)
+++ trunk/gtkgl/gdkgl-win32.c	Fri Mar  7 10:14:51 2008
@@ -17,6 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "config.h"
 
 #include "gdkgl.h"
 #include <GL/gl.h>

Modified: trunk/gtkgl/gdkgl.c
==============================================================================
--- trunk/gtkgl/gdkgl.c	(original)
+++ trunk/gtkgl/gdkgl.c	Fri Mar  7 10:14:51 2008
@@ -16,12 +16,12 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "config.h"
 
 #include "gdkgl.h"
 
 #include <gdk/gdkx.h>
 
-
 #include <GL/gl.h>
 #include <GL/glx.h>
 #include <string.h>

Modified: trunk/gtkgl/gtkglarea.c
==============================================================================
--- trunk/gtkgl/gtkglarea.c	(original)
+++ trunk/gtkgl/gtkglarea.c	Fri Mar  7 10:14:51 2008
@@ -16,6 +16,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "config.h"
+
 #include "gdkgl.h"
 #include "gtkglarea.h"
 #include <GL/gl.h>