Enlightenment CVS committal Author : mej Project : e17 Module : libs/ecore
Dir : e17/libs/ecore Modified Files: configure.in ecore-config.in Log Message: Thu Mar 15 12:20:27 2007 Michael Jennings (mej) Re-apply the previously reverted patch and add (I think) the correct fix for ecore-config. I haven't tested this extensively, but edje builds okay with it, so hopefully it's right. ---------------------------------------------------------------------- =================================================================== RCS file: /cvs/e/e17/libs/ecore/configure.in,v retrieving revision 1.171 retrieving revision 1.172 diff -u -3 -r1.171 -r1.172 --- configure.in 15 Mar 2007 07:57:41 -0000 1.171 +++ configure.in 15 Mar 2007 22:21:26 -0000 1.172 @@ -243,288 +243,17 @@ AC_SUBST(Xcursor_cflags) AC_SUBST(Xcursor_libs) - Xprint_libs="" - Xprint_cflags="" - use_Xprint="no" - PCFLAGS=$CFLAGS - CFLAGS=$x_cflags" "$x_includes - AC_CHECK_HEADER(X11/extensions/Print.h, - [ - AC_CHECK_LIB(Xp, XpQueryScreens, - [ - AC_DEFINE(ECORE_XPRINT, 1, [Build support for Xprint]) - Xprint_cflags="" - Xprint_libs="-lXp" - use_Xprint="yes" - ], [ - Xprint_cflags="" - Xprint_libs="" - use_Xprint="no" - ], [ - $x_libs - ] - ) - ], [ - Xprint_cflags="" - Xprint_libs="" - use_Xprint="no" - ], [ - #include <X11/Xlib.h> - ] - ) - CFLAGS=$PCFLAGS - - AC_SUBST(Xprint_cflags) - AC_SUBST(Xprint_libs) - - Xinerama_libs="" - Xinerama_cflags="" - use_Xinerama="no" - PCFLAGS=$CFLAGS - CFLAGS=$x_cflags" "$x_includes - AC_CHECK_HEADER(X11/extensions/Xinerama.h, - [ - AC_CHECK_LIB(Xinerama, XineramaQueryScreens, - [ - AC_DEFINE(ECORE_XINERAMA, 1, [Build support for Xinerama]) - Xinerama_cflags="" - Xinerama_libs="-lXinerama" - use_Xinerama="yes" - ], [ - Xinerama_cflags="" - Xinerama_libs="" - use_Xinerama="no" - ], [ - $x_libs - ] - ) - ], [ - Xinerama_cflags="" - Xinerama_libs="" - use_Xinerama="no" - ], [ - #include <X11/Xlib.h> - ] - ) - CFLAGS=$PCFLAGS - - AC_SUBST(Xinerama_cflags) - AC_SUBST(Xinerama_libs) - - Xrandr_libs="" - Xrandr_cflags="" - use_Xrandr="no" - PCFLAGS=$CFLAGS - CFLAGS=$x_cflags" "$x_includes - AC_CHECK_HEADER(X11/extensions/Xrandr.h, - [ - AC_CHECK_LIB(Xrandr, XRRSizes, - [ - AC_DEFINE(ECORE_XRANDR, 1, [Build support for Xrandr]) - Xrandr_cflags="" - Xrandr_libs="-lXrandr" - use_Xrandr="yes" - ], [ - Xrandr_cflags="" - Xrandr_libs="" - use_Xrandr="no" - ], [ - $x_libs - ] - ) - ], [ - Xrandr_cflags="" - Xrandr_libs="" - use_Xrandr="no" - ], [ - #include <X11/Xlib.h> - ] - ) - CFLAGS=$PCFLAGS - - AC_SUBST(Xrandr_cflags) - AC_SUBST(Xrandr_libs) - - Xss_libs="" - Xss_cflags="" - use_Xss="no" - PCFLAGS=$CFLAGS - CFLAGS=$x_cflags" "$x_includes - AC_CHECK_HEADER(X11/extensions/scrnsaver.h, - [ - AC_CHECK_LIB(Xss, XScreenSaverSelectInput, - [ - AC_DEFINE(ECORE_XSS, 1, [Build support for Xss]) - Xss_cflags="" - Xss_libs="-lXss" - use_Xss="yes" - ], [ - Xss_cflags="" - Xss_libs="" - use_Xss="no" - ], [ - $x_libs - ] - ) - ], [ - Xss_cflags="" - Xss_libs="" - use_Xss="no" - ], [ - #include <X11/Xlib.h> - ] - ) - CFLAGS=$PCFLAGS - - AC_SUBST(Xss_cflags) - AC_SUBST(Xss_libs) - - Xrender_libs="" - Xrender_cflags="" - use_Xrender="no" - PCFLAGS=$CFLAGS - CFLAGS=$x_cflags" "$x_includes - AC_CHECK_HEADER(X11/extensions/Xrender.h, - [ - AC_CHECK_LIB(Xrender, XRenderFindVisualFormat, - [ - AC_DEFINE(ECORE_XRENDER, 1, [Build support for Xrender]) - Xrender_cflags="" - Xrender_libs="-lXrender" - use_Xrender="yes" - ], [ - Xrender_cflags="" - Xrender_libs="" - use_Xrender="no" - ], [ - $x_libs - ] - ) - ], [ - Xrender_cflags="" - Xrender_libs="" - use_Xrender="no" - ], [ - #include <X11/Xlib.h> - ] - ) - CFLAGS=$PCFLAGS - - AC_SUBST(Xrender_cflags) - AC_SUBST(Xrender_libs) - - Xfixes_libs="" - Xfixes_cflags="" - use_Xfixes="no" - PCFLAGS=$CFLAGS - CFLAGS=$x_cflags" "$x_includes - AC_CHECK_HEADER(X11/extensions/Xfixes.h, - [ - AC_CHECK_LIB(Xfixes, XFixesExpandRegion, - [ - AC_DEFINE(ECORE_XFIXES, 1, [Build support for Xfixes]) - Xfixes_cflags="" - Xfixes_libs="-lXfixes" - use_Xfixes="yes" - ], [ - Xfixes_cflags="" - Xfixes_libs="" - use_Xfixes="no" - ], [ - $x_libs - ] - ) - ], [ - Xfixes_cflags="" - Xfixes_libs="" - use_Xfixes="no" - ], [ - #include <X11/Xlib.h> - ] - ) - CFLAGS=$PCFLAGS - - AC_SUBST(Xfixes_cflags) - AC_SUBST(Xfixes_libs) - - Xdamage_libs="" - Xdamage_cflags="" - use_Xdamage="no" - PCFLAGS=$CFLAGS - CFLAGS=$x_cflags" "$x_includes - AC_CHECK_HEADER(X11/extensions/Xdamage.h, - [ - AC_CHECK_LIB(Xdamage, XDamageSubtract, - [ - AC_DEFINE(ECORE_XDAMAGE, 1, [Build support for Xdamage]) - Xdamage_cflags="" - Xdamage_libs="-lXdamage" - use_Xdamage="yes" - ], [ - Xdamage_cflags="" - Xdamage_libs="" - use_Xdamage="no" - ], [ - $x_libs - ] - ) - ], [ - Xdamage_cflags="" - Xdamage_libs="" - use_Xdamage="no" - ], [ - #include <X11/Xlib.h> - ] - ) - CFLAGS=$PCFLAGS - - AC_SUBST(Xdamage_cflags) - AC_SUBST(Xdamage_libs) - - Xdpms_libs="" - Xdpms_cflags="" - use_Xdpms="no" - PCFLAGS=$CFLAGS - CFLAGS=$x_cflags" "$x_includes - AC_CHECK_HEADER(X11/extensions/dpms.h, - [ - AC_CHECK_LIB(Xdpms, DPMSQueryExtension, - [ - AC_DEFINE(ECORE_XDPMS, 1, [Build support for DPMS]) - Xdpms_cflags="" - Xdpms_libs="-lXdpms" - use_Xdpms="yes" - ], [ - AC_CHECK_LIB(Xext, DPMSQueryExtension, - [ - AC_DEFINE(ECORE_XDPMS, 1, [Build support for DPMS]) - Xdpms_cflags="" - Xdpms_libs="-lXext" - use_Xdpms="yes" - ], [ - Xdpms_cflags="" - Xdpms_libs="" - use_Xdpms="no" - ], [ - $x_libs - ] - ) - ], [ - $x_libs - ] - ) - ], [ - Xdpms_cflags="" - Xdpms_libs="" - use_Xdpms="no" - ], [ - #include <X11/Xlib.h> - ] - ) - CFLAGS=$PCFLAGS - - AC_SUBST(Xdpms_cflags) - AC_SUBST(Xdpms_libs) + AC_CHECK_X_EXTENSION([Xdamage], [Xdamage.h], [Xdamage], [XDamageSubtract]) + AC_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xdpms], [DPMSQueryExtension]) + if test "x$use_xdpms" = "xno" ; then + AC_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xext], [DPMSQueryExtension]) + fi + AC_CHECK_X_EXTENSION([Xfixes], [Xfixes.h], [Xfixes], [XFixesExpandRegion]) + AC_CHECK_X_EXTENSION([Xinerama], [Xinerama.h], [Xinerama], [XineramaQueryScreens]) + AC_CHECK_X_EXTENSION([Xprint], [Print.h], [Xp], [XpQueryScreens]) + AC_CHECK_X_EXTENSION([Xrandr], [Xrandr.h], [Xrandr], [XRRSizes]) + AC_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender], [XRenderFindVisualFormat]) + AC_CHECK_X_EXTENSION([Xss], [scrnsaver.h], [Xss], [XScreenSaverSelectInput]) fi @@ -1332,7 +1061,7 @@ echo " Ecore_Job....................: $have_ecore_job" echo " Ecore_Con....................: $have_ecore_con (OpenSSL: $use_openssl)" echo " Ecore_Txt....................: $have_ecore_txt" -echo " Ecore_X......................: $have_ecore_x (Xcursor: $use_Xcursor) (Xprint: $use_Xprint) (Xinerama: $use_Xinerama) (Xrandr: $use_Xrandr) (Xscreensaver: $use_Xss) (Xrender: $use_Xrender) (Xfixes: $use_Xfixes) (Xdamage: $use_Xdamage) (Xdpms: $use_Xdpms)" +echo " Ecore_X......................: $have_ecore_x (Xcursor: $use_Xcursor) (Xprint: $use_xprint) (Xinerama: $use_xinerama) (Xrandr: $use_xrandr) (Xscreensaver: $use_xss) (Xrender: $use_xrender) (Xfixes: $use_xfixes) (Xdamage: $use_xdamage) (Xdpms: $use_xdpms)" echo " Ecore_FB.....................: $have_ecore_fb" echo " Ecore_DFB....................: $have_ecore_dfb" echo " Ecore_Evas...................: $have_ecore_evas" =================================================================== RCS file: /cvs/e/e17/libs/ecore/ecore-config.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- ecore-config.in 10 Mar 2007 22:25:58 -0000 1.18 +++ ecore-config.in 15 Mar 2007 22:21:26 -0000 1.19 @@ -52,7 +52,7 @@ ;; --libs) [EMAIL PROTECTED]@ - echo $libdirs -lecore @ecore_job_libs@ @ecore_x_libs@ @ecore_evas_libs@ @ecore_con_libs@ @ecore_ipc_libs@ @ecore_txt_libs@ @ecore_fb_libs@ @ecore_config_libs@ @ecore_file_libs@ @ecore_desktop_libs@ @ecore_dbus_libs@ @SSL_LIBS@ @winsock_libs@ @CURL_LIBS@ @EET_LIBS@ @EVAS_LIBS@ @x_libs@ @Xcursor_libs@ @Xrender_libs@ @Xprint_libs@ @Xinerama_libs@ @Xrandr_libs@ @Xfixes_libs@ @Xdamage_libs@ @Xss_libs@ @iconv_libs@ @tslib_libs@ @fam_libs@ -lm + echo $libdirs -lecore @ecore_job_libs@ @ecore_x_libs@ @ecore_evas_libs@ @ecore_con_libs@ @ecore_ipc_libs@ @ecore_txt_libs@ @ecore_fb_libs@ @ecore_config_libs@ @ecore_file_libs@ @ecore_desktop_libs@ @ecore_dbus_libs@ @SSL_LIBS@ @winsock_libs@ @CURL_LIBS@ @EET_LIBS@ @EVAS_LIBS@ @x_libs@ @Xcursor_libs@ @XRENDER_LIBS@ @XPRINT_LIBS@ @XINERAMA_LIBS@ @XRANDR_LIBS@ @XFIXES_LIBS@ @XDAMAGE_LIBS@ @XSS_LIBS@ @iconv_libs@ @tslib_libs@ @fam_libs@ -lm ;; --libs-core) [EMAIL PROTECTED]@ ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs