configure.ac (41215f60) configure.ac (212f9143)
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

--- 630 unchanged lines hidden (view full) ---

639AC_ARG_WITH(system-cppunit,
640[ --with-system-cppunit Use cppunit already on system
641],,)
642AC_ARG_WITH(system-redland,
643[ --with-system-redland Use redland library already on system
644],,)
645AC_ARG_WITH(stlport,
646[ --with-stlport Only building --without-stlport is supported.
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

--- 630 unchanged lines hidden (view full) ---

639AC_ARG_WITH(system-cppunit,
640[ --with-system-cppunit Use cppunit already on system
641],,)
642AC_ARG_WITH(system-redland,
643[ --with-system-redland Use redland library already on system
644],,)
645AC_ARG_WITH(stlport,
646[ --with-stlport Only building --without-stlport is supported.
647], WITH_STLPORT=$withval , WITH_STLPORT=NO)
647], WITH_STLPORT=$withval , WITH_STLPORT=no)
648AC_ARG_WITH(jdk-home,
649[ --with-jdk-home if you have installed JDK 1.3 or later on your system
650 please supply the path here.
651 Note that this is not the location of the Java binary
652 but the location of the entire distribution.
653
654 Usage: --with-jdk-home=<absolute path to JDK home>
655],,)

--- 2033 unchanged lines hidden (view full) ---

2689 fi
2690 fi
2691fi
2692
2693dnl ===================================================================
2694dnl Checks for what the default STL should be
2695dnl ===================================================================
2696 AC_MSG_CHECKING([what the default STL should be])
648AC_ARG_WITH(jdk-home,
649[ --with-jdk-home if you have installed JDK 1.3 or later on your system
650 please supply the path here.
651 Note that this is not the location of the Java binary
652 but the location of the entire distribution.
653
654 Usage: --with-jdk-home=<absolute path to JDK home>
655],,)

--- 2033 unchanged lines hidden (view full) ---

2689 fi
2690 fi
2691fi
2692
2693dnl ===================================================================
2694dnl Checks for what the default STL should be
2695dnl ===================================================================
2696 AC_MSG_CHECKING([what the default STL should be])
2697 DEFAULT_TO_STLPORT="NO"
2698if test "$WITH_STLPORT" != "NO"; then
2697 DEFAULT_TO_STLPORT="no"
2698if test "$WITH_STLPORT" != "no"; then
2699 AC_MSG_ERROR([Option --with-stlport is no longer available.])
2700else
2701 USE_SYSTEM_STL="YES"
2702fi
2703
2704AC_SUBST(USE_SYSTEM_STL)
2705
2706dnl ===================================================================

--- 4615 unchanged lines hidden ---
2699 AC_MSG_ERROR([Option --with-stlport is no longer available.])
2700else
2701 USE_SYSTEM_STL="YES"
2702fi
2703
2704AC_SUBST(USE_SYSTEM_STL)
2705
2706dnl ===================================================================

--- 4615 unchanged lines hidden ---