almost done paly/pasue for the view

[xscreensaver] / xscreensaver / configure.in

diff --git a/xscreensaver/configure.in b/xscreensaver/configure.in
index d8c98ab..0431d92 100644 (file)
--- a/xscreensaver/configure.in
+++ b/xscreensaver/configure.in
@@ -145,6 +145,10 @@ AH_TEMPLATE([HAVE_GDK_PIXBUF],
            [Define this if you have the GDK_Pixbuf library installed.  Some
            of the demos can make use of this if it is available.])
 
+AH_TEMPLATE([HAVE_GDK_PIXBUF_APPLY_EMBEDDED_ORIENTATION],
+           [Define this if you have the gdk_pixbuf_apply_embedded_orientation
+           function (gdk-pixbuf 2.12).])
+
 AH_TEMPLATE([HAVE_JPEGLIB],
            [Define this if you have the Independent JPEG Group's JPEG
            library installed.  Some of the demos can make use of this if it
@@ -430,8 +434,17 @@ AC_DEFUN(AC_NO_OBJECTIVE_C,
 #
 ###############################################################################
 
-AC_DEFUN(AC_GCC_ACCEPTS_STD,
-         [AC_CHECK_GCC_ARG(std, -std=c89)])
+AC_DEFUN(AC_GCC_ACCEPTS_STD, [
+  case "$host" in
+    *-darwin* )
+      # Fucking Apple let // comments sneak into OpenGL headers, so
+      # we *must* allow // comments when compiling on Mac OS 10.6!  FUCK!
+    ;;
+   *)
+     AC_CHECK_GCC_ARG(std, -std=c89)
+   ;;
+  esac
+])
 
 AC_DEFUN(AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE,
  [if test -n "$GCC"; then
@@ -458,9 +471,9 @@ AC_DEFUN(AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE,
      #
      # $CC already contains "-std=c89" via AC_GCC_ACCEPTS_STD
      CC="$CC -U__STRICT_ANSI__"
-   else
-     # The old way:
-     CC="$CC -Wp,-lang-c89"
+#   else
+#     # The old way:
+#     CC="$CC -Wp,-lang-c89"
    fi
   fi
 ])
@@ -1181,7 +1194,7 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$GETTEXT_PACKAGE",
                   generated code.])
 AC_SUBST(GETTEXT_PACKAGE)
 
-ALL_LINGUAS="ca da de es et fi fr hu it ja ko nb nl no pl pt pt_BR ru sk sv vi wa zh_CN zh_TW"
+ALL_LINGUAS="ca da de es et fi fr hu it ja ko nb nl pl pt pt_BR ru sk sv vi wa zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 MKINSTALLDIRS="$INSTALL_DIRS"
 
@@ -1687,8 +1700,21 @@ if test "$with_randr" = yes; then
     AC_DEFINE(HAVE_RANDR)
 
     # Now check for version 1.2 in the same libs.
-    AC_CHECK_X_LIB(c, XRRGetOutputInfo, [AC_DEFINE(HAVE_RANDR_12)],
-                   [true], $SAVER_LIBS)
+    # Try to compile, since on MacOS 10.5.7, headers are older than libs!
+    AC_CACHE_CHECK([for XRRGetScreenResources], ac_cv_randr_12,
+      [ac_cv_randr_12=no
+       AC_TRY_X_COMPILE([#include <stdlib.h>
+                         #include <X11/Xlib.h>
+                         #include <X11/extensions/Xrandr.h>],
+                        [XRRScreenResources *res = 
+                           XRRGetScreenResources (0, 0);],
+                        [ac_cv_randr_12=yes],
+                        [ac_cv_randr_12=no])])
+    if test "$ac_cv_randr_12" = yes ; then
+      AC_DEFINE(HAVE_RANDR_12)
+    fi
+#   AC_CHECK_X_LIB(c, XRRGetOutputInfo, [AC_DEFINE(HAVE_RANDR_12)],
+#                  [true], $SAVER_LIBS)
   fi
 
 
@@ -2433,7 +2459,7 @@ pkg_check_version() {
 jurassic_gtk=no
 gtk_halfassed=no
 
-if test "$with_gtk" = yes; then
+#if test "$with_gtk" = yes; then
   have_gtk=no
   
   ok="yes"
@@ -2482,7 +2508,31 @@ if test "$with_gtk" = yes; then
     AC_DEFINE(HAVE_XML)
   fi
 
-fi
+#fi
+
+AC_CACHE_CHECK([for DBUS includes], ac_cv_dbus_config_cflags,
+                   [ac_cv_dbus_config_cflags=`$pkg_config --cflags dbus-1`])
+AC_CACHE_CHECK([for DBUS includes], ac_cv_dbus_config_libs,
+                   [ac_cv_dbus_config_libs=`$pkg_config --libs dbus-1`])
+
+ac_dbus_config_cflags=$ac_cv_dbus_config_cflags
+ac_dbus_config_libs=$ac_cv_dbus_config_libs
+
+INCLUDES="$INCLUDES $ac_dbus_config_cflags"
+DBUS_LIBS="$GTK_LIBS $ac_dbus_config_libs"
+
+AC_CACHE_CHECK([for OSSO includes], ac_cv_osso_config_cflags,
+                   [ac_cv_osso_config_cflags=`$pkg_config --cflags libosso`])
+AC_CACHE_CHECK([for OSSO includes], ac_cv_osso_config_libs,
+                   [ac_cv_osso_config_libs=`$pkg_config --libs libosso`])
+
+ac_osso_config_cflags=$ac_cv_osso_config_cflags
+ac_osso_config_libs=$ac_cv_osso_config_libs
+
+INCLUDES="$INCLUDES $ac_osso_config_cflags"
+GTK_LIBS="$GTK_LIBS $ac_osso_config_libs"
+
+
 
 
 # Check for the various Gnome help and URL loading programs.
@@ -3087,6 +3137,12 @@ if test "$with_gdk_pixbuf" = yes; then
   else
     AC_MSG_RESULT(checking for gdk_pixbuf usability... no)
   fi
+
+  if test "$have_gdk_pixbuf" = yes; then
+    AC_CHECK_X_LIB(c, gdk_pixbuf_apply_embedded_orientation,
+                     [AC_DEFINE(HAVE_GDK_PIXBUF_APPLY_EMBEDDED_ORIENTATION)],,
+                     $ac_gdk_pixbuf_config_libs -lX11 -lXext -lm)
+  fi
 fi
 
 
@@ -3590,18 +3646,20 @@ fi
 tab='  '
 if test "$have_gl" = yes; then
   GL_EXES='$(GL_EXES)'
+  SUID_EXES='$(SUID_EXES)'
+  RETIRED_GL_EXES='$(RETIRED_GL_EXES)'
   GL_UTIL_EXES='$(GL_UTIL_EXES)'
   GL_MEN='$(GL_MEN)'
-  GL_KLUDGE="${tab}  "
+  GL_KLUDGE=" "
 else
-  GL_KLUDGE="-${tab}  "
+  GL_KLUDGE="-"
 fi
 
 if test "$have_gle" = yes; then
   GLE_EXES='$(GLE_EXES)'
-  GLE_KLUDGE="${tab}   "
+  GLE_KLUDGE=" "
 else
-  GLE_KLUDGE="-${tab}   "
+  GLE_KLUDGE="-"
 fi
 
 if test "$have_jpeg" = yes -a "$have_gdk_pixbuf" = yes; then
@@ -3682,6 +3740,7 @@ AC_SUBST(HACK_LIBS)
 AC_SUBST(XPM_LIBS)
 AC_SUBST(PTY_LIBS)
 AC_SUBST(GL_LIBS)
+AC_SUBST(DBUS_LIBS)
 AC_SUBST(GLE_LIBS)
 AC_SUBST(XDPMS_LIBS)
 AC_SUBST(XINERAMA_LIBS)
@@ -3716,6 +3775,8 @@ AC_SUBST(LOCK_SRCS)
 AC_SUBST(LOCK_OBJS)
 AC_SUBST(JPEG_EXES)
 AC_SUBST(GL_EXES)
+AC_SUBST(RETIRED_GL_EXES)
+AC_SUBST(SUID_EXES)
 AC_SUBST(GL_UTIL_EXES)
 AC_SUBST(GL_MEN)
 AC_SUBST(GL_KLUDGE)
@@ -4214,16 +4275,18 @@ done
 
 if test \! -z "$debv" ; then
   debbdir=`dpkg -L $debnames 2>/dev/null | \
-            sed -n 's@^\(.*/bin\)/xscreensaver$@\1@p'`
+            sed -n 's@^\(.*/bin/\)xscreensaver$@\1@p'`
   debhdir=`dpkg -L $debnames 2>/dev/null | \
-            sed -n 's@^\(.*\)/popsquares$@\1@p'`
+            sed -n 's@^\(.*/\)popsquares$@\1@p'`
+  if test -z "$debbdir" ; then debbdir='???'; fi
+  if test -z "$debhdir" ; then debhdir='???'; fi
 
   warning=no
   warnL "There is already an installed dpkg of xscreensaver"
   warn2 "version \"$debv\" on this system."
   echo ""
-  warn2 "The dpkg was installed in $debbdir/,"
-  warn2 "with demos in $debhdir/."
+  warn2 "The dpkg was installed in $debbdir,"
+  warn2 "with demos in $debhdir."
 fi