Provide a hacked version of the gettext macros that never use the included

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index 33aed8789a80bfc7da0a4ee9de3bd79e6f5211d9..80998124a8aa206ab025e173dc3c722501a28a75 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ cflags_set=${CFLAGS+set}
 #
 GTK_MAJOR_VERSION=1
 GTK_MINOR_VERSION=1
-GTK_MICRO_VERSION=6
+GTK_MICRO_VERSION=7
 GTK_INTERFACE_AGE=0
 GTK_BINARY_AGE=0
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
@@ -87,6 +87,7 @@ AM_SANITY_CHECK
 
 # Checks for programs.
 AC_PROG_CC
+AC_ISC_POSIX
 AM_PROG_CC_STDC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
@@ -129,6 +130,14 @@ if test -n "$PERL" && perl -v | grep 'version 5.' > /dev/null ; then
 fi
 AC_SUBST(REBUILD)
 
+# i18n stuff
+ALL_LINGUAS="de pt"
+AM_GNU_GETTEXT_GTK
+AC_CHECK_FUNC(gettext,
+       ,
+       AC_CHECK_LIB(intl, gettext)
+)
+
 dnl The DU4 header files don't provide library prototypes unless 
 dnl -std1 is given to the native cc.
 AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
@@ -175,7 +184,7 @@ if test x$with_glib = x ; then
     AC_MSG_ERROR([
 *** GLIB 1.1.6 or better is required. The latest version of GLIB
 *** is always available from ftp://ftp.gtk.org.]),
-    gmodule)
+    gmodule gthread)
 
   glib_cflags=$GLIB_CFLAGS
   glib_libs=$GLIB_LIBS
@@ -272,7 +281,7 @@ AC_CHECK_LIB(X11, XConvertCase,
 # Check for XIM support.
 
 AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,
-           ,
+           : ,
            enable_xim=no,
            $x_libs)
 
@@ -296,20 +305,6 @@ else
   AC_DEFINE(XINPUT_NONE)
 fi
 
-# Threads
-
-if test "x$with_threads" = "xposix" || test "x$with_threads" = "xyes"; then
-  AC_CHECK_LIB(pthread, pthread_attr_init, 
-    [AC_DEFINE(USE_PTHREADS)
-    x_libs="$x_libs -lpthread"
-    GTK_THREAD_FLAGS="-D_REENTRANT"],
-    # AIX has libpthreads, cause they're special. Special friends (TM)
-    AC_CHECK_LIB(pthreads, pthread_attr_init,
-      [AC_DEFINE(USE_PTHREADS)
-      x_libs="$x_libs -lpthreads"
-      GTK_THREAD_FLAGS="-D_REENTRANT -D_THREAD_SAFE"]))
-fi
-
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
@@ -324,38 +319,6 @@ if test "x$enable_shm" = "xyes"; then
   AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc=yes)
   AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm=yes)
 
-  # Check whether shmctl IPC_RMID allowes subsequent attaches
-  if test "$ac_cv_header_sys_shm_h" = "yes"; then
-    AC_MSG_CHECKING(whether shmctl IPC_RMID allowes subsequent attaches)
-    AC_TRY_RUN([
-          #include <sys/types.h>
-          #include <sys/ipc.h>
-          #include <sys/shm.h>
-          int main()
-          {
-            int id;
-            char *shmaddr;
-          id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0777);
-          if (id == -1)
-            exit (2);
-            shmaddr = shmat (id, 0, 0);
-            shmctl (id, IPC_RMID, 0);
-            if ((char*) shmat (id, 0, 0) == (char*) -1)
-            {
-              shmdt (shmaddr);
-              exit (1);
-            }
-            shmdt (shmaddr);
-            shmdt (shmaddr);
-            exit (0);
-          }
-      ],
-      AC_DEFINE(IPC_RMID_DEFERRED_RELEASE)
-        AC_MSG_RESULT(yes),
-      AC_MSG_RESULT(no),
-      AC_MSG_RESULT(assuming no))
-  fi
-
   # Check for the X shared memory extension header file
   AC_MSG_CHECKING(X11/extensions/XShm.h)
   if test "x$no_xext_lib" = "xyes"; then
@@ -372,27 +335,6 @@ if test "x$enable_shm" = "xyes"; then
   fi
 fi
 
-# Check for private display resource base variable
-AC_MSG_CHECKING(resource base field in XDisplay)
-AC_CACHE_VAL(gtk_cv_display_resource_base,
-[AC_TRY_RUN([
-#define XLIB_ILLEGAL_ACCESS
-#include <X11/Xlib.h>
-
-int
-main ()
-{
-  Display *display;
-
-  return 0;
-
-  display->resource_base;
-}],
-gtk_cv_display_resource_base="resource_base",
-gtk_cv_display_resource_base="private3")])
-AC_MSG_RESULT($gtk_cv_display_resource_base)
-AC_DEFINE_UNQUOTED(RESOURCE_BASE, gdk_display->$gtk_cv_display_resource_base)
-
 # Check if X_LOCALE definition is necessary
 
 AC_MSG_CHECKING(need -DX_LOCALE)
@@ -508,6 +450,7 @@ AC_SUBST(GTK_THREAD_FLAGS)
 AC_OUTPUT([
 Makefile
 gtk-config
+po/Makefile.in
 docs/Makefile
 gdk/Makefile
 gtk/Makefile