Diff of /kazehakase/trunk/configure.ac

OSDN > Trouver un logiciel > Kazehakase

 Browse Subversion Repository



/[kazehakase]/kazehakase/trunk/configure.ac




Diff of /kazehakase/trunk/configure.ac



 Parent Directory

|  Revision Log



|  Patch














revision 1998 by ikezoe,
Sun Mar 13 10:09:54 2005 UTC




revision 2000 by ikezoe,
Sun Mar 13 12:19:37 2005 UTC






#

Line 10 
 AC_ENABLE_STATIC(no)


Line 10 
 AC_ENABLE_STATIC(no)












10
 AM_PROG_LIBTOOL
 AM_PROG_LIBTOOL

















11
  
  

















12
 AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
 AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])












13
 
 







14
 
 AC_PROG_CXX







15
 
 AC_PROG_CC







16
 
 AC_PROG_CPP







17
 
 AC_PROG_INSTALL







18
 
 AC_PROG_LN_S







19
 
 AC_PROG_MAKE_SET







20
 
 AC_PROG_AWK







21
 
 







22
 
 dnl disable RTTI by default







23
 
 AC_ARG_ENABLE(cpp-rtti,







24
 
         [  --enable-cpp-rtti       Enable C++ RTTI (for cvs gcc)],,







25
 
         enable_cpp_rtti=no)







26
 
 







27
 
 if test "x$enable_cpp_rtti" = "xno"; then







28
 
   AM_CXXFLAGS="-fno-rtti $CXXFLAGS"







29
 
 fi












30
 dnl **************************************************************
 dnl **************************************************************

















31
 dnl Check for GtkMozEmbed.
 dnl Check for GtkMozEmbed.

















32
 dnl **************************************************************
 dnl **************************************************************











#

Line 48 
 AC_SUBST(GECKO_FLAVOUR)


Line 65 
 AC_SUBST(GECKO_FLAVOUR)












65
 
 

















66
 PKG_CHECK_MODULES(MOZILLA_COMPONENT, $GECKO-gtkmozembed >= $min_version $GECKO-xpcom >= $min_version)
 PKG_CHECK_MODULES(MOZILLA_COMPONENT, $GECKO-gtkmozembed >= $min_version $GECKO-xpcom >= $min_version)

















67
 
 














 dnl AC_DEFINE(ENABLE_MOZILLA_EMBED)
 













68
 AC_SUBST(MOZILLA_COMPONENT_CFLAGS)
 AC_SUBST(MOZILLA_COMPONENT_CFLAGS)

















69
 AC_SUBST(MOZILLA_COMPONENT_LIBS)
 AC_SUBST(MOZILLA_COMPONENT_LIBS)

















70
 
 











#

Line 58 
 AC_SUBST(MOZILLA_INCLUDE_ROOT)


Line 74 
 AC_SUBST(MOZILLA_INCLUDE_ROOT)












74
 MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $GECKO-gtkmozembed`"
 MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $GECKO-gtkmozembed`"

















75
 AC_SUBST(MOZILLA_HOME)
 AC_SUBST(MOZILLA_HOME)

















76
 
 














 MOZILLA_VERSION="`$PKG_CONFIG --modversion $GECKO-gtkmozembed`"
 










 AC_SUBST(MOZILLA_VERSION)
 










 
 













77
 MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $GECKO-gtkmozembed`"
 MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $GECKO-gtkmozembed`"

















78
 AC_SUBST(MOZILLA_PREFIX)
 AC_SUBST(MOZILLA_PREFIX)

















79
 
 











#

Line 74 
 dnl Do this test using CXX only since so


Line 87 
 dnl Do this test using CXX only since so












87
 dnl 2.95-2.97 have a signed wchar_t in c++ only and some versions
 dnl 2.95-2.97 have a signed wchar_t in c++ only and some versions

















88
 dnl only have short-wchar support for c++.
 dnl only have short-wchar support for c++.

















89
 AC_LANG_PUSH(C++)
 AC_LANG_PUSH(C++)












90
 
 _SAVE_CPPFLAGS=$CPPFLAGS












91
 _SAVE_CXXFLAGS=$CXXFLAGS
 _SAVE_CXXFLAGS=$CXXFLAGS

















92
 _SAVE_AM_CXXFLAGS=$AM_CXXFLAGS
 _SAVE_AM_CXXFLAGS=$AM_CXXFLAGS

















93
 AM_CXXFLAGS="$AM_CXXFLAGS -fshort-wchar"
 AM_CXXFLAGS="$AM_CXXFLAGS -fshort-wchar"











#

Line 91 
 AC_CACHE_CHECK(for compiler -fshort-wcha


Line 105 
 AC_CACHE_CHECK(for compiler -fshort-wcha












105
 
 

















106
 if test "$ac_cv_have_usable_wchar_option" != "yes"; then
 if test "$ac_cv_have_usable_wchar_option" != "yes"; then

















107
     AM_CXXFLAGS=$_SAVE_AM_CXXFLAGS
     AM_CXXFLAGS=$_SAVE_AM_CXXFLAGS














     CXXFLAGS=$_SAVE_CXXFLAGS
 













108
 fi
 fi














 AC_LANG_POP(C++)
 













109
 
 














 dnl disable RTTI by default
 










 AC_ARG_ENABLE(cpp-rtti,
 










         [  --enable-cpp-rtti       Enable C++ RTTI (for cvs gcc)],,
 










         enable_cpp_rtti=no)
 










 
 










 if test "x$enable_cpp_rtti" = "xno"; then
 










   CXXFLAGS="-fno-rtti $CXXFLAGS"
 










 fi
 










 
 










 dnl CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/pipnss `$PKG_CONFIG --cflags-only-I $GECKO-xpcom` -DMOZILLA_STRICT_API"
 










 dnl CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS `$PKG_CONFIG --cflags-only-other $GECKO-xpcom`"
 













110
 
 















111


 dnl Changed from PRUnichar* to nsAString& in 1.8a1 and on aviary branch


 CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/pipnss -I$MOZILLA_INCLUDE_ROOT/nkcache `$PKG_CONFIG --cflags-only-I $GECKO-xpcom` -DMOZILLA_STRICT_API"













112


 


 CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS `$PKG_CONFIG --cflags-only-other $GECKO-xpcom`"















113
 
 












114
 
 AC_MSG_RESULT([$CXXFLAGS])












115
 dnl **************************************************************
 dnl **************************************************************

















116
 dnl Check Mozilla API .
 dnl Check Mozilla API .

















117
 dnl This code picked from Epiphany-1.7.0.
 dnl This code picked from Epiphany-1.7.0.

















118
 dnl **************************************************************
 dnl **************************************************************

















119
 
 












120
 
 AC_MSG_CHECKING([[whether we have a gtk 2 mozilla build]])







121
 
 







122
 
 AC_RUN_IFELSE(







123
 
         [AC_LANG_SOURCE(







124
 
                 [[#include <mozilla-config.h>







125
 
                   #include <string.h>







126
 
                   int main(void) {







127
 
                     return strcmp (MOZ_DEFAULT_TOOLKIT, "gtk2") != 0;







128
 
                   } ]]







129
 
         )],







130
 
         [result=yes],







131
 
         [AC_MSG_ERROR([[Epiphany needs a gtk 2 mozilla build]])],







132
 
         [result=maybe])







133
 
 







134
 
 AC_MSG_RESULT([$result])







135
 
 







136
 
 dnl Changed from PRUnichar* to nsAString& in 1.8a1 and on aviary branch







137
 
 












138
 AC_MSG_CHECKING([whether nsIFilePicker methods expect nsAString&])
 AC_MSG_CHECKING([whether nsIFilePicker methods expect nsAString&])

















139
 
 

















140
 AC_COMPILE_IFELSE(
 AC_COMPILE_IFELSE(











#

Line 144 
 AC_COMPILE_IFELSE(


Line 165 
 AC_COMPILE_IFELSE(












165
 
 

















166
 AC_MSG_RESULT([$result])
 AC_MSG_RESULT([$result])

















167
 
 












168
 
 AC_MSG_CHECKING([whether nsICacheSession methods expect nsAString&])







169
 
 







170
 
 AC_COMPILE_IFELSE(







171
 
         [AC_LANG_PROGRAM(







172
 
                 [[#include <nsEmbedString.h>







173
 
                   #include <nkcache/nsICacheSession.h>]],







174
 
                 [[nsICacheSession *p;







175
 
                   p->OpenCacheEntry (nsEmbedCString(),0, PR_FALSE, nsnull);]]







176
 
         )],







177
 
         [AC_DEFINE([MOZ_NSICACHESESSION_NSACSTRING_],[1],[Define if nsICacheSession uses nsAString&]) result=yes],







178
 
         [result=no])







179
 
 







180
 
 AC_MSG_RESULT([$result])







181
 
 












182
 AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsITransfer.h],
 AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsITransfer.h],

















183
         [AC_DEFINE([HAVE_NSITRANSFER_H],[1],[Define if nsITransfer.h exists])],
         [AC_DEFINE([HAVE_NSITRANSFER_H],[1],[Define if nsITransfer.h exists])],

















184
         [AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/uriloader/nsITransfer.h],
         [AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/uriloader/nsITransfer.h],











#

Line 154 
 AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsP


Line 189 
 AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsP












189
         [AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/layout/nsPresContext.h],
         [AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/layout/nsPresContext.h],

















190
                 [AC_DEFINE([HAVE_NSPRESCONTEXT_H],[1],[Define if nsPresContext.h exists])])])
                 [AC_DEFINE([HAVE_NSPRESCONTEXT_H],[1],[Define if nsPresContext.h exists])])])

















191
 
 












192
 
 dnl restore flags







193
 
 CPPFLAGS=$_SAVE_CPPFLAGS







194
 
 CXXFLAGS=$_SAVE_CXXFLAGS







195
 
 







196
 
 AC_LANG_POP([C++])












197
 dnl Not a simple file check due to the header being in the SDK since 1.8a6
 dnl Not a simple file check due to the header being in the SDK since 1.8a6

















198
 dnl https://bugzilla.mozilla.org/show_bug.cgi?id=271068
 dnl https://bugzilla.mozilla.org/show_bug.cgi?id=271068

















199
 
 











#

Line 211 
 dnl LIBS=$kz_save_LIBS


Line 251 
 dnl LIBS=$kz_save_LIBS












251
 dnl **************************************************************
 dnl **************************************************************

















252
 dnl Checks for programs.
 dnl Checks for programs.

















253
 dnl **************************************************************
 dnl **************************************************************














 AC_PROG_CXX
 










 AC_PROG_CC
 










 AC_PROG_CPP
 










 AC_PROG_INSTALL
 










 AC_PROG_LN_S
 










 AC_PROG_MAKE_SET
 










 AC_PROG_AWK
 










 
 













254
 
 

















255
 if test "x$GCC" = "xyes"; then
 if test "x$GCC" = "xyes"; then

















256
   case " $CFLAGS " in
   case " $CFLAGS " in





























Legend:



Removed from v.1998
 


changed lines


 
Added in v.2000













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[kazehakase]/kazehakase/trunk/configure.ac
-revision 1998 by ikezoe,
Sun Mar 13 10:09:54 2005 UTC
+revision 2000 by ikezoe,
Sun Mar 13 12:19:37 2005 UTC
 Line 10 
 AC_ENABLE_STATIC(no)
  AM_PROG_LIBTOOL
  AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
+ AC_PROG_CXX
+ AC_PROG_CC
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_PROG_AWK
+ dnl disable RTTI by default
+ AC_ARG_ENABLE(cpp-rtti,
+         [  --enable-cpp-rtti       Enable C++ RTTI (for cvs gcc)],,
+         enable_cpp_rtti=no)
+ if test "x$enable_cpp_rtti" = "xno"; then
+   AM_CXXFLAGS="-fno-rtti $CXXFLAGS"
+ fi
  dnl **************************************************************
  dnl Check for GtkMozEmbed.
  dnl **************************************************************
-Line 48 
 AC_SUBST(GECKO_FLAVOUR)
+Line 65 
 AC_SUBST(GECKO_FLAVOUR)
  PKG_CHECK_MODULES(MOZILLA_COMPONENT, $GECKO-gtkmozembed >= $min_version $GECKO-xpcom >= $min_version)
- dnl AC_DEFINE(ENABLE_MOZILLA_EMBED)
  AC_SUBST(MOZILLA_COMPONENT_CFLAGS)
  AC_SUBST(MOZILLA_COMPONENT_LIBS)
-Line 58 
 AC_SUBST(MOZILLA_INCLUDE_ROOT)
+Line 74 
 AC_SUBST(MOZILLA_INCLUDE_ROOT)
  MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $GECKO-gtkmozembed`"
  AC_SUBST(MOZILLA_HOME)
- MOZILLA_VERSION="`$PKG_CONFIG --modversion $GECKO-gtkmozembed`"
- AC_SUBST(MOZILLA_VERSION)
  MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $GECKO-gtkmozembed`"
  AC_SUBST(MOZILLA_PREFIX)
-Line 74 
 dnl Do this test using CXX only since so
+Line 87 
 dnl Do this test using CXX only since so
  dnl 2.95-2.97 have a signed wchar_t in c++ only and some versions
  dnl only have short-wchar support for c++.
  AC_LANG_PUSH(C++)
+ _SAVE_CPPFLAGS=$CPPFLAGS
  _SAVE_CXXFLAGS=$CXXFLAGS
  _SAVE_AM_CXXFLAGS=$AM_CXXFLAGS
  AM_CXXFLAGS="$AM_CXXFLAGS -fshort-wchar"
-Line 91 
 AC_CACHE_CHECK(for compiler -fshort-wcha
+Line 105 
 AC_CACHE_CHECK(for compiler -fshort-wcha
  if test "$ac_cv_have_usable_wchar_option" != "yes"; then
      AM_CXXFLAGS=$_SAVE_AM_CXXFLAGS
-     CXXFLAGS=$_SAVE_CXXFLAGS
  fi
- AC_LANG_POP(C++)
- dnl disable RTTI by default
- AC_ARG_ENABLE(cpp-rtti,
-         [  --enable-cpp-rtti       Enable C++ RTTI (for cvs gcc)],,
-         enable_cpp_rtti=no)
- if test "x$enable_cpp_rtti" = "xno"; then
-   CXXFLAGS="-fno-rtti $CXXFLAGS"
- fi
- dnl CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/pipnss `$PKG_CONFIG --cflags-only-I $GECKO-xpcom` -DMOZILLA_STRICT_API"
- dnl CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS `$PKG_CONFIG --cflags-only-other $GECKO-xpcom`"
- dnl Changed from PRUnichar* to nsAString& in 1.8a1 and on aviary branch
+ CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/pipnss -I$MOZILLA_INCLUDE_ROOT/nkcache `$PKG_CONFIG --cflags-only-I $GECKO-xpcom` -DMOZILLA_STRICT_API"
+ CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS `$PKG_CONFIG --cflags-only-other $GECKO-xpcom`"
+ AC_MSG_RESULT([$CXXFLAGS])
  dnl **************************************************************
  dnl Check Mozilla API .
  dnl This code picked from Epiphany-1.7.0.
  dnl **************************************************************
+ AC_MSG_CHECKING([[whether we have a gtk 2 mozilla build]])
+ AC_RUN_IFELSE(
+         [AC_LANG_SOURCE(
+                 [[#include <mozilla-config.h>
+                   #include <string.h>
+                   int main(void) {
+                     return strcmp (MOZ_DEFAULT_TOOLKIT, "gtk2") != 0;
+                   } ]]
+         )],
+         [result=yes],
+         [AC_MSG_ERROR([[Epiphany needs a gtk 2 mozilla build]])],
+         [result=maybe])
+ AC_MSG_RESULT([$result])
+ dnl Changed from PRUnichar* to nsAString& in 1.8a1 and on aviary branch
  AC_MSG_CHECKING([whether nsIFilePicker methods expect nsAString&])
  AC_COMPILE_IFELSE(
-Line 144 
 AC_COMPILE_IFELSE(
+Line 165 
 AC_COMPILE_IFELSE(
  AC_MSG_RESULT([$result])
+ AC_MSG_CHECKING([whether nsICacheSession methods expect nsAString&])
+ AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+                 [[#include <nsEmbedString.h>
+                   #include <nkcache/nsICacheSession.h>]],
+                 [[nsICacheSession *p;
+                   p->OpenCacheEntry (nsEmbedCString(),0, PR_FALSE, nsnull);]]
+         )],
+         [AC_DEFINE([MOZ_NSICACHESESSION_NSACSTRING_],[1],[Define if nsICacheSession uses nsAString&]) result=yes],
+         [result=no])
+ AC_MSG_RESULT([$result])
  AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsITransfer.h],
          [AC_DEFINE([HAVE_NSITRANSFER_H],[1],[Define if nsITransfer.h exists])],
          [AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/uriloader/nsITransfer.h],
-Line 154 
 AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsP
+Line 189 
 AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsP
          [AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/layout/nsPresContext.h],
                  [AC_DEFINE([HAVE_NSPRESCONTEXT_H],[1],[Define if nsPresContext.h exists])])])
+ dnl restore flags
+ CPPFLAGS=$_SAVE_CPPFLAGS
+ CXXFLAGS=$_SAVE_CXXFLAGS
+ AC_LANG_POP([C++])
  dnl Not a simple file check due to the header being in the SDK since 1.8a6
  dnl https://bugzilla.mozilla.org/show_bug.cgi?id=271068
-Line 211 
 dnl LIBS=$kz_save_LIBS
+Line 251 
 dnl LIBS=$kz_save_LIBS
  dnl **************************************************************
  dnl Checks for programs.
  dnl **************************************************************
- AC_PROG_CXX
- AC_PROG_CC
- AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
- AC_PROG_AWK
  if test "x$GCC" = "xyes"; then
    case " $CFLAGS " in
 Legend:



Removed from v.1998
 


changed lines


 
Added in v.2000
 Legend:



Removed from v.1998
 


changed lines


 
Added in v.2000
-Removed from v.1998
+Added in v.2000
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Développer et télécharger des logiciels Open Source

Kazehakase

Browse Subversion Repository