[Opalvoip-svn] SF.net SVN: opalvoip:[20701] ptlib/trunk

[<ms3...@us...>]

Revision: 20701
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20701&view=rev
Author:   ms30002000
Date:     2008-08-19 17:15:19 +0000 (Tue, 19 Aug 2008)

Log Message:
-----------
Really fix compilation when SDL is not found...

Modified Paths:
--------------
    ptlib/trunk/configure
    ptlib/trunk/configure.ac

Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure	2008-08-19 13:48:18 UTC (rev 20700)
+++ ptlib/trunk/configure	2008-08-19 17:15:19 UTC (rev 20701)
@@ -5757,7 +5757,7 @@
 default_openldap=yes
 default_openssl=yes
 default_expat=yes
-default_sdl=no
+default_sdl=yes
 default_sasl=yes
 default_plugins=yes
 default_tts=yes
@@ -10491,51 +10491,11 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$SDL_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (sdl) were not met:
-
-$SDL_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables SDL_CFLAGS
-and SDL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-echo "$as_me: error: Package requirements (sdl) were not met:
-
-$SDL_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables SDL_CFLAGS
-and SDL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+                HAS_SDL=
 elif test $pkg_failed = untried; then
-	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables SDL_CFLAGS
-and SDL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables SDL_CFLAGS
-and SDL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+	HAS_SDL=
 else
 	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
 	SDL_LIBS=$pkg_cv_SDL_LIBS

Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac	2008-08-19 13:48:18 UTC (rev 20700)
+++ ptlib/trunk/configure.ac	2008-08-19 17:15:19 UTC (rev 20701)
@@ -758,7 +758,7 @@
 default_openldap=yes
 default_openssl=yes
 default_expat=yes
-default_sdl=no
+default_sdl=yes
 default_sasl=yes
 default_plugins=yes
 default_tts=yes
@@ -1475,7 +1475,7 @@
                      PTLIB_OPENSSL_CONST( [AC_DEFINE([P_SSL_USE_CONST], [1], [SSL with const])] )
                      STDCCFLAGS="$STDCCFLAGS ${OPENSSL_CFLAGS}"
                      ENDLDLIBS="$ENDLDLIBS ${OPENSSL_LIBS}"
-dnl                      PKG_REQUIRES="$PKG_REQUIRES ssl"
+dnl                      PKG_REQUIRES="$PKG_REQUIRES openssl"
                     ], 
                     [HAS_OPENSSL=])
 fi
@@ -1925,7 +1925,7 @@
                      STDCCFLAGS="$STDCCFLAGS ${SDL_CFLAGS}"
                      ENDLDLIBS="$ENDLDLIBS ${SDL_LIBS}"
 dnl                      PKG_REQUIRES="$PKG_REQUIRES sdl"
-                    ])
+                    ], [HAS_SDL=])
 
 dnl to verify:
 dnl     AC_CHECK_LIB(SDL, SDL_CreateYUVOverlay, HAS_SDL=1, HAS_SDL=, -L${X11LIBDIR} -lpthread -lX11 -lXext)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.